diff --git a/docs/guides/upgrade-sdk-to-mux.md b/docs/guides/upgrade-sdk-to-mux.md index 2c9ad252c..f8d648a49 100644 --- a/docs/guides/upgrade-sdk-to-mux.md +++ b/docs/guides/upgrade-sdk-to-mux.md @@ -14,7 +14,7 @@ Framework](https://github.com/hashicorp/terraform-plugin-sdk?tab=readme-ov-file) 1. Find the tfgen binary `main` that calls `tfgen.Main` from `github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen` and update it to call - `tfgen.MainWithMuxer` from `github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen`. + `tfgen.MainWithMuxer` from `github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen`. Note that the extra version parameter is removed from `tfgen.Main`, so this code: @@ -29,7 +29,7 @@ Framework](https://github.com/hashicorp/terraform-plugin-sdk?tab=readme-ov-file) Becomes: ``` go - import "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen" + import "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" ... @@ -39,7 +39,7 @@ Framework](https://github.com/hashicorp/terraform-plugin-sdk?tab=readme-ov-file) 1. Find the provider binary `main` that calls [`"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge".Main`](https://pkg.go.dev/github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge#Main) and update it to - [`"github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge".MainWithMuxer`](https://pkg.go.dev/github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge#MainWithMuxer). + [`"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge".MainWithMuxer`](https://pkg.go.dev/github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge#MainWithMuxer). Note the signature changes: version parameter is removed, and `Context` is now required, so this code: @@ -55,7 +55,7 @@ Framework](https://github.com/hashicorp/terraform-plugin-sdk?tab=readme-ov-file) Becomes: ```go - import "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + import "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" ... @@ -67,7 +67,7 @@ Framework](https://github.com/hashicorp/terraform-plugin-sdk?tab=readme-ov-file) (typically in `provider/resources.go`), changing the embedded `"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge".ProviderInfo.P` to the result of calling - [`"github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge".MuxShimWithPF`](https://pkg.go.dev/github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge#MuxShimWithPF). + [`"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge".MuxShimWithPF`](https://pkg.go.dev/github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge#MuxShimWithPF). This function combines the original SDK based provider with the new PF based provider, so this code: @@ -106,7 +106,7 @@ Framework](https://github.com/hashicorp/terraform-plugin-sdk?tab=readme-ov-file) ```go import ( "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" "github.com/${PROVIDER_ORG}/terraform-provider-${PROVIDER_NAME}" diff --git a/pkg/pf/README.md b/pkg/pf/README.md index e742d5347..9f95e6e5d 100644 --- a/pkg/pf/README.md +++ b/pkg/pf/README.md @@ -36,7 +36,7 @@ Follow these steps to bridge a Terraform Provider to Pulumi. import ( _ "embed" "github.com/hashicorp/terraform-plugin-framework/provider" - pf "github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfbridge" + pf "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" ) diff --git a/pkg/pf/tfbridge/metadata.go b/pkg/pf/tfbridge/metadata.go index 4a4c8b5a0..66e562bf3 100644 --- a/pkg/pf/tfbridge/metadata.go +++ b/pkg/pf/tfbridge/metadata.go @@ -21,7 +21,7 @@ import ( ) // Defines bridged provider metadata that is pre-computed at build time with tfgen (tfgen -// ("github.com/pulumi/pulumi-terraform-bridge/v3/pf/tfgen") and typically made available to the provider +// ("github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen") and typically made available to the provider // binary at runtime with [embed]. // // [embed]: https://pkg.go.dev/embed