From c9dc4dbfc7901c293e677acd98abfe007b990378 Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Thu, 7 Nov 2024 22:03:59 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- examples/labels-combinations-go/go.mod | 3 +-- examples/labels-combinations-go/go.sum | 8 ++------ provider/cmd/pulumi-resource-gcp/main.go | 2 +- provider/cmd/pulumi-tfgen-gcp/main.go | 2 +- provider/go.mod | 1 - provider/go.sum | 2 -- provider/provider_test.go | 2 +- provider/resources.go | 2 +- 8 files changed, 7 insertions(+), 15 deletions(-) diff --git a/examples/labels-combinations-go/go.mod b/examples/labels-combinations-go/go.mod index edf53ce622..7dd3274bc0 100644 --- a/examples/labels-combinations-go/go.mod +++ b/examples/labels-combinations-go/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/pulumi/pulumi-gcp/sdk/v8 v8.0.0-alpha.0 - github.com/pulumi/pulumi/sdk/v3 v3.136.1 + github.com/pulumi/pulumi/sdk/v3 v3.137.0 ) replace github.com/pulumi/pulumi-gcp/sdk/v8 => ../../sdk @@ -71,7 +71,6 @@ require ( github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect - github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect diff --git a/examples/labels-combinations-go/go.sum b/examples/labels-combinations-go/go.sum index 0405226c65..bc694decbe 100644 --- a/examples/labels-combinations-go/go.sum +++ b/examples/labels-combinations-go/go.sum @@ -150,10 +150,8 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435 github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs= github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c= -github.com/pulumi/pulumi/sdk/v3 v3.130.0 h1:gGJNd+akPqhZ+vrsZmAjSNJn6kGJkitjjkwrmIQMmn8= -github.com/pulumi/pulumi/sdk/v3 v3.130.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= -github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8= -github.com/pulumi/pulumi/sdk/v3 v3.136.1/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI= +github.com/pulumi/pulumi/sdk/v3 v3.137.0 h1:bxhYpOY7Z4xt+VmezEpHuhjpOekkaMqOjzxFg/1OhCw= +github.com/pulumi/pulumi/sdk/v3 v3.137.0/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= @@ -187,8 +185,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= -github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68= -github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7/go.mod h1:UxoP3EypF8JfGEjAII8jx1q8rQyDnX8qdTCs/UQBVIE= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= diff --git a/provider/cmd/pulumi-resource-gcp/main.go b/provider/cmd/pulumi-resource-gcp/main.go index 6160207c0b..194d76bd22 100644 --- a/provider/cmd/pulumi-resource-gcp/main.go +++ b/provider/cmd/pulumi-resource-gcp/main.go @@ -22,7 +22,7 @@ import ( // Allow embedding a pregenerated schema. _ "embed" - "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" gcp "github.com/pulumi/pulumi-gcp/provider/v8" ) diff --git a/provider/cmd/pulumi-tfgen-gcp/main.go b/provider/cmd/pulumi-tfgen-gcp/main.go index 7c81cbfcfe..a04942bca2 100644 --- a/provider/cmd/pulumi-tfgen-gcp/main.go +++ b/provider/cmd/pulumi-tfgen-gcp/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/pulumi/pulumi-terraform-bridge/pf/tfgen" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" gcp "github.com/pulumi/pulumi-gcp/provider/v8" ) diff --git a/provider/go.mod b/provider/go.mod index d2413a1b0a..fe0546052e 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -10,7 +10,6 @@ require ( github.com/hashicorp/terraform-provider-google-beta v0.0.0 github.com/hexops/autogold/v2 v2.2.1 github.com/pulumi/providertest v0.1.3 - github.com/pulumi/pulumi-terraform-bridge/pf v0.47.0 github.com/pulumi/pulumi-terraform-bridge/v3 v3.94.0 github.com/pulumi/pulumi/pkg/v3 v3.137.0 github.com/pulumi/pulumi/sdk/v3 v3.137.0 diff --git a/provider/go.sum b/provider/go.sum index dfd65bcaa2..1a1311ae5c 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -1984,8 +1984,6 @@ github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5A github.com/pulumi/providertest v0.1.3/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.47.0 h1:vPNSFtQxeXaqhKxjPHeuNX1g9l4HB/TVj5A3iUrd0EU= -github.com/pulumi/pulumi-terraform-bridge/pf v0.47.0/go.mod h1:n1Yt5RBM0Td388yoPX380Jz6tlVqJzVsNfWGcaQo5vE= github.com/pulumi/pulumi-terraform-bridge/v3 v3.94.0 h1:wRJxFAQVV5Bg+BUVKpsNTWDIBSPCZUnbtxTyujZiM2o= github.com/pulumi/pulumi-terraform-bridge/v3 v3.94.0/go.mod h1:S7rLe9paLUP2U7iwJhNJslwQszlgUfND83KRVCogbog= github.com/pulumi/pulumi-yaml v1.11.1 h1:ULUL9fpb2Bwgf3jJHx0FamKYm0ld0KxBQr/uSAslRLk= diff --git a/provider/provider_test.go b/provider/provider_test.go index 1256e5b81c..95e9ac161d 100644 --- a/provider/provider_test.go +++ b/provider/provider_test.go @@ -18,7 +18,7 @@ import ( "github.com/pulumi/providertest/pulumitest" "github.com/pulumi/providertest/pulumitest/assertpreview" "github.com/pulumi/providertest/pulumitest/opttest" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi/sdk/v3/go/auto" pulumirpc "github.com/pulumi/pulumi/sdk/v3/proto/go" diff --git a/provider/resources.go b/provider/resources.go index 06bd37ef7e..267aa229bb 100644 --- a/provider/resources.go +++ b/provider/resources.go @@ -21,7 +21,7 @@ import ( "google.golang.org/api/compute/v1" "google.golang.org/api/option" - pf "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + pf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" info "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" tks "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens"