From b5c3df66d4bf0f54f79c741e6c67a47d519b1461 Mon Sep 17 00:00:00 2001 From: Iain Adams Date: Sun, 24 Apr 2022 20:41:53 +0100 Subject: [PATCH] correct NewProtocol6ProviderServerWithError to match the sdkv2 definition for ProtoV6ProviderFactories --- tfsdk/serve.go | 8 +++----- tfsdk/serve_test.go | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tfsdk/serve.go b/tfsdk/serve.go index b647eb682..0ea51166f 100644 --- a/tfsdk/serve.go +++ b/tfsdk/serve.go @@ -63,11 +63,9 @@ 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 { - return &server{ - p: p, - } +func NewProtocol6ProviderServerWithError(p Provider) (tfprotov6.ProviderServer, error) { + return &server{ + p: p, }, nil } diff --git a/tfsdk/serve_test.go b/tfsdk/serve_test.go index 71add9ffe..e1b6549ab 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{})