Move stacks plugin client to rpcapi package

Author: Maed223

internal/stacksplugin/stacksplugin1/grpc_client.go internal/rpcapi/stacks_plugin_client.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package stacksplugin1
+package rpcapi
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/terraform-svchost/disco"
-	"github.com/hashicorp/terraform/internal/rpcapi"
 	"github.com/hashicorp/terraform/internal/rpcapi/dynrpcserver"
 	"github.com/hashicorp/terraform/internal/rpcapi/terraform1/dependencies"
 	"github.com/hashicorp/terraform/internal/rpcapi/terraform1/packages"
@@ -35,7 +34,7 @@ var _ stacksplugin.Stacks1 = GRPCStacksClient{}
 // Execute sends the client Execute request and waits for the plugin to return
 // an exit code response before returning
 func (c GRPCStacksClient) Execute(args []string, stdout, stderr io.Writer) int {
-	handles := rpcapi.NewHandleTable()
+	handles := NewHandleTable()
 
 	dependenciesServer := dynrpcserver.NewDependenciesStub()
 	packagesServer := dynrpcserver.NewPackagesStub()
@@ -45,7 +44,7 @@ func (c GRPCStacksClient) Execute(args []string, stdout, stderr io.Writer) int {
 	dependenciesServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
 		s = grpc.NewServer(opts...)
 		dependencies.RegisterDependenciesServer(s, dependenciesServer)
-		dependenciesServer.ActivateRPCServer(rpcapi.NewDependenciesServer(handles, c.Services))
+		dependenciesServer.ActivateRPCServer(NewDependenciesServer(handles, c.Services))
 
 		return s
 	}
@@ -56,7 +55,7 @@ func (c GRPCStacksClient) Execute(args []string, stdout, stderr io.Writer) int {
 	packagesServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
 		s = grpc.NewServer(opts...)
 		packages.RegisterPackagesServer(s, packagesServer)
-		packagesServer.ActivateRPCServer(rpcapi.NewPackagesServer(c.Services))
+		packagesServer.ActivateRPCServer(NewPackagesServer(c.Services))
 
 		return s
 	}
@@ -67,7 +66,7 @@ func (c GRPCStacksClient) Execute(args []string, stdout, stderr io.Writer) int {
 	stacksServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
 		s = grpc.NewServer(opts...)
 		stacks.RegisterStacksServer(s, stacksServer)
-		stacksServer.ActivateRPCServer(rpcapi.NewStacksServer(rpcapi.NewStopper(), handles, &rpcapi.ServiceOpts{
+		stacksServer.ActivateRPCServer(NewStacksServer(NewStopper(), handles, &ServiceOpts{
 			ExperimentsAllowed: true,
 		}))
 		return s

internal/stacksplugin/stacksplugin1/convert.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/terraform-svchost/disco"
+	"github.com/hashicorp/terraform/internal/rpcapi"
 	"github.com/hashicorp/terraform/internal/stacksplugin"
 	"github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1"
 	"google.golang.org/grpc"
@@ -47,7 +48,7 @@ func (p *GRPCStacksPlugin) Client(*plugin.MuxBroker, *rpc.Client) (interface{},
 // GRPCClient returns a new GRPC client for interacting with the cloud plugin server.
 func (p *GRPCStacksPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCBroker, c *grpc.ClientConn) (interface{}, error) {
 	ctx = metadata.NewOutgoingContext(ctx, p.Metadata)
-	return &GRPCStacksClient{
+	return &rpcapi.GRPCStacksClient{
 		Client:   stacksproto1.NewCommandServiceClient(c),
 		Broker:   broker,
 		Services: p.Services,
@@ -58,12 +59,5 @@ func (p *GRPCStacksPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCBr
 // GRPCServer always returns an error; we're only implementing the client
 // interface, not the server.
 func (p *GRPCStacksPlugin) GRPCServer(broker *plugin.GRPCBroker, s *grpc.Server) error {
-	/**
-	stacksproto1.RegisterCommandServiceServer(s, &GRPCStacksServer{
-		Impl:   p.Impl,
-		broker: broker,
-	})
-	return nil
-	*/
 	return errors.ErrUnsupported
 }