plugin: Adjustments for new framework providerserver package

Reference: hashicorp/terraform-plugin-framework#308
hashicorp · Apr 28, 2022 · db7e6a5 · db7e6a5
1 parent 7b0c30f
commit db7e6a5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/content/plugin/framework/acctests.mdx b/content/plugin/framework/acctests.mdx
@@ -28,15 +28,15 @@ to supply a map of functions that return a
 To get a `tfprotov6.ProviderServer` from a
 [`tfsdk.Provider`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/tfsdk#Provider),
 you need to use the
-[`tfsdk.NewProtocol6ProviderServerWithError`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/tfsdk#NewProtocol6ProviderServerWithError)
+[`providerserver.NewProtocol6WithError`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/tfsdk#NewProtocol6ProviderServerWithError)
 helper. For example:
 
 ```go
 resource.Test(t, resource.TestCase{
 	PreCheck: func() { testAccPreCheck(t) },
 	ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error) {
 		// newProvider is your function that returns a tfsdk.Provider
-		"example_provider": tfsdk.NewProtocol6ProviderServerWithError(newProvider()),
+		"example_provider": providerserver.NewProtocol6WithError(newProvider()),
 	},
 	CheckDestroy: testAccCheckExampleResourceDestroy,
 	Steps: []resource.TestStep{

diff --git a/content/plugin/mux/combining-protocol-version-6-providers.mdx b/content/plugin/mux/combining-protocol-version-6-providers.mdx
@@ -67,8 +67,8 @@ func main() {
 	ctx := context.Background()
 	providers := []func() tfprotov6.ProviderServer{
 		// Example terraform-plugin-framework providers
-		tfsdk.NewProtocol6ProviderServer(provider1.New("test")())
-		tfsdk.NewProtocol6ProviderServer(provider2.New("test")())
+		providerserver.NewProtocol6(provider1.New("test")())
+		providerserver.NewProtocol6(provider2.New("test")())
 	}
 
 	muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)
@@ -109,8 +109,8 @@ resource.Test(t, resource.TestCase{
 			ctx := context.Background()
 			providers := []func() tfprotov6.ProviderServer{
 				// Example terraform-plugin-framework providers
-				tfsdk.NewProtocol6ProviderServer(provider1.New("test")())
-				tfsdk.NewProtocol6ProviderServer(provider2.New("test")())
+				providerserver.NewProtocol6(provider1.New("test")())
+				providerserver.NewProtocol6(provider2.New("test")())
 			}
 
 			muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)

diff --git a/content/plugin/mux/translating-protocol-version-5-to-6.mdx b/content/plugin/mux/translating-protocol-version-5-to-6.mdx
@@ -57,7 +57,7 @@ providers := []func() tfprotov6.ProviderServer{
 	upgradedSdkProvider.ProviderServer,
 
 	// Example terraform-plugin-framework provider
-	tfsdk.NewProtocol6ProviderServer(frameworkprovider.New(version)())
+	providerserver.NewProtocol6(frameworkprovider.New(version)())
 }
 
 muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)

diff --git a/content/plugin/mux/translating-protocol-version-6-to-5.mdx b/content/plugin/mux/translating-protocol-version-6-to-5.mdx
@@ -37,7 +37,7 @@ The following example downgrades a `terraform-plugin-framework` provider.
 ```go
 downgradedFrameworkProvider, err := tf6to5server.DowngradeServer(
 	context.Background(),
-	tfsdk.NewProtocol6ProviderServer(frameworkprovider.New(version)())
+	providerserver.NewProtocol6(frameworkprovider.New(version)())
 )
 ```
 
@@ -79,7 +79,7 @@ resource.Test(t, resource.TestCase{
 			ctx := context.Background()
 			downgradedFrameworkProvider, err := tf6to5server.DowngradeServer(
 				ctx,
-				tfsdk.NewProtocol6ProviderServer(frameworkprovider.New("test")())
+				providerserver.NewProtocol6(frameworkprovider.New("test")())
 			)
 
 			if err != nil {