From 11730ba6dc3982bd6cfb99edc780ba5fdc488562 Mon Sep 17 00:00:00 2001
From: iwarapter <iwarapter@hotmail.com>
Date: Mon, 25 Apr 2022 14:30:18 +0100
Subject: [PATCH] tfsdk: correct NewProtocol6ProviderServerWithError to match
 the sdkv2 definition for ProtoV6ProviderFactories (#303)

---
 .changelog/303.txt  | 3 +++
 tfsdk/serve.go      | 8 ++++----
 tfsdk/serve_test.go | 4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .changelog/303.txt

diff --git a/.changelog/303.txt b/.changelog/303.txt
new file mode 100644
index 000000000..4469a145e
--- /dev/null
+++ b/.changelog/303.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+tfsdk: Correct `NewProtocol6ProviderServerWithError` function signature to align to sdk v2 `TestCase.ProtoV6ProviderFactories`
+```
\ No newline at end of file
diff --git a/tfsdk/serve.go b/tfsdk/serve.go
index 91c511d68..cd81fe890 100644
--- a/tfsdk/serve.go
+++ b/tfsdk/serve.go
@@ -50,12 +50,12 @@ func NewProtocol6ProviderServer(p Provider) func() tfprotov6.ProviderServer {
 // acceptance testing helper/resource.TestCase.ProtoV6ProviderFactories.
 //
 // The error return is not currently used, but it may be in the future.
-func NewProtocol6ProviderServerWithError(p Provider) (func() tfprotov6.ProviderServer, error) {
-	return func() tfprotov6.ProviderServer {
+func NewProtocol6ProviderServerWithError(p Provider) func() (tfprotov6.ProviderServer, error) {
+	return func() (tfprotov6.ProviderServer, error) {
 		return &server{
 			p: p,
-		}
-	}, nil
+		}, nil
+	}
 }
 
 // Serve serves a provider, blocking until the context is canceled.
diff --git a/tfsdk/serve_test.go b/tfsdk/serve_test.go
index 71add9ffe..83bb60b22 100644
--- a/tfsdk/serve_test.go
+++ b/tfsdk/serve_test.go
@@ -33,14 +33,12 @@ func TestNewProtocol6ProviderServer(t *testing.T) {
 func TestNewProtocol6ProviderServerWithError(t *testing.T) {
 	provider := &testServeProvider{}
 
-	providerServerFunc, err := NewProtocol6ProviderServerWithError(provider)
+	providerServer, err := NewProtocol6ProviderServerWithError(provider)()
 
 	if err != nil {
 		t.Fatalf("unexpected error creating ProviderServer: %s", err)
 	}
 
-	providerServer := providerServerFunc()
-
 	// Simple verification
 	_, err = providerServer.GetProviderSchema(context.Background(), &tfprotov6.GetProviderSchemaRequest{})