From f67a9d20f0f06d66b60854830cf2063c8b699bda Mon Sep 17 00:00:00 2001
From: Brian Flad <bflad417@gmail.com>
Date: Thu, 28 Apr 2022 12:53:14 -0400
Subject: [PATCH] plugin: Update tfsdk.NewProtocol6Server usage with new
 providerserver package functions (#2256)

Reference: https://github.com/hashicorp/terraform-plugin-framework/pull/294
Reference: https://github.com/hashicorp/terraform-plugin-framework/pull/308
---
 content/plugin/framework/acctests.mdx            |  9 +++------
 .../combining-protocol-version-6-providers.mdx   | 16 ++++------------
 .../mux/translating-protocol-version-5-to-6.mdx  |  4 +---
 .../mux/translating-protocol-version-6-to-5.mdx  |  8 ++------
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/content/plugin/framework/acctests.mdx b/content/plugin/framework/acctests.mdx
index 0f191e86ba..39f6e99ffb 100644
--- a/content/plugin/framework/acctests.mdx
+++ b/content/plugin/framework/acctests.mdx
@@ -28,18 +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.NewProtocol6Server`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/tfsdk#NewProtocol6Server)
+[`providerserver.NewProtocol6WithError`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-framework/providerserver#NewProtocol6WithError)
 helper. For example:
 
 ```go
 resource.Test(t, resource.TestCase{
 	PreCheck: func() { testAccPreCheck(t) },
 	ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error) {
-		"example_provider": func() (tfprotov6.ProviderServer, error) {
-			// newProvider is your function that returns a
-			// tfsdk.Provider implementation
-			return tfsdk.NewProtocol6Server(newProvider()), nil
-		},
+		// newProvider is your function that returns a tfsdk.Provider
+		"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
index dbe64d0abf..b903cb2c05 100644
--- a/content/plugin/mux/combining-protocol-version-6-providers.mdx
+++ b/content/plugin/mux/combining-protocol-version-6-providers.mdx
@@ -67,12 +67,8 @@ func main() {
 	ctx := context.Background()
 	providers := []func() tfprotov6.ProviderServer{
 		// Example terraform-plugin-framework providers
-		func() tfprotov6.ProviderServer {
-			return tfsdk.NewProtocol6Server(provider1.New("test")())
-		},
-		func() tfprotov6.ProviderServer {
-			return tfsdk.NewProtocol6Server(provider2.New("test")())
-		},
+		providerserver.NewProtocol6(provider1.New("test")())
+		providerserver.NewProtocol6(provider2.New("test")())
 	}
 
 	muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)
@@ -113,12 +109,8 @@ resource.Test(t, resource.TestCase{
 			ctx := context.Background()
 			providers := []func() tfprotov6.ProviderServer{
 				// Example terraform-plugin-framework providers
-				func() tfprotov6.ProviderServer {
-					return tfsdk.NewProtocol6Server(provider1.New("test")())
-				},
-				func() tfprotov6.ProviderServer {
-					return tfsdk.NewProtocol6Server(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
index 50a0c06f83..553c4f190f 100644
--- a/content/plugin/mux/translating-protocol-version-5-to-6.mdx
+++ b/content/plugin/mux/translating-protocol-version-5-to-6.mdx
@@ -57,9 +57,7 @@ providers := []func() tfprotov6.ProviderServer{
 	upgradedSdkProvider.ProviderServer,
 
 	// Example terraform-plugin-framework provider
-	func() tfprotov6.ProviderServer {
-		return tfsdk.NewProtocol6Server(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
index 22a0418d77..808f586314 100644
--- a/content/plugin/mux/translating-protocol-version-6-to-5.mdx
+++ b/content/plugin/mux/translating-protocol-version-6-to-5.mdx
@@ -37,9 +37,7 @@ The following example downgrades a `terraform-plugin-framework` provider.
 ```go
 downgradedFrameworkProvider, err := tf6to5server.DowngradeServer(
 	context.Background(),
-	func() tfprotov6.ProviderServer {
-		return tfsdk.NewProtocol6Server(frameworkprovider.New(version)())
-	},
+	providerserver.NewProtocol6(frameworkprovider.New(version)())
 )
 ```
 
@@ -81,9 +79,7 @@ resource.Test(t, resource.TestCase{
 			ctx := context.Background()
 			downgradedFrameworkProvider, err := tf6to5server.DowngradeServer(
 				ctx,
-				func() tfprotov6.ProviderServer {
-					return tfsdk.NewProtocol6Server(frameworkprovider.New("test")())
-				},
+				providerserver.NewProtocol6(frameworkprovider.New("test")())
 			)
 
 			if err != nil {