Skip to content

Commit 9a60cbe

Browse files
committed
switch to v3 plugin framework bridge
1 parent 53106af commit 9a60cbe

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

provider/cmd/pulumi-resource-equinix/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import (
2121
_ "embed"
2222

2323
equinix "github.com/equinix/pulumi-equinix/provider"
24-
pf "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
24+
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge"
2525
)
2626

2727
//go:embed schema-embed.json
2828
var pulumiSchema []byte
2929

3030
func main() {
3131
// Modify the path to point to the new provider
32-
pf.MainWithMuxer(context.Background(), "equinix", equinix.Provider(), pulumiSchema)
32+
tfbridge.MainWithMuxer(context.Background(), "equinix", equinix.Provider(), pulumiSchema)
3333
}

provider/cmd/pulumi-tfgen-equinix/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package main
1616

1717
import (
1818
equinix "github.com/equinix/pulumi-equinix/provider"
19-
"github.com/pulumi/pulumi-terraform-bridge/pf/tfgen"
19+
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen"
2020
)
2121

2222
func main() {

provider/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ replace (
99

1010
require (
1111
github.com/equinix/terraform-provider-equinix v1.37.0
12-
github.com/pulumi/pulumi-terraform-bridge/pf v0.49.0
1312
github.com/pulumi/pulumi-terraform-bridge/v3 v3.114.0
1413
github.com/pulumi/pulumi/pkg/v3 v3.190.0
1514
github.com/pulumi/pulumi/sdk/v3 v3.190.0

provider/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,8 +2198,6 @@ github.com/pulumi/providertest v0.3.0 h1:Dv10aoFaNQBDRtK8cRbd2uk9vEhpC/NryN+0y7N
21982198
github.com/pulumi/providertest v0.3.0/go.mod h1:aTxVfdxP/Pe0iPbokjBp99x0XaY4fkZB2CjIS5wysMs=
21992199
github.com/pulumi/pulumi-java/pkg v1.12.0 h1:T7yFnFr0bgqy6huVUANMyUeGO1/Y3r2CJJ6S5YQDQCU=
22002200
github.com/pulumi/pulumi-java/pkg v1.12.0/go.mod h1:g8QQjEgB5wTsZptyf1vbIcI/pgYEGJObnihAEgymkAo=
2201-
github.com/pulumi/pulumi-terraform-bridge/pf v0.49.0 h1:GJ20wQxz5dYbOWdDyDp1E3SuuTuLVdBpnp70FJ+VVpQ=
2202-
github.com/pulumi/pulumi-terraform-bridge/pf v0.49.0/go.mod h1:zDdNBSsrNhUxyeX1MrXr/O71DBpWMFZ8dGIGV0Pbj0c=
22032201
github.com/pulumi/pulumi-terraform-bridge/v3 v3.114.0 h1:Ham/ASNvcRrxlxrEraI9uIPo75z9VPRjsf/Ot5sW8cQ=
22042202
github.com/pulumi/pulumi-terraform-bridge/v3 v3.114.0/go.mod h1:wMck+7nC9uOFMSjSilgVifkNWwzpugwGOcs7+45z2xU=
22052203
github.com/pulumi/pulumi-yaml v1.19.1 h1:Y92eTQv07p5RbbNj6s/54+ibdPgvndLJ2Lb1IjYffng=

provider/resources.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"github.com/equinix/pulumi-equinix/provider/pkg/version"
2828
equinixShim "github.com/equinix/terraform-provider-equinix/shim"
29-
pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge"
29+
pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge"
3030
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
3131
shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
3232
shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
@@ -82,7 +82,7 @@ func makeEquinixToken(moduleTitle, res string) string {
8282
// It should validate that the provider can be configured, and provide actionable errors in the case
8383
// it cannot be. Configuration variables can be read from `vars` using the `stringValue` function -
8484
// for example `stringValue(vars, "accessKey")`.
85-
func preConfigureCallback(vars resource.PropertyMap, c shim.ResourceConfig) error {
85+
func preConfigureCallback(_ resource.PropertyMap, _ shim.ResourceConfig) error {
8686
return nil
8787
}
8888

@@ -92,7 +92,7 @@ func Provider() tfbridge.ProviderInfo {
9292
upstreamProvider := equinixShim.NewUpstreamProvider(version.Version)
9393
v2p := shimv2.NewProvider(upstreamProvider.SDKV2Provider,
9494
shimv2.WithDiffStrategy(shimv2.PlanState),
95-
shimv2.WithPlanResourceChange(func(s string) bool { return true }),
95+
shimv2.WithPlanResourceChange(func(_ string) bool { return true }),
9696
)
9797
p := pfbridge.MuxShimWithDisjointgPF(context.Background(), v2p, upstreamProvider.PluginFrameworkProvider)
9898

0 commit comments

Comments
 (0)