From 5af66ab23d9fa7e47f10b384e57e896f2fe0568d Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Tue, 29 Oct 2024 08:50:57 -0400 Subject: [PATCH] Upgrade the bridge to v3.93.1 (#4663) Fixes https://github.com/pulumi/pulumi-aws/issues/4658 This is a routine update but it also accounts for the fact that /pf modules are deprecated in the bridge and standardizes on the single bridge Go module. --------- Co-authored-by: Florian Stadler --- examples/examples_test.go | 2 +- examples/go.mod | 4 +--- examples/go.sum | 9 +++------ provider/cmd/pulumi-resource-aws/main.go | 2 +- provider/cmd/pulumi-tfgen-aws/main.go | 2 +- provider/configure_test.go | 2 +- provider/go.mod | 4 +--- provider/go.sum | 9 +++------ provider/resources.go | 2 +- 9 files changed, 13 insertions(+), 23 deletions(-) diff --git a/examples/examples_test.go b/examples/examples_test.go index f39dc348427..81f3c87ec3c 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -12,7 +12,7 @@ import ( "time" testreplay "github.com/pulumi/providertest/replay" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi/pkg/v3/testing/integration" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/examples/go.mod b/examples/go.mod index 5697da1a954..a87d0b19835 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iam v1.37.2 github.com/pulumi/providertest v0.1.2 github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000 - github.com/pulumi/pulumi-terraform-bridge/pf v0.45.0 + github.com/pulumi/pulumi-terraform-bridge/v3 v3.93.1 github.com/pulumi/pulumi/pkg/v3 v3.136.1 github.com/stretchr/testify v1.9.0 ) @@ -449,8 +449,6 @@ require ( github.com/pulumi/esc v0.10.0 // indirect github.com/pulumi/inflector v0.1.1 // indirect github.com/pulumi/pulumi-java/pkg v0.16.1 // indirect - github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0 // indirect - github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.10 // indirect github.com/pulumi/pulumi-yaml v1.10.3 // indirect github.com/pulumi/pulumi/sdk/v3 v3.136.1 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect diff --git a/examples/go.sum b/examples/go.sum index 02d4b113a17..e01eefdd4e9 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -2446,12 +2446,8 @@ github.com/pulumi/providertest v0.1.2 h1:9pJS9MeNkMyGwyNeHmvh8QqLgJy39Nk2/ym5u7r github.com/pulumi/providertest v0.1.2/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0= github.com/pulumi/pulumi-java/pkg v0.16.1 h1:orHnDWFbpOERwaBLry9f+6nqPX7x0MsrIkaa5QDGAns= github.com/pulumi/pulumi-java/pkg v0.16.1/go.mod h1:QH0DihZkWYle9XFc+LJ76m4hUo+fA3RdyaM90pqOaSM= -github.com/pulumi/pulumi-terraform-bridge/pf v0.45.0 h1:RIu3thoVfOR2yyyVS1xwuJ9ud05SPuXTf7Q+mnV6CQg= -github.com/pulumi/pulumi-terraform-bridge/pf v0.45.0/go.mod h1:bcSV/ALzPJm4Ib1qS2rga27/O3DCGo2mV4XXGrcNfZE= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0 h1:LOUHyMFGYkchv4Bzej7v+1W1ooaspgQG6/oZVJ+3lXY= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0/go.mod h1:aI3U3eanRcyOX05No+Nk6FuJvppx4jjcQwFelHSI8yE= -github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.10 h1:VAXmHuldKd760ZlMe6khXeJY0ccY3TJF1g1FnWGccaM= -github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.10/go.mod h1:+AQS/2h775Chx1a4vxb7cDdyiOsdEw2Q6gD7K5QCIwI= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.93.1 h1:EEf5W3buVR5pcCKTXGouDS1/oY6TqVUIRKLksl5h4Es= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.93.1/go.mod h1:jNpOSGkfTeZSnSjpGBHHiyllciCEDRqFaZhLUpQPlpo= github.com/pulumi/pulumi-yaml v1.10.3 h1:j5cjPiE32ILmjrWnC1cfZ0MWdqCZ8fg9wlaWk7HOtM4= github.com/pulumi/pulumi-yaml v1.10.3/go.mod h1:MFMQXkaUP5YQUKVJ6Z/aagZDl2f8hdU9oGaJfTcMf1Y= github.com/pulumi/pulumi/pkg/v3 v3.136.1 h1:zA8aJZ7qI0QgZkBKjjQaYHEcigK6pZfrbfG38imXzWo= @@ -3510,6 +3506,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/provider/cmd/pulumi-resource-aws/main.go b/provider/cmd/pulumi-resource-aws/main.go index 068b30a924a..89e07938343 100644 --- a/provider/cmd/pulumi-resource-aws/main.go +++ b/provider/cmd/pulumi-resource-aws/main.go @@ -25,7 +25,7 @@ import ( "os" aws "github.com/pulumi/pulumi-aws/provider/v6" - pf "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + pf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" ) diff --git a/provider/cmd/pulumi-tfgen-aws/main.go b/provider/cmd/pulumi-tfgen-aws/main.go index 42d698ef8a8..2a375e903bf 100644 --- a/provider/cmd/pulumi-tfgen-aws/main.go +++ b/provider/cmd/pulumi-tfgen-aws/main.go @@ -20,7 +20,7 @@ import ( "strings" aws "github.com/pulumi/pulumi-aws/provider/v6" - pftfgen "github.com/pulumi/pulumi-terraform-bridge/pf/tfgen" + pftfgen "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi/pkg/v3/codegen/schema" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" diff --git a/provider/configure_test.go b/provider/configure_test.go index afe336d08b0..ca02069fa44 100644 --- a/provider/configure_test.go +++ b/provider/configure_test.go @@ -22,7 +22,7 @@ import ( "time" testutils "github.com/pulumi/providertest/replay" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/stretchr/testify/require" version "github.com/pulumi/pulumi-aws/provider/v6/pkg/version" diff --git a/provider/go.mod b/provider/go.mod index 5efe51d6d83..3ff7135f5be 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -20,8 +20,7 @@ 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.2 - github.com/pulumi/pulumi-terraform-bridge/pf v0.45.0 - github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0 + github.com/pulumi/pulumi-terraform-bridge/v3 v3.93.1 github.com/pulumi/pulumi/pkg/v3 v3.136.1 github.com/pulumi/pulumi/sdk/v3 v3.136.1 github.com/stretchr/testify v1.9.0 @@ -456,7 +455,6 @@ require ( github.com/pulumi/esc v0.10.0 // indirect github.com/pulumi/inflector v0.1.1 // indirect github.com/pulumi/pulumi-java/pkg v0.16.1 // indirect - github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.10 // indirect github.com/pulumi/pulumi-yaml v1.10.3 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/pulumi/terraform-diff-reader v0.0.2 // indirect diff --git a/provider/go.sum b/provider/go.sum index 02d4b113a17..e01eefdd4e9 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -2446,12 +2446,8 @@ github.com/pulumi/providertest v0.1.2 h1:9pJS9MeNkMyGwyNeHmvh8QqLgJy39Nk2/ym5u7r github.com/pulumi/providertest v0.1.2/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0= github.com/pulumi/pulumi-java/pkg v0.16.1 h1:orHnDWFbpOERwaBLry9f+6nqPX7x0MsrIkaa5QDGAns= github.com/pulumi/pulumi-java/pkg v0.16.1/go.mod h1:QH0DihZkWYle9XFc+LJ76m4hUo+fA3RdyaM90pqOaSM= -github.com/pulumi/pulumi-terraform-bridge/pf v0.45.0 h1:RIu3thoVfOR2yyyVS1xwuJ9ud05SPuXTf7Q+mnV6CQg= -github.com/pulumi/pulumi-terraform-bridge/pf v0.45.0/go.mod h1:bcSV/ALzPJm4Ib1qS2rga27/O3DCGo2mV4XXGrcNfZE= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0 h1:LOUHyMFGYkchv4Bzej7v+1W1ooaspgQG6/oZVJ+3lXY= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0/go.mod h1:aI3U3eanRcyOX05No+Nk6FuJvppx4jjcQwFelHSI8yE= -github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.10 h1:VAXmHuldKd760ZlMe6khXeJY0ccY3TJF1g1FnWGccaM= -github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.10/go.mod h1:+AQS/2h775Chx1a4vxb7cDdyiOsdEw2Q6gD7K5QCIwI= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.93.1 h1:EEf5W3buVR5pcCKTXGouDS1/oY6TqVUIRKLksl5h4Es= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.93.1/go.mod h1:jNpOSGkfTeZSnSjpGBHHiyllciCEDRqFaZhLUpQPlpo= github.com/pulumi/pulumi-yaml v1.10.3 h1:j5cjPiE32ILmjrWnC1cfZ0MWdqCZ8fg9wlaWk7HOtM4= github.com/pulumi/pulumi-yaml v1.10.3/go.mod h1:MFMQXkaUP5YQUKVJ6Z/aagZDl2f8hdU9oGaJfTcMf1Y= github.com/pulumi/pulumi/pkg/v3 v3.136.1 h1:zA8aJZ7qI0QgZkBKjjQaYHEcigK6pZfrbfG38imXzWo= @@ -3510,6 +3506,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/provider/resources.go b/provider/resources.go index c68836f341d..1d855c10d73 100644 --- a/provider/resources.go +++ b/provider/resources.go @@ -34,7 +34,7 @@ import ( "github.com/pulumi/pulumi-aws/provider/v6/pkg/rds" "github.com/pulumi/pulumi-aws/provider/v6/pkg/version" - pftfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + pftfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" tks "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens"