From 51f40633a5dae20e07e21152a44bdbdc7e703eb7 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Thu, 8 Feb 2024 16:04:53 -0800 Subject: [PATCH] revert pins for non-json provider config --- provider/go.mod | 1 - provider/go.sum | 4 ++-- sdk/dotnet/Provider.cs | 4 ++-- sdk/nodejs/provider.ts | 4 ++-- sdk/python/pulumi_docker/provider.py | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/provider/go.mod b/provider/go.mod index 5d0dab75d..d0e475df3 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -38,7 +38,6 @@ replace ( cloud.google.com/go/storage => cloud.google.com/go/storage v1.29.0 github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20240202163305-e2a20ae13ef9 github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0 - github.com/pulumi/pulumi/pkg/v3 => github.com/pulumi/pulumi/pkg/v3 v3.78.2-0.20240110215317-7f71c9b7ba47 github.com/terraform-providers/terraform-provider-docker => ../upstream ) diff --git a/provider/go.sum b/provider/go.sum index 4b3d8574b..710a59e03 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -2387,8 +2387,8 @@ github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7 h1:Z9vmfVTW0QtJrWh+DRR3 github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7/go.mod h1:T9zHpTHyVz2EyobzByFFpjfqgGtXO4C4bNqC0j29D2I= github.com/pulumi/pulumi-yaml v1.5.0 h1:HfXu+WSFNpycref9CK935cViYJzXwSgHGWM/RepyrW0= github.com/pulumi/pulumi-yaml v1.5.0/go.mod h1:AvKSmEQv2EkPbpvAQroR1eP1LkJGC8z5NDM34rVWOtg= -github.com/pulumi/pulumi/pkg/v3 v3.78.2-0.20240110215317-7f71c9b7ba47 h1:f7yVSE5MuExMFweblHf9/xLfRqwuAEtBKxw2Cz/i6no= -github.com/pulumi/pulumi/pkg/v3 v3.78.2-0.20240110215317-7f71c9b7ba47/go.mod h1:ZA42eWNolfTDZdE0GNIdBXKPyq0vC4RyL/RsLc8gcys= +github.com/pulumi/pulumi/pkg/v3 v3.105.0 h1:bJG1vUiYH2gDF1pfBKlIABDNoJD2LvU1LmjjL+EbvuM= +github.com/pulumi/pulumi/pkg/v3 v3.105.0/go.mod h1:eZAFEFOwE/skElTfwetfyTxPebmWr5vOS5NSU9XwlVw= github.com/pulumi/pulumi/sdk/v3 v3.105.0 h1:OKEeubZigWyQVnZS6udnFnZHZ/8OWXuUYv9ir3OY+vs= github.com/pulumi/pulumi/sdk/v3 v3.105.0/go.mod h1:Ml3rpGfyZlI4zQCG7LN2XDSmH4XUNYdyBwJ3yEr/OpI= github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo= diff --git a/sdk/dotnet/Provider.cs b/sdk/dotnet/Provider.cs index ab42063e6..52ed33dc2 100644 --- a/sdk/dotnet/Provider.cs +++ b/sdk/dotnet/Provider.cs @@ -106,7 +106,7 @@ public sealed class ProviderArgs : global::Pulumi.ResourceArgs [Input("keyMaterial")] public Input? KeyMaterial { get; set; } - [Input("registryAuth")] + [Input("registryAuth", json: true)] private InputList? _registryAuth; public InputList RegistryAuth { @@ -114,7 +114,7 @@ public InputList RegistryAuth set => _registryAuth = value; } - [Input("sshOpts")] + [Input("sshOpts", json: true)] private InputList? _sshOpts; /// diff --git a/sdk/nodejs/provider.ts b/sdk/nodejs/provider.ts index c4e727602..665dcf836 100644 --- a/sdk/nodejs/provider.ts +++ b/sdk/nodejs/provider.ts @@ -65,8 +65,8 @@ export class Provider extends pulumi.ProviderResource { resourceInputs["certPath"] = args ? args.certPath : undefined; resourceInputs["host"] = (args ? args.host : undefined) ?? utilities.getEnv("DOCKER_HOST"); resourceInputs["keyMaterial"] = args ? args.keyMaterial : undefined; - resourceInputs["registryAuth"] = pulumi.output(args ? args.registryAuth : undefined); - resourceInputs["sshOpts"] = pulumi.output(args ? args.sshOpts : undefined); + resourceInputs["registryAuth"] = pulumi.output(args ? args.registryAuth : undefined).apply(JSON.stringify); + resourceInputs["sshOpts"] = pulumi.output(args ? args.sshOpts : undefined).apply(JSON.stringify); } opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts); super(Provider.__pulumiType, name, resourceInputs, opts); diff --git a/sdk/python/pulumi_docker/provider.py b/sdk/python/pulumi_docker/provider.py index 17d6a8c1f..db8e325cd 100644 --- a/sdk/python/pulumi_docker/provider.py +++ b/sdk/python/pulumi_docker/provider.py @@ -208,8 +208,8 @@ def _internal_init(__self__, host = _utilities.get_env('DOCKER_HOST') __props__.__dict__["host"] = host __props__.__dict__["key_material"] = key_material - __props__.__dict__["registry_auth"] = pulumi.Output.from_input(registry_auth) if registry_auth is not None else None - __props__.__dict__["ssh_opts"] = pulumi.Output.from_input(ssh_opts) if ssh_opts is not None else None + __props__.__dict__["registry_auth"] = pulumi.Output.from_input(registry_auth).apply(pulumi.runtime.to_json) if registry_auth is not None else None + __props__.__dict__["ssh_opts"] = pulumi.Output.from_input(ssh_opts).apply(pulumi.runtime.to_json) if ssh_opts is not None else None super(Provider, __self__).__init__( 'docker', resource_name,