Skip to content

Commit c734e48

Browse files
authored
Merge pull request #66 from pulumiverse/feature/fix-go-sdk-path
Feature/fix go sdk path
2 parents 1bf943d + dbcf0a5 commit c734e48

File tree

22 files changed

+193
-122
lines changed

22 files changed

+193
-122
lines changed

docs/installation-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The Pulumi Heroku provider is available as a package in all Pulumi languages:
1010

1111
* JavaScript/TypeScript: [`@pulumiverse/heroku`](https://www.npmjs.com/package/@pulumiverse/heroku)
1212
* Python: [`pulumiverse_heroku`](https://pypi.org/project/pulumiverse_heroku/)
13-
* Go: [`github.com/pulumiverse/pulumi-heroku/sdk/go/heroku`](https://github.com/pulumiverse/pulumi-heroku/sdk/go/heroku)
13+
* Go: [`github.com/pulumiverse/pulumi-heroku/sdk/go/heroku`](https://github.com/pulumiverse/pulumi-heroku/tree/main/sdk/go/heroku)
1414
* .NET: [`Pulumiverse.Heroku`](https://www.nuget.org/packages/Pulumiverse.Heroku)
1515

1616
### Provider Binary

go.work.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ github.com/cheggaaa/pb v1.0.18/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXH
44
github.com/djherbis/times v1.2.0/go.mod h1:CGMZlo255K5r4Yw0b9RRfFQpM2y7uOmxg4jm9HsaVf8=
55
github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
66
github.com/heroku/terraform-provider-heroku/v5 v5.1.6/go.mod h1:+v6inofF3P51jFdE4rK7jekvxWTR5jw/mmtAe4LTnX8=
7+
github.com/heroku/terraform-provider-heroku/v5 v5.2.1/go.mod h1:SY6gmh+JVdnqMY2s4WbTlF8tbUQS1qAqCpV7HydHHzM=
78
github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
89
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ=
910
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=

provider/cmd/pulumi-resource-heroku/schema.json

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@
6060
"type": "string"
6161
},
6262
"customizations": {
63-
"$ref": "#/types/heroku:config/customizations:customizations"
63+
"type": "array",
64+
"items": {
65+
"$ref": "#/types/heroku:config/customizations:customizations"
66+
}
6467
},
6568
"delays": {
6669
"$ref": "#/types/heroku:config/delays:delays"
@@ -241,6 +244,9 @@
241244
},
242245
"heroku:config/customizations:customizations": {
243246
"properties": {
247+
"setAddonConfigVarsInState": {
248+
"type": "boolean"
249+
},
244250
"setAppAllConfigVarsInState": {
245251
"type": "boolean"
246252
}
@@ -269,8 +275,16 @@
269275
},
270276
"type": "object"
271277
},
272-
"heroku:index/ProviderCustomizations:ProviderCustomizations": {
278+
"heroku:index/ProviderCustomization:ProviderCustomization": {
273279
"properties": {
280+
"setAddonConfigVarsInState": {
281+
"type": "boolean",
282+
"language": {
283+
"python": {
284+
"mapCase": false
285+
}
286+
}
287+
},
274288
"setAppAllConfigVarsInState": {
275289
"type": "boolean",
276290
"language": {
@@ -533,7 +547,10 @@
533547
"type": "string"
534548
},
535549
"customizations": {
536-
"$ref": "#/types/heroku:index/ProviderCustomizations:ProviderCustomizations"
550+
"type": "array",
551+
"items": {
552+
"$ref": "#/types/heroku:index/ProviderCustomization:ProviderCustomization"
553+
}
537554
},
538555
"delays": {
539556
"$ref": "#/types/heroku:index/ProviderDelays:ProviderDelays"
@@ -556,7 +573,10 @@
556573
"type": "string"
557574
},
558575
"customizations": {
559-
"$ref": "#/types/heroku:index/ProviderCustomizations:ProviderCustomizations"
576+
"type": "array",
577+
"items": {
578+
"$ref": "#/types/heroku:index/ProviderCustomization:ProviderCustomization"
579+
}
560580
},
561581
"delays": {
562582
"$ref": "#/types/heroku:index/ProviderDelays:ProviderDelays"
@@ -1561,8 +1581,7 @@
15611581
"required": [
15621582
"appId",
15631583
"cname",
1564-
"hostname",
1565-
"sniEndpointId"
1584+
"hostname"
15661585
],
15671586
"inputProperties": {
15681587
"appId": {

provider/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ replace (
88
)
99

1010
require (
11-
github.com/heroku/terraform-provider-heroku/v5 v5.1.10
11+
github.com/heroku/terraform-provider-heroku/v5 v5.2.1
1212
github.com/pulumi/pulumi-terraform-bridge/v3 v3.40.0
1313
github.com/pulumi/pulumi/sdk/v3 v3.54.0
1414
)

provider/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,8 +1068,8 @@ github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE
10681068
github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
10691069
github.com/heroku/heroku-go/v5 v5.4.1 h1:J1nNnR3/571b2iUDHl+y1B3VkhKm6YOXIq9GGzQUv5s=
10701070
github.com/heroku/heroku-go/v5 v5.4.1/go.mod h1:Uo3XhGPwaTpniR4X1e50BDjg4SzdFk2Bd2mgYZVkfHo=
1071-
github.com/heroku/terraform-provider-heroku/v5 v5.1.10 h1:3ZABiHXPOsbZpVtTK49PT88t+R9GW0rg9BqMKM/95r0=
1072-
github.com/heroku/terraform-provider-heroku/v5 v5.1.10/go.mod h1:SY6gmh+JVdnqMY2s4WbTlF8tbUQS1qAqCpV7HydHHzM=
1071+
github.com/heroku/terraform-provider-heroku/v5 v5.2.1 h1:LtzPHdhdvhnX43UJDkGNQG130n5jKE1KjOCGOwuHZKM=
1072+
github.com/heroku/terraform-provider-heroku/v5 v5.2.1/go.mod h1:SY6gmh+JVdnqMY2s4WbTlF8tbUQS1qAqCpV7HydHHzM=
10731073
github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME=
10741074
github.com/hetznercloud/hcloud-go v1.35.0/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA=
10751075
github.com/hexops/autogold v1.3.0 h1:IEtGNPxBeBu8RMn8eKWh/Ll9dVNgSnJ7bp/qHgMQ14o=

sdk/dotnet/Config/Config.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public static string? ApiKey
3939
set => _apiKey.Set(value);
4040
}
4141

42-
private static readonly __Value<Pulumiverse.Heroku.Config.Types.Customizations?> _customizations = new __Value<Pulumiverse.Heroku.Config.Types.Customizations?>(() => __config.GetObject<Pulumiverse.Heroku.Config.Types.Customizations>("customizations"));
43-
public static Pulumiverse.Heroku.Config.Types.Customizations? Customizations
42+
private static readonly __Value<ImmutableArray<Pulumiverse.Heroku.Config.Types.Customizations>> _customizations = new __Value<ImmutableArray<Pulumiverse.Heroku.Config.Types.Customizations>>(() => __config.GetObject<ImmutableArray<Pulumiverse.Heroku.Config.Types.Customizations>>("customizations"));
43+
public static ImmutableArray<Pulumiverse.Heroku.Config.Types.Customizations> Customizations
4444
{
4545
get => _customizations.Get();
4646
set => _customizations.Set(value);
@@ -86,6 +86,7 @@ public static class Types
8686

8787
public class Customizations
8888
{
89+
public bool? SetAddonConfigVarsInState { get; set; }
8990
public bool? SetAppAllConfigVarsInState { get; set; }
9091
}
9192

sdk/dotnet/Domain/Domain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public partial class Domain : global::Pulumi.CustomResource
2323
public Output<string> Hostname { get; private set; } = null!;
2424

2525
[Output("sniEndpointId")]
26-
public Output<string> SniEndpointId { get; private set; } = null!;
26+
public Output<string?> SniEndpointId { get; private set; } = null!;
2727

2828

2929
/// <summary>

sdk/dotnet/Inputs/ProviderCustomizationsArgs.cs renamed to sdk/dotnet/Inputs/ProviderCustomizationArgs.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@
1111
namespace Pulumiverse.Heroku.Inputs
1212
{
1313

14-
public sealed class ProviderCustomizationsArgs : global::Pulumi.ResourceArgs
14+
public sealed class ProviderCustomizationArgs : global::Pulumi.ResourceArgs
1515
{
16+
[Input("setAddonConfigVarsInState")]
17+
public Input<bool>? SetAddonConfigVarsInState { get; set; }
18+
1619
[Input("setAppAllConfigVarsInState")]
1720
public Input<bool>? SetAppAllConfigVarsInState { get; set; }
1821

19-
public ProviderCustomizationsArgs()
22+
public ProviderCustomizationArgs()
2023
{
2124
}
22-
public static new ProviderCustomizationsArgs Empty => new ProviderCustomizationsArgs();
25+
public static new ProviderCustomizationArgs Empty => new ProviderCustomizationArgs();
2326
}
2427
}

sdk/dotnet/Provider.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,12 @@ public sealed class ProviderArgs : global::Pulumi.ResourceArgs
6464
public Input<string>? ApiKey { get; set; }
6565

6666
[Input("customizations", json: true)]
67-
public Input<Inputs.ProviderCustomizationsArgs>? Customizations { get; set; }
67+
private InputList<Inputs.ProviderCustomizationArgs>? _customizations;
68+
public InputList<Inputs.ProviderCustomizationArgs> Customizations
69+
{
70+
get => _customizations ?? (_customizations = new InputList<Inputs.ProviderCustomizationArgs>());
71+
set => _customizations = value;
72+
}
6873

6974
[Input("delays", json: true)]
7075
public Input<Inputs.ProviderDelaysArgs>? Delays { get; set; }

sdk/go/heroku/config/pulumiTypes.go

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)