Upgrade pulumi-terraform-bridge to v3.97.1 (#4907)

This PR was generated via $ upgrade-provider pulumi/pulumi-aws --kind=bridge. --- Upgrading pulumi-terraform-bridge from v3.96.0 to v3.97.1. **Manual Changes:** copied from #4898 Fixes #4759 Fixes #4894
pulumi · Dec 11, 2024 · 88369b2 · 88369b2
1 parent 0407e25
commit 88369b2
Show file tree

Hide file tree

Showing 1,202 changed files with 2,781 additions and 2,757 deletions.
diff --git a/examples/go.mod b/examples/go.mod
@@ -8,8 +8,8 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/iam v1.38.2
 	github.com/pulumi/providertest v0.1.3
 	github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000
-	github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0
-	github.com/pulumi/pulumi/pkg/v3 v3.140.0
+	github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1
+	github.com/pulumi/pulumi/pkg/v3 v3.142.0
 	github.com/stretchr/testify v1.9.0
 )
 
@@ -451,9 +451,9 @@ require (
 	github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
 	github.com/pulumi/esc v0.10.0 // indirect
 	github.com/pulumi/inflector v0.1.1 // indirect
-	github.com/pulumi/pulumi-java/pkg v0.17.0 // indirect
-	github.com/pulumi/pulumi-yaml v1.11.2 // indirect
-	github.com/pulumi/pulumi/sdk/v3 v3.140.0 // indirect
+	github.com/pulumi/pulumi-java/pkg v0.18.0 // indirect
+	github.com/pulumi/pulumi-yaml v1.12.0 // indirect
+	github.com/pulumi/pulumi/sdk/v3 v3.142.0 // indirect
 	github.com/pulumi/schema-tools v0.1.2 // indirect
 	github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect

diff --git a/examples/go.sum b/examples/go.sum
@@ -2454,16 +2454,16 @@ github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+Sob
 github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
 github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5AepHg=
 github.com/pulumi/providertest v0.1.3/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
-github.com/pulumi/pulumi-java/pkg v0.17.0 h1:KmaVLrVmlkzShOfaJNJDlckorbFm8dM/C7L4hj6LX8U=
-github.com/pulumi/pulumi-java/pkg v0.17.0/go.mod h1:ji4U4H7t81X4aaE88D9+z5CmKH/QoLwQi9N1iGl+2KQ=
-github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0 h1:uJB3tM1j+9SKeXLCAx3DBVHsYk4ddXNrVoiqpgXal2Q=
-github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0/go.mod h1:WnOTAfdtm5+kW3rIU0rLhxFSEHtJIMf19FdOU6NFXG0=
-github.com/pulumi/pulumi-yaml v1.11.2 h1:MU7TTNbruGCSgNHhaBygjIbLWm3WSbd1q98GpMIgQzE=
-github.com/pulumi/pulumi-yaml v1.11.2/go.mod h1:RdXRBupRGGAD1kbYNG1V1h6pyFnXisvQsl0AANvVjGI=
-github.com/pulumi/pulumi/pkg/v3 v3.140.0 h1:/bvHa19HY/6qHWvuAOVII8qr72MDGGczBWlPYlPo3j0=
-github.com/pulumi/pulumi/pkg/v3 v3.140.0/go.mod h1:rcTtSyisd7BzZTugNk/s9zlYgX9S0S10+pha3Tko6yM=
-github.com/pulumi/pulumi/sdk/v3 v3.140.0 h1:+Z/RBvdYg7tBNkBwk4p/FzlV7niBT3TbLAICq/Y0LDU=
-github.com/pulumi/pulumi/sdk/v3 v3.140.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
+github.com/pulumi/pulumi-java/pkg v0.18.0 h1:3PApc5YegH69n6oubB63mqI97pF+oQywWr7ii4082Mw=
+github.com/pulumi/pulumi-java/pkg v0.18.0/go.mod h1:YKYYFEb3Jvzf/dDJo0xOeEkIfBAMkkkdhXulauvEjmc=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1 h1:+KTtmSk6jqcqKvgNgtGVUWEimkpEZdLZs0xEYwFw288=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1/go.mod h1:B/Auryr+yVUkLOMzgpFe7HLwKAtXc6YJwpAXfNGyLPk=
+github.com/pulumi/pulumi-yaml v1.12.0 h1:ThJP+EBqeJyCnS6w6/PwcEFOT5o112qv0lObhefmFCk=
+github.com/pulumi/pulumi-yaml v1.12.0/go.mod h1:EhZd1XDfuLa15O51qVVE16U6r8ldK9mLIBclqWCX27Y=
+github.com/pulumi/pulumi/pkg/v3 v3.142.0 h1:UE8TFyXrlxvPrATpd3Kl3En34KrFIFWOxxNAodywPNU=
+github.com/pulumi/pulumi/pkg/v3 v3.142.0/go.mod h1:3k6WwRIT7veiDnk3Yo2NtqEYX+4dgLCrMIFvEOnjQqI=
+github.com/pulumi/pulumi/sdk/v3 v3.142.0 h1:SmcVddGuvwAh3g3XUVQQ5gVRQUKH1yZ6iETpDNHIHlw=
+github.com/pulumi/pulumi/sdk/v3 v3.142.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
 github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
 github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k=
 github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI=

diff --git a/provider/cmd/pulumi-resource-aws/schema.json b/provider/cmd/pulumi-resource-aws/schema.json
diff --git a/provider/go.mod b/provider/go.mod
@@ -20,9 +20,9 @@ require (
 	github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220923175450-ca71523cdc36
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pulumi/providertest v0.1.3
-	github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0
-	github.com/pulumi/pulumi/pkg/v3 v3.140.0
-	github.com/pulumi/pulumi/sdk/v3 v3.140.0
+	github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1
+	github.com/pulumi/pulumi/pkg/v3 v3.142.0
+	github.com/pulumi/pulumi/sdk/v3 v3.142.0
 	github.com/stretchr/testify v1.9.0
 	pgregory.net/rapid v0.6.1
 )
@@ -457,8 +457,8 @@ require (
 	github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
 	github.com/pulumi/esc v0.10.0 // indirect
 	github.com/pulumi/inflector v0.1.1 // indirect
-	github.com/pulumi/pulumi-java/pkg v0.17.0 // indirect
-	github.com/pulumi/pulumi-yaml v1.11.2 // indirect
+	github.com/pulumi/pulumi-java/pkg v0.18.0 // indirect
+	github.com/pulumi/pulumi-yaml v1.12.0 // indirect
 	github.com/pulumi/schema-tools v0.1.2 // indirect
 	github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect

diff --git a/provider/go.sum b/provider/go.sum
@@ -2454,16 +2454,16 @@ github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+Sob
 github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
 github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5AepHg=
 github.com/pulumi/providertest v0.1.3/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
-github.com/pulumi/pulumi-java/pkg v0.17.0 h1:KmaVLrVmlkzShOfaJNJDlckorbFm8dM/C7L4hj6LX8U=
-github.com/pulumi/pulumi-java/pkg v0.17.0/go.mod h1:ji4U4H7t81X4aaE88D9+z5CmKH/QoLwQi9N1iGl+2KQ=
-github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0 h1:uJB3tM1j+9SKeXLCAx3DBVHsYk4ddXNrVoiqpgXal2Q=
-github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0/go.mod h1:WnOTAfdtm5+kW3rIU0rLhxFSEHtJIMf19FdOU6NFXG0=
-github.com/pulumi/pulumi-yaml v1.11.2 h1:MU7TTNbruGCSgNHhaBygjIbLWm3WSbd1q98GpMIgQzE=
-github.com/pulumi/pulumi-yaml v1.11.2/go.mod h1:RdXRBupRGGAD1kbYNG1V1h6pyFnXisvQsl0AANvVjGI=
-github.com/pulumi/pulumi/pkg/v3 v3.140.0 h1:/bvHa19HY/6qHWvuAOVII8qr72MDGGczBWlPYlPo3j0=
-github.com/pulumi/pulumi/pkg/v3 v3.140.0/go.mod h1:rcTtSyisd7BzZTugNk/s9zlYgX9S0S10+pha3Tko6yM=
-github.com/pulumi/pulumi/sdk/v3 v3.140.0 h1:+Z/RBvdYg7tBNkBwk4p/FzlV7niBT3TbLAICq/Y0LDU=
-github.com/pulumi/pulumi/sdk/v3 v3.140.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
+github.com/pulumi/pulumi-java/pkg v0.18.0 h1:3PApc5YegH69n6oubB63mqI97pF+oQywWr7ii4082Mw=
+github.com/pulumi/pulumi-java/pkg v0.18.0/go.mod h1:YKYYFEb3Jvzf/dDJo0xOeEkIfBAMkkkdhXulauvEjmc=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1 h1:+KTtmSk6jqcqKvgNgtGVUWEimkpEZdLZs0xEYwFw288=
+github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1/go.mod h1:B/Auryr+yVUkLOMzgpFe7HLwKAtXc6YJwpAXfNGyLPk=
+github.com/pulumi/pulumi-yaml v1.12.0 h1:ThJP+EBqeJyCnS6w6/PwcEFOT5o112qv0lObhefmFCk=
+github.com/pulumi/pulumi-yaml v1.12.0/go.mod h1:EhZd1XDfuLa15O51qVVE16U6r8ldK9mLIBclqWCX27Y=
+github.com/pulumi/pulumi/pkg/v3 v3.142.0 h1:UE8TFyXrlxvPrATpd3Kl3En34KrFIFWOxxNAodywPNU=
+github.com/pulumi/pulumi/pkg/v3 v3.142.0/go.mod h1:3k6WwRIT7veiDnk3Yo2NtqEYX+4dgLCrMIFvEOnjQqI=
+github.com/pulumi/pulumi/sdk/v3 v3.142.0 h1:SmcVddGuvwAh3g3XUVQQ5gVRQUKH1yZ6iETpDNHIHlw=
+github.com/pulumi/pulumi/sdk/v3 v3.142.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
 github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
 github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k=
 github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI=

diff --git a/provider/pkg/batch/compute_environment.go b/provider/pkg/batch/compute_environment.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
 )
 
-func ComputeEnvironment(token tokens.Type) *info.Resource {
+func ComputeEnvironment(token tokens.Type, logProvider func(context.Context) tfbridge.Logger) *info.Resource {
 	return &info.Resource{
 		Tok: token,
 		TransformFromState: func(ctx context.Context, pm resource.PropertyMap) (resource.PropertyMap, error) {
@@ -40,7 +40,7 @@ func ComputeEnvironment(token tokens.Type) *info.Resource {
 				return pm, nil
 			}
 			replacement := resource.NewArrayProperty([]resource.PropertyValue{ec2c})
-			tfbridge.GetLogger(ctx).Debug(fmt.Sprintf(
+			logProvider(ctx).Debug(fmt.Sprintf(
 				"batch.ComputeEnvironment is wrapping old computeResources.ec2Configurations state in an array"))
 			cr.ObjectValue()["ec2Configuration"] = replacement
 			r["computeResources"] = cr

diff --git a/provider/pkg/batch/compute_environment_test.go b/provider/pkg/batch/compute_environment_test.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"testing"
 
-	"github.com/pulumi/pulumi-terraform-bridge/v3/unstable/logging"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/log"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 	"github.com/stretchr/testify/require"
 )
 
 func TestComputeEnvironmentTransformFromState(t *testing.T) {
 	ctx := context.Background()
-	ctx = logging.InitLogging(ctx, logging.LogOptions{})
 	pm := resource.PropertyMap{
 		"computeResources": resource.NewObjectProperty(resource.PropertyMap{
 			"ec2Configuration": resource.NewObjectProperty(resource.PropertyMap{
@@ -30,7 +30,29 @@ func TestComputeEnvironmentTransformFromState(t *testing.T) {
 			}),
 		}),
 	}
-	actual, err := ComputeEnvironment("").TransformFromState(ctx, pm)
+	actual, err := ComputeEnvironment("", func(ctx context.Context) tfbridge.Logger {
+		return testLogger{t}
+	}).TransformFromState(ctx, pm)
 	require.NoError(t, err)
 	require.Equal(t, expect, actual)
 }
+
+type testLogger struct {
+	t *testing.T
+}
+
+func (l testLogger) Debug(msg string) {
+	l.t.Log(msg)
+}
+func (l testLogger) Info(msg string) {
+	l.t.Log(msg)
+}
+func (l testLogger) Warn(msg string) {
+	l.t.Log(msg)
+}
+func (l testLogger) Error(msg string) {
+	l.t.Log(msg)
+}
+func (l testLogger) Status() log.Log {
+	return l
+}
diff --git a/provider/resources.go b/provider/resources.go
@@ -1355,7 +1355,7 @@ compatibility shim in favor of the new "name" field.`)
 				},
 			},
 			// Batch
-			"aws_batch_compute_environment": batch.ComputeEnvironment(awsResource(batchMod, "ComputeEnvironment")),
+			"aws_batch_compute_environment": batch.ComputeEnvironment(awsResource(batchMod, "ComputeEnvironment"), tfbridge.GetLogger),
 			"aws_batch_job_definition":      {Tok: awsResource(batchMod, "JobDefinition")},
 			"aws_batch_job_queue":           {Tok: awsResource(batchMod, "JobQueue")},
 			"aws_batch_scheduling_policy":   {Tok: awsResource(batchMod, "SchedulingPolicy")},

diff --git a/sdk/go.mod b/sdk/go.mod
diff --git a/sdk/go.sum b/sdk/go.sum
diff --git a/sdk/nodejs/acm/getCertificate.ts b/sdk/nodejs/acm/getCertificate.ts
diff --git a/sdk/nodejs/acmpca/getCertificate.ts b/sdk/nodejs/acmpca/getCertificate.ts
diff --git a/sdk/nodejs/acmpca/getCertificateAuthority.ts b/sdk/nodejs/acmpca/getCertificateAuthority.ts
diff --git a/sdk/nodejs/alb/getListener.ts b/sdk/nodejs/alb/getListener.ts
diff --git a/sdk/nodejs/alb/getLoadBalancer.ts b/sdk/nodejs/alb/getLoadBalancer.ts
diff --git a/sdk/nodejs/alb/getTargetGroup.ts b/sdk/nodejs/alb/getTargetGroup.ts
diff --git a/sdk/nodejs/amp/getDefaultScraperConfiguration.ts b/sdk/nodejs/amp/getDefaultScraperConfiguration.ts
diff --git a/sdk/nodejs/amp/getWorkspace.ts b/sdk/nodejs/amp/getWorkspace.ts
diff --git a/sdk/nodejs/amp/getWorkspaces.ts b/sdk/nodejs/amp/getWorkspaces.ts
diff --git a/sdk/nodejs/apigateway/getAuthorizer.ts b/sdk/nodejs/apigateway/getAuthorizer.ts
diff --git a/sdk/nodejs/apigateway/getAuthorizers.ts b/sdk/nodejs/apigateway/getAuthorizers.ts
diff --git a/sdk/nodejs/apigateway/getDomainName.ts b/sdk/nodejs/apigateway/getDomainName.ts
diff --git a/sdk/nodejs/apigateway/getExport.ts b/sdk/nodejs/apigateway/getExport.ts
diff --git a/sdk/nodejs/apigateway/getKey.ts b/sdk/nodejs/apigateway/getKey.ts
diff --git a/sdk/nodejs/apigateway/getResource.ts b/sdk/nodejs/apigateway/getResource.ts
diff --git a/sdk/nodejs/apigateway/getRestApi.ts b/sdk/nodejs/apigateway/getRestApi.ts