Merge pull request #348 from hashicorp/fix-serve

Fix plugin.Serve

plugin/grpc_provider.go

@@ -2,23 +2,37 @@ package plugin
 
 import (
 	"context"
+	"errors"
+	"net/rpc"
 
 	plugin "github.com/hashicorp/go-plugin"
 	"google.golang.org/grpc"
 
 	proto "github.com/hashicorp/terraform-plugin-sdk/v2/internal/tfplugin5"
 )
 
-// GRPCProviderPlugin implements plugin.GRPCPlugin for the go-plugin package.
+var (
+	_ plugin.GRPCPlugin = (*gRPCProviderPlugin)(nil)
+	_ plugin.Plugin     = (*gRPCProviderPlugin)(nil)
+)
+
+// gRPCProviderPlugin implements plugin.GRPCPlugin and plugin.Plugin for the go-plugin package.
+// the only real implementation is GRPCSServer, the other methods are only satisfied
+// for compatibility with go-plugin
 type gRPCProviderPlugin struct {
-	plugin.Plugin
 	GRPCProvider func() proto.ProviderServer
 }
 
-// this exists only to satisfy the go-plugin.GRPCPlugin interface
-// that interface should likely be split
-func (p *gRPCProviderPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCBroker, c *grpc.ClientConn) (interface{}, error) {
-	return nil, nil
+func (p *gRPCProviderPlugin) Server(*plugin.MuxBroker) (interface{}, error) {
+	return nil, errors.New("terraform-plugin-sdk only implements grpc servers")
+}
+
+func (p *gRPCProviderPlugin) Client(*plugin.MuxBroker, *rpc.Client) (interface{}, error) {
+	return nil, errors.New("terraform-plugin-sdk only implements grpc servers")
+}
+
+func (p *gRPCProviderPlugin) GRPCClient(context.Context, *plugin.GRPCBroker, *grpc.ClientConn) (interface{}, error) {
+	return nil, errors.New("terraform-plugin-sdk only implements grpc servers")
 }
 
 func (p *gRPCProviderPlugin) GRPCServer(broker *plugin.GRPCBroker, s *grpc.Server) error {

plugin/serve.go

@@ -53,7 +53,7 @@ func Serve(opts *ServeOpts) {
 		HandshakeConfig: Handshake,
 		VersionedPlugins: map[int]plugin.PluginSet{
 			5: {
-				ProviderPluginName: gRPCProviderPlugin{
+				ProviderPluginName: &gRPCProviderPlugin{
 					GRPCProvider: func() proto.ProviderServer {
 						return provider
 					},