Skip to content

Fix some pf references #3127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix some pf references #3127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/guides/upgrade-sdk-to-mux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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"

...

Expand All @@ -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:
Expand All @@ -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"

...

Expand All @@ -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:

Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion pkg/pf/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/pf/tfbridge/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down