From 052a907eaec6ebfb661b1aa7b99ac3bd3ee1d0b3 Mon Sep 17 00:00:00 2001 From: Benjamin Bennett Date: Thu, 29 Jun 2023 16:43:33 +0100 Subject: [PATCH] Adjust function signature of NewMuxServer in tf5muxserver/tf6muxserver to return *muxServer (#173) * Adjust function signature of NewMuxServer in tf5muxserver/tf6muxserver to return *muxServer (#172) * Apply suggestions from code review Co-authored-by: Brian Flad --------- Co-authored-by: Brian Flad --- .changes/unreleased/BUG FIXES-20230629-162839.yaml | 5 +++++ .changes/unreleased/BUG FIXES-20230629-162851.yaml | 5 +++++ tf5muxserver/mux_server.go | 4 ++-- tf6muxserver/mux_server.go | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 .changes/unreleased/BUG FIXES-20230629-162839.yaml create mode 100644 .changes/unreleased/BUG FIXES-20230629-162851.yaml diff --git a/.changes/unreleased/BUG FIXES-20230629-162839.yaml b/.changes/unreleased/BUG FIXES-20230629-162839.yaml new file mode 100644 index 0000000..eb6966d --- /dev/null +++ b/.changes/unreleased/BUG FIXES-20230629-162839.yaml @@ -0,0 +1,5 @@ +kind: BUG FIXES +body: 'tf5muxserver: Adjust function signature of `NewMuxServer()` to return `*muxServer`, which is required to satisfy the `tfprotov5.ProviderServer` interface' +time: 2023-06-29T16:28:39.100246+01:00 +custom: + Issue: "172" diff --git a/.changes/unreleased/BUG FIXES-20230629-162851.yaml b/.changes/unreleased/BUG FIXES-20230629-162851.yaml new file mode 100644 index 0000000..ac7bf51 --- /dev/null +++ b/.changes/unreleased/BUG FIXES-20230629-162851.yaml @@ -0,0 +1,5 @@ +kind: BUG FIXES +body: 'tf6muxserver: Adjust function signature of `NewMuxServer()` to return `*muxServer`, which is required to satisfy the `tfprotov6.ProviderServer` interface' +time: 2023-06-29T16:28:51.594978+01:00 +custom: + Issue: "172" diff --git a/tf5muxserver/mux_server.go b/tf5muxserver/mux_server.go index 8e67094..7bb87e8 100644 --- a/tf5muxserver/mux_server.go +++ b/tf5muxserver/mux_server.go @@ -45,7 +45,7 @@ func (s muxServer) ProviderServer() tfprotov5.ProviderServer { // - All provider meta schemas exactly match // - Only one provider implements each managed resource // - Only one provider implements each data source -func NewMuxServer(_ context.Context, servers ...func() tfprotov5.ProviderServer) (muxServer, error) { +func NewMuxServer(_ context.Context, servers ...func() tfprotov5.ProviderServer) (*muxServer, error) { result := muxServer{ dataSources: make(map[string]tfprotov5.ProviderServer), resources: make(map[string]tfprotov5.ProviderServer), @@ -56,5 +56,5 @@ func NewMuxServer(_ context.Context, servers ...func() tfprotov5.ProviderServer) result.servers = append(result.servers, server()) } - return result, nil + return &result, nil } diff --git a/tf6muxserver/mux_server.go b/tf6muxserver/mux_server.go index 3936e00..264318b 100644 --- a/tf6muxserver/mux_server.go +++ b/tf6muxserver/mux_server.go @@ -46,7 +46,7 @@ func (s muxServer) ProviderServer() tfprotov6.ProviderServer { // - All provider meta schemas exactly match // - Only one provider implements each managed resource // - Only one provider implements each data source -func NewMuxServer(_ context.Context, servers ...func() tfprotov6.ProviderServer) (muxServer, error) { +func NewMuxServer(_ context.Context, servers ...func() tfprotov6.ProviderServer) (*muxServer, error) { result := muxServer{ dataSources: make(map[string]tfprotov6.ProviderServer), resources: make(map[string]tfprotov6.ProviderServer), @@ -58,5 +58,5 @@ func NewMuxServer(_ context.Context, servers ...func() tfprotov6.ProviderServer) result.servers = append(result.servers, server()) } - return result, nil + return &result, nil }