Skip to content

Commit 88369b2

Browse files
corymhallcorymhall
authored
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
1 parent 0407e25 commit 88369b2

File tree

1,202 files changed

+2781
-2757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,202 files changed

+2781
-2757
lines changed

‎examples/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/aws/aws-sdk-go-v2/service/iam v1.38.2
99
github.com/pulumi/providertest v0.1.3
1010
github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000
11-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0
12-
github.com/pulumi/pulumi/pkg/v3 v3.140.0
11+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1
12+
github.com/pulumi/pulumi/pkg/v3 v3.142.0
1313
github.com/stretchr/testify v1.9.0
1414
)
1515

@@ -451,9 +451,9 @@ require (
451451
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
452452
github.com/pulumi/esc v0.10.0 // indirect
453453
github.com/pulumi/inflector v0.1.1 // indirect
454-
github.com/pulumi/pulumi-java/pkg v0.17.0 // indirect
455-
github.com/pulumi/pulumi-yaml v1.11.2 // indirect
456-
github.com/pulumi/pulumi/sdk/v3 v3.140.0 // indirect
454+
github.com/pulumi/pulumi-java/pkg v0.18.0 // indirect
455+
github.com/pulumi/pulumi-yaml v1.12.0 // indirect
456+
github.com/pulumi/pulumi/sdk/v3 v3.142.0 // indirect
457457
github.com/pulumi/schema-tools v0.1.2 // indirect
458458
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
459459
github.com/rivo/uniseg v0.4.4 // indirect

‎examples/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,16 +2454,16 @@ github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+Sob
24542454
github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
24552455
github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5AepHg=
24562456
github.com/pulumi/providertest v0.1.3/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
2457-
github.com/pulumi/pulumi-java/pkg v0.17.0 h1:KmaVLrVmlkzShOfaJNJDlckorbFm8dM/C7L4hj6LX8U=
2458-
github.com/pulumi/pulumi-java/pkg v0.17.0/go.mod h1:ji4U4H7t81X4aaE88D9+z5CmKH/QoLwQi9N1iGl+2KQ=
2459-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0 h1:uJB3tM1j+9SKeXLCAx3DBVHsYk4ddXNrVoiqpgXal2Q=
2460-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0/go.mod h1:WnOTAfdtm5+kW3rIU0rLhxFSEHtJIMf19FdOU6NFXG0=
2461-
github.com/pulumi/pulumi-yaml v1.11.2 h1:MU7TTNbruGCSgNHhaBygjIbLWm3WSbd1q98GpMIgQzE=
2462-
github.com/pulumi/pulumi-yaml v1.11.2/go.mod h1:RdXRBupRGGAD1kbYNG1V1h6pyFnXisvQsl0AANvVjGI=
2463-
github.com/pulumi/pulumi/pkg/v3 v3.140.0 h1:/bvHa19HY/6qHWvuAOVII8qr72MDGGczBWlPYlPo3j0=
2464-
github.com/pulumi/pulumi/pkg/v3 v3.140.0/go.mod h1:rcTtSyisd7BzZTugNk/s9zlYgX9S0S10+pha3Tko6yM=
2465-
github.com/pulumi/pulumi/sdk/v3 v3.140.0 h1:+Z/RBvdYg7tBNkBwk4p/FzlV7niBT3TbLAICq/Y0LDU=
2466-
github.com/pulumi/pulumi/sdk/v3 v3.140.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
2457+
github.com/pulumi/pulumi-java/pkg v0.18.0 h1:3PApc5YegH69n6oubB63mqI97pF+oQywWr7ii4082Mw=
2458+
github.com/pulumi/pulumi-java/pkg v0.18.0/go.mod h1:YKYYFEb3Jvzf/dDJo0xOeEkIfBAMkkkdhXulauvEjmc=
2459+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1 h1:+KTtmSk6jqcqKvgNgtGVUWEimkpEZdLZs0xEYwFw288=
2460+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1/go.mod h1:B/Auryr+yVUkLOMzgpFe7HLwKAtXc6YJwpAXfNGyLPk=
2461+
github.com/pulumi/pulumi-yaml v1.12.0 h1:ThJP+EBqeJyCnS6w6/PwcEFOT5o112qv0lObhefmFCk=
2462+
github.com/pulumi/pulumi-yaml v1.12.0/go.mod h1:EhZd1XDfuLa15O51qVVE16U6r8ldK9mLIBclqWCX27Y=
2463+
github.com/pulumi/pulumi/pkg/v3 v3.142.0 h1:UE8TFyXrlxvPrATpd3Kl3En34KrFIFWOxxNAodywPNU=
2464+
github.com/pulumi/pulumi/pkg/v3 v3.142.0/go.mod h1:3k6WwRIT7veiDnk3Yo2NtqEYX+4dgLCrMIFvEOnjQqI=
2465+
github.com/pulumi/pulumi/sdk/v3 v3.142.0 h1:SmcVddGuvwAh3g3XUVQQ5gVRQUKH1yZ6iETpDNHIHlw=
2466+
github.com/pulumi/pulumi/sdk/v3 v3.142.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
24672467
github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
24682468
github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k=
24692469
github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI=

‎provider/cmd/pulumi-resource-aws/schema.json‎

Lines changed: 932 additions & 932 deletions
Large diffs are not rendered by default.

‎provider/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ require (
2020
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220923175450-ca71523cdc36
2121
github.com/mitchellh/go-homedir v1.1.0
2222
github.com/pulumi/providertest v0.1.3
23-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0
24-
github.com/pulumi/pulumi/pkg/v3 v3.140.0
25-
github.com/pulumi/pulumi/sdk/v3 v3.140.0
23+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1
24+
github.com/pulumi/pulumi/pkg/v3 v3.142.0
25+
github.com/pulumi/pulumi/sdk/v3 v3.142.0
2626
github.com/stretchr/testify v1.9.0
2727
pgregory.net/rapid v0.6.1
2828
)
@@ -457,8 +457,8 @@ require (
457457
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
458458
github.com/pulumi/esc v0.10.0 // indirect
459459
github.com/pulumi/inflector v0.1.1 // indirect
460-
github.com/pulumi/pulumi-java/pkg v0.17.0 // indirect
461-
github.com/pulumi/pulumi-yaml v1.11.2 // indirect
460+
github.com/pulumi/pulumi-java/pkg v0.18.0 // indirect
461+
github.com/pulumi/pulumi-yaml v1.12.0 // indirect
462462
github.com/pulumi/schema-tools v0.1.2 // indirect
463463
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
464464
github.com/rivo/uniseg v0.4.4 // indirect

‎provider/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,16 +2454,16 @@ github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+Sob
24542454
github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
24552455
github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5AepHg=
24562456
github.com/pulumi/providertest v0.1.3/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
2457-
github.com/pulumi/pulumi-java/pkg v0.17.0 h1:KmaVLrVmlkzShOfaJNJDlckorbFm8dM/C7L4hj6LX8U=
2458-
github.com/pulumi/pulumi-java/pkg v0.17.0/go.mod h1:ji4U4H7t81X4aaE88D9+z5CmKH/QoLwQi9N1iGl+2KQ=
2459-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0 h1:uJB3tM1j+9SKeXLCAx3DBVHsYk4ddXNrVoiqpgXal2Q=
2460-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.96.0/go.mod h1:WnOTAfdtm5+kW3rIU0rLhxFSEHtJIMf19FdOU6NFXG0=
2461-
github.com/pulumi/pulumi-yaml v1.11.2 h1:MU7TTNbruGCSgNHhaBygjIbLWm3WSbd1q98GpMIgQzE=
2462-
github.com/pulumi/pulumi-yaml v1.11.2/go.mod h1:RdXRBupRGGAD1kbYNG1V1h6pyFnXisvQsl0AANvVjGI=
2463-
github.com/pulumi/pulumi/pkg/v3 v3.140.0 h1:/bvHa19HY/6qHWvuAOVII8qr72MDGGczBWlPYlPo3j0=
2464-
github.com/pulumi/pulumi/pkg/v3 v3.140.0/go.mod h1:rcTtSyisd7BzZTugNk/s9zlYgX9S0S10+pha3Tko6yM=
2465-
github.com/pulumi/pulumi/sdk/v3 v3.140.0 h1:+Z/RBvdYg7tBNkBwk4p/FzlV7niBT3TbLAICq/Y0LDU=
2466-
github.com/pulumi/pulumi/sdk/v3 v3.140.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
2457+
github.com/pulumi/pulumi-java/pkg v0.18.0 h1:3PApc5YegH69n6oubB63mqI97pF+oQywWr7ii4082Mw=
2458+
github.com/pulumi/pulumi-java/pkg v0.18.0/go.mod h1:YKYYFEb3Jvzf/dDJo0xOeEkIfBAMkkkdhXulauvEjmc=
2459+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1 h1:+KTtmSk6jqcqKvgNgtGVUWEimkpEZdLZs0xEYwFw288=
2460+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.97.1/go.mod h1:B/Auryr+yVUkLOMzgpFe7HLwKAtXc6YJwpAXfNGyLPk=
2461+
github.com/pulumi/pulumi-yaml v1.12.0 h1:ThJP+EBqeJyCnS6w6/PwcEFOT5o112qv0lObhefmFCk=
2462+
github.com/pulumi/pulumi-yaml v1.12.0/go.mod h1:EhZd1XDfuLa15O51qVVE16U6r8ldK9mLIBclqWCX27Y=
2463+
github.com/pulumi/pulumi/pkg/v3 v3.142.0 h1:UE8TFyXrlxvPrATpd3Kl3En34KrFIFWOxxNAodywPNU=
2464+
github.com/pulumi/pulumi/pkg/v3 v3.142.0/go.mod h1:3k6WwRIT7veiDnk3Yo2NtqEYX+4dgLCrMIFvEOnjQqI=
2465+
github.com/pulumi/pulumi/sdk/v3 v3.142.0 h1:SmcVddGuvwAh3g3XUVQQ5gVRQUKH1yZ6iETpDNHIHlw=
2466+
github.com/pulumi/pulumi/sdk/v3 v3.142.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
24672467
github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
24682468
github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k=
24692469
github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI=

‎provider/pkg/batch/compute_environment.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
2525
)
2626

27-
func ComputeEnvironment(token tokens.Type) *info.Resource {
27+
func ComputeEnvironment(token tokens.Type, logProvider func(context.Context) tfbridge.Logger) *info.Resource {
2828
return &info.Resource{
2929
Tok: token,
3030
TransformFromState: func(ctx context.Context, pm resource.PropertyMap) (resource.PropertyMap, error) {
@@ -40,7 +40,7 @@ func ComputeEnvironment(token tokens.Type) *info.Resource {
4040
return pm, nil
4141
}
4242
replacement := resource.NewArrayProperty([]resource.PropertyValue{ec2c})
43-
tfbridge.GetLogger(ctx).Debug(fmt.Sprintf(
43+
logProvider(ctx).Debug(fmt.Sprintf(
4444
"batch.ComputeEnvironment is wrapping old computeResources.ec2Configurations state in an array"))
4545
cr.ObjectValue()["ec2Configuration"] = replacement
4646
r["computeResources"] = cr

‎provider/pkg/batch/compute_environment_test.go‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/pulumi/pulumi-terraform-bridge/v3/unstable/logging"
7+
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
8+
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/log"
89
"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
910
"github.com/stretchr/testify/require"
1011
)
1112

1213
func TestComputeEnvironmentTransformFromState(t *testing.T) {
1314
ctx := context.Background()
14-
ctx = logging.InitLogging(ctx, logging.LogOptions{})
1515
pm := resource.PropertyMap{
1616
"computeResources": resource.NewObjectProperty(resource.PropertyMap{
1717
"ec2Configuration": resource.NewObjectProperty(resource.PropertyMap{
@@ -30,7 +30,29 @@ func TestComputeEnvironmentTransformFromState(t *testing.T) {
3030
}),
3131
}),
3232
}
33-
actual, err := ComputeEnvironment("").TransformFromState(ctx, pm)
33+
actual, err := ComputeEnvironment("", func(ctx context.Context) tfbridge.Logger {
34+
return testLogger{t}
35+
}).TransformFromState(ctx, pm)
3436
require.NoError(t, err)
3537
require.Equal(t, expect, actual)
3638
}
39+
40+
type testLogger struct {
41+
t *testing.T
42+
}
43+
44+
func (l testLogger) Debug(msg string) {
45+
l.t.Log(msg)
46+
}
47+
func (l testLogger) Info(msg string) {
48+
l.t.Log(msg)
49+
}
50+
func (l testLogger) Warn(msg string) {
51+
l.t.Log(msg)
52+
}
53+
func (l testLogger) Error(msg string) {
54+
l.t.Log(msg)
55+
}
56+
func (l testLogger) Status() log.Log {
57+
return l
58+
}

‎provider/resources.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ compatibility shim in favor of the new "name" field.`)
13551355
},
13561356
},
13571357
// Batch
1358-
"aws_batch_compute_environment": batch.ComputeEnvironment(awsResource(batchMod, "ComputeEnvironment")),
1358+
"aws_batch_compute_environment": batch.ComputeEnvironment(awsResource(batchMod, "ComputeEnvironment"), tfbridge.GetLogger),
13591359
"aws_batch_job_definition": {Tok: awsResource(batchMod, "JobDefinition")},
13601360
"aws_batch_job_queue": {Tok: awsResource(batchMod, "JobQueue")},
13611361
"aws_batch_scheduling_policy": {Tok: awsResource(batchMod, "SchedulingPolicy")},

‎sdk/go.mod‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/go.sum‎

Lines changed: 2 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)