Merge pull request #66 from pulumiverse/feature/fix-go-sdk-path

Feature/fix go sdk path
pulumiverse · Apr 14, 2023 · c734e48 · c734e48
2 parents 1bf943d + dbcf0a5
commit c734e48
Show file tree

Hide file tree

Showing 22 changed files with 193 additions and 122 deletions.
diff --git a/docs/installation-configuration.md b/docs/installation-configuration.md
@@ -10,7 +10,7 @@ The Pulumi Heroku provider is available as a package in all Pulumi languages:
 
 * JavaScript/TypeScript: [`@pulumiverse/heroku`](https://www.npmjs.com/package/@pulumiverse/heroku)
 * Python: [`pulumiverse_heroku`](https://pypi.org/project/pulumiverse_heroku/)
-* Go: [`github.com/pulumiverse/pulumi-heroku/sdk/go/heroku`](https://github.com/pulumiverse/pulumi-heroku/sdk/go/heroku)
+* Go: [`github.com/pulumiverse/pulumi-heroku/sdk/go/heroku`](https://github.com/pulumiverse/pulumi-heroku/tree/main/sdk/go/heroku)
 * .NET: [`Pulumiverse.Heroku`](https://www.nuget.org/packages/Pulumiverse.Heroku)
 
 ### Provider Binary

diff --git a/go.work.sum b/go.work.sum
@@ -4,6 +4,7 @@ github.com/cheggaaa/pb v1.0.18/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXH
 github.com/djherbis/times v1.2.0/go.mod h1:CGMZlo255K5r4Yw0b9RRfFQpM2y7uOmxg4jm9HsaVf8=
 github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/heroku/terraform-provider-heroku/v5 v5.1.6/go.mod h1:+v6inofF3P51jFdE4rK7jekvxWTR5jw/mmtAe4LTnX8=
+github.com/heroku/terraform-provider-heroku/v5 v5.2.1/go.mod h1:SY6gmh+JVdnqMY2s4WbTlF8tbUQS1qAqCpV7HydHHzM=
 github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ=
 github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=

diff --git a/provider/cmd/pulumi-resource-heroku/schema.json b/provider/cmd/pulumi-resource-heroku/schema.json
@@ -60,7 +60,10 @@
                 "type": "string"
             },
             "customizations": {
-                "$ref": "#/types/heroku:config/customizations:customizations"
+                "type": "array",
+                "items": {
+                    "$ref": "#/types/heroku:config/customizations:customizations"
+                }
             },
             "delays": {
                 "$ref": "#/types/heroku:config/delays:delays"
@@ -241,6 +244,9 @@
         },
         "heroku:config/customizations:customizations": {
             "properties": {
+                "setAddonConfigVarsInState": {
+                    "type": "boolean"
+                },
                 "setAppAllConfigVarsInState": {
                     "type": "boolean"
                 }
@@ -269,8 +275,16 @@
             },
             "type": "object"
         },
-        "heroku:index/ProviderCustomizations:ProviderCustomizations": {
+        "heroku:index/ProviderCustomization:ProviderCustomization": {
             "properties": {
+                "setAddonConfigVarsInState": {
+                    "type": "boolean",
+                    "language": {
+                        "python": {
+                            "mapCase": false
+                        }
+                    }
+                },
                 "setAppAllConfigVarsInState": {
                     "type": "boolean",
                     "language": {
@@ -533,7 +547,10 @@
                 "type": "string"
             },
             "customizations": {
-                "$ref": "#/types/heroku:index/ProviderCustomizations:ProviderCustomizations"
+                "type": "array",
+                "items": {
+                    "$ref": "#/types/heroku:index/ProviderCustomization:ProviderCustomization"
+                }
             },
             "delays": {
                 "$ref": "#/types/heroku:index/ProviderDelays:ProviderDelays"
@@ -556,7 +573,10 @@
                 "type": "string"
             },
             "customizations": {
-                "$ref": "#/types/heroku:index/ProviderCustomizations:ProviderCustomizations"
+                "type": "array",
+                "items": {
+                    "$ref": "#/types/heroku:index/ProviderCustomization:ProviderCustomization"
+                }
             },
             "delays": {
                 "$ref": "#/types/heroku:index/ProviderDelays:ProviderDelays"
@@ -1561,8 +1581,7 @@
             "required": [
                 "appId",
                 "cname",
-                "hostname",
-                "sniEndpointId"
+                "hostname"
             ],
             "inputProperties": {
                 "appId": {

diff --git a/provider/go.mod b/provider/go.mod
@@ -8,7 +8,7 @@ replace (
 )
 
 require (
-	github.com/heroku/terraform-provider-heroku/v5 v5.1.10
+	github.com/heroku/terraform-provider-heroku/v5 v5.2.1
 	github.com/pulumi/pulumi-terraform-bridge/v3 v3.40.0
 	github.com/pulumi/pulumi/sdk/v3 v3.54.0
 )

diff --git a/provider/go.sum b/provider/go.sum
@@ -1068,8 +1068,8 @@ github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/heroku/heroku-go/v5 v5.4.1 h1:J1nNnR3/571b2iUDHl+y1B3VkhKm6YOXIq9GGzQUv5s=
 github.com/heroku/heroku-go/v5 v5.4.1/go.mod h1:Uo3XhGPwaTpniR4X1e50BDjg4SzdFk2Bd2mgYZVkfHo=
-github.com/heroku/terraform-provider-heroku/v5 v5.1.10 h1:3ZABiHXPOsbZpVtTK49PT88t+R9GW0rg9BqMKM/95r0=
-github.com/heroku/terraform-provider-heroku/v5 v5.1.10/go.mod h1:SY6gmh+JVdnqMY2s4WbTlF8tbUQS1qAqCpV7HydHHzM=
+github.com/heroku/terraform-provider-heroku/v5 v5.2.1 h1:LtzPHdhdvhnX43UJDkGNQG130n5jKE1KjOCGOwuHZKM=
+github.com/heroku/terraform-provider-heroku/v5 v5.2.1/go.mod h1:SY6gmh+JVdnqMY2s4WbTlF8tbUQS1qAqCpV7HydHHzM=
 github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME=
 github.com/hetznercloud/hcloud-go v1.35.0/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA=
 github.com/hexops/autogold v1.3.0 h1:IEtGNPxBeBu8RMn8eKWh/Ll9dVNgSnJ7bp/qHgMQ14o=

diff --git a/sdk/dotnet/Config/Config.cs b/sdk/dotnet/Config/Config.cs
@@ -39,8 +39,8 @@ public void Set(T value)
             set => _apiKey.Set(value);
         }
 
-        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"));
-        public static Pulumiverse.Heroku.Config.Types.Customizations? Customizations
+        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"));
+        public static ImmutableArray<Pulumiverse.Heroku.Config.Types.Customizations> Customizations
         {
             get => _customizations.Get();
             set => _customizations.Set(value);
@@ -86,6 +86,7 @@ public static class Types
 
              public class Customizations
              {
+                public bool? SetAddonConfigVarsInState { get; set; }
                 public bool? SetAppAllConfigVarsInState { get; set; }
             }
 

diff --git a/sdk/dotnet/Domain/Domain.cs b/sdk/dotnet/Domain/Domain.cs
@@ -23,7 +23,7 @@ public partial class Domain : global::Pulumi.CustomResource
         public Output<string> Hostname { get; private set; } = null!;
 
         [Output("sniEndpointId")]
-        public Output<string> SniEndpointId { get; private set; } = null!;
+        public Output<string?> SniEndpointId { get; private set; } = null!;
 
 
         /// <summary>

diff --git a/...tnet/Inputs/ProviderCustomizationsArgs.cs → ...otnet/Inputs/ProviderCustomizationArgs.cs b/...tnet/Inputs/ProviderCustomizationsArgs.cs → ...otnet/Inputs/ProviderCustomizationArgs.cs
@@ -11,14 +11,17 @@
 namespace Pulumiverse.Heroku.Inputs
 {
 
-    public sealed class ProviderCustomizationsArgs : global::Pulumi.ResourceArgs
+    public sealed class ProviderCustomizationArgs : global::Pulumi.ResourceArgs
     {
+        [Input("setAddonConfigVarsInState")]
+        public Input<bool>? SetAddonConfigVarsInState { get; set; }
+
         [Input("setAppAllConfigVarsInState")]
         public Input<bool>? SetAppAllConfigVarsInState { get; set; }
 
-        public ProviderCustomizationsArgs()
+        public ProviderCustomizationArgs()
         {
         }
-        public static new ProviderCustomizationsArgs Empty => new ProviderCustomizationsArgs();
+        public static new ProviderCustomizationArgs Empty => new ProviderCustomizationArgs();
     }
 }
diff --git a/sdk/dotnet/Provider.cs b/sdk/dotnet/Provider.cs
@@ -64,7 +64,12 @@ public sealed class ProviderArgs : global::Pulumi.ResourceArgs
         public Input<string>? ApiKey { get; set; }
 
         [Input("customizations", json: true)]
-        public Input<Inputs.ProviderCustomizationsArgs>? Customizations { get; set; }
+        private InputList<Inputs.ProviderCustomizationArgs>? _customizations;
+        public InputList<Inputs.ProviderCustomizationArgs> Customizations
+        {
+            get => _customizations ?? (_customizations = new InputList<Inputs.ProviderCustomizationArgs>());
+            set => _customizations = value;
+        }
 
         [Input("delays", json: true)]
         public Input<Inputs.ProviderDelaysArgs>? Delays { get; set; }

diff --git a/sdk/go/heroku/config/pulumiTypes.go b/sdk/go/heroku/config/pulumiTypes.go
diff --git a/sdk/go/heroku/domain/domain.go b/sdk/go/heroku/domain/domain.go
diff --git a/sdk/go/heroku/provider.go b/sdk/go/heroku/provider.go