WIP

Author: Maed223

internal/command/stacks.go

@@ -68,12 +68,6 @@ var (
 	StacksPluginDataDir = "stacksplugin"
 )
 
-//type dependencies struct{}
-
-//type packages struct{}
-
-//type stacks struct{}
-
 func (c *StacksCommand) realRun(args []string, stdout, stderr io.Writer) int {
 	args = c.Meta.process(args)
 

internal/stacksplugin/interface.go

@@ -132,5 +132,5 @@ type Stacks interface {
 // Stacks1 interface for Terraform plugin operations
 type Stacks1 interface {
 	// Execute runs a command with the provided arguments and returns the exit code
-	Execute(args []string, stdout, stderr io.Writer, dependencies Dependencies, packages Packages, stacks Stacks) int
+	Execute(args []string, stdout, stderr io.Writer) int
 }

internal/stacksplugin/stacksplugin1/dependencies.go

@@ -38,6 +38,8 @@ type dependenciesServer struct {
 	services *disco.Disco
 }
 
+//var _ stacksplugin.Dependencies = (*dependenciesServer)(nil) // Ensure dependenciesServer implements stacksplugin.Dependencies
+
 func newDependenciesServer(handles *handleTable, services *disco.Disco) *dependenciesServer {
 	return &dependenciesServer{
 		handles:  handles,

internal/stacksplugin/stacksplugin1/grpc_client.go

@@ -11,7 +11,12 @@ import (
 
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/terraform/internal/stacksplugin"
+	"github.com/hashicorp/terraform/internal/stacksplugin/dynrpcserver"
 	"github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1"
+	dep "github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1/dependencies"
+	pack "github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1/packages"
+	stack "github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1/stacks"
+	"google.golang.org/grpc"
 )
 
 // GRPCCloudClient is the client interface for interacting with terraform-cloudplugin
@@ -27,8 +32,46 @@ 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 {
+	dependenciesServer := dynrpcserver.NewDependenciesStub()
+	packagesServer := dynrpcserver.NewPackagesStub()
+	stacksServer := dynrpcserver.NewStacksStub()
+
+	var s *grpc.Server
+	dependenciesServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
+		s = grpc.NewServer(opts...)
+		dep.RegisterDependenciesServer(s, dependenciesServer)
+
+		return s
+	}
+
+	dependenciesBrokerID := c.broker.NextId()
+	go c.broker.AcceptAndServe(dependenciesBrokerID, dependenciesServerFunc)
+
+	packagesServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
+		s = grpc.NewServer(opts...)
+		pack.RegisterPackagesServer(s, packagesServer)
+
+		return s
+	}
+
+	packagesBrokerID := c.broker.NextId()
+	go c.broker.AcceptAndServe(packagesBrokerID, packagesServerFunc)
+
+	stacksServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
+		s = grpc.NewServer(opts...)
+		stack.RegisterStacksServer(s, stacksServer)
+
+		return s
+	}
+
+	stacksBrokerID := c.broker.NextId()
+	go c.broker.AcceptAndServe(stacksBrokerID, stacksServerFunc)
+
 	client, err := c.client.Execute(c.context, &stacksproto1.CommandRequest{
-		Args: args,
+		DependenciesServer: dependenciesBrokerID,
+		PackagesServer:     packagesBrokerID,
+		StacksServer:       stacksBrokerID,
+		Args:               args,
 	})
 
 	if err != nil {

internal/stacksplugin/stacksplugin1/grpc_plugin.go

@@ -6,21 +6,11 @@ package stacksplugin1
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/rpc"
 
 	"github.com/hashicorp/go-plugin"
-	svchost "github.com/hashicorp/terraform-svchost"
-	"github.com/hashicorp/terraform-svchost/auth"
-	"github.com/hashicorp/terraform-svchost/disco"
-	"github.com/hashicorp/terraform/internal/command/cliconfig"
-	pluginDiscovery "github.com/hashicorp/terraform/internal/plugin/discovery"
-	"github.com/hashicorp/terraform/internal/stacksplugin/dynrpcserver"
+	"github.com/hashicorp/terraform/internal/stacksplugin"
 	"github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1"
-	"github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1/dependencies"
-	"github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1/packages"
-	"github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1/setup"
-	"github.com/hashicorp/terraform/internal/stacksplugin/stacksproto1/stacks"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
@@ -30,6 +20,14 @@ import (
 type GRPCStacksPlugin struct {
 	plugin.GRPCPlugin
 	Metadata metadata.MD
+	Impl     stacksplugin.Stacks1
+}
+
+type GRPCStacksServer struct {
+	// This is the real implementation
+	Impl stacksplugin.Stacks1
+
+	broker *plugin.GRPCBroker
 }
 
 // Server always returns an error; we're only implementing the GRPCPlugin
@@ -49,34 +47,34 @@ func (p *GRPCStacksPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCBr
 	ctx = metadata.NewOutgoingContext(ctx, p.Metadata)
 	return &GRPCStacksClient{
 		client:  stacksproto1.NewCommandServiceClient(c),
+		broker:  broker,
 		context: ctx,
 	}, nil
 }
 
 // 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 nil
 }
 
-func SetupStacksPluginServices() (dependenciesServer, stacksServer, packagesServer) {
-	handles := newHandleTable()
-	dependenciesServer := newDependenciesServer(handles)
-	packagesServer := newPackagesServer(handles)
-	stacksServer := newStacksServer(handles)
-	return dependenciesServer, stacksServer, packagesServer
-}
-
-func registerGRPCServices(s *grpc.Server, opts *serviceOpts) {
+/**
+func registerGRPCServices(s *grpc.Server) {
 	// We initially only register the setup server, because the registration
 	// of other services can vary depending on the capabilities negotiated
 	// during handshake.
-	server := newSetupServer(serverHandshake(s, opts))
+	server := newSetupServer(serverHandshake(s))
 	setup.RegisterSetupServer(s, server)
 }
 
-func serverHandshake(s *grpc.Server, opts *serviceOpts) func(context.Context, *setup.Handshake_Request, *stopper) (*setup.ServerCapabilities, error) {
+func serverHandshake(s *grpc.Server) func(context.Context, *setup.Handshake_Request, *stopper) (*setup.ServerCapabilities, error) {
 	dependenciesStub := dynrpcserver.NewDependenciesStub()
 	dependencies.RegisterDependenciesServer(s, dependenciesStub)
 	stacksStub := dynrpcserver.NewStacksStub()
@@ -159,3 +157,4 @@ func newServiceDisco(config *setup.Config) (*disco.Disco, error) {
 
 	return services, nil
 }
+**/

internal/stacksplugin/stacksplugin1/setup.go

@@ -31,16 +31,12 @@ type setupServer struct {
 	mu sync.Mutex
 }
 
-/**
-
-func SetupStacksPluginServices() (dependenciesServer, stacksServer, packagesServer) {
-	handles := newHandleTable()
-	dependenciesServer := newDependenciesServer(handles)
-	packagesServer := newPackagesServer(handles)
-	stacksServer := newStacksServer(handles)
-	return dependenciesServer, stacksServer, packagesServer
+func newSetupServer(initOthers func(context.Context, *setup.Handshake_Request, *stopper) (*setup.ServerCapabilities, error)) setup.SetupServer {
+	return &setupServer{
+		initOthers: initOthers,
+		stopper:    newStopper(),
+	}
 }
-*/
 
 func (s *setupServer) Handshake(ctx context.Context, req *setup.Handshake_Request) (*setup.Handshake_Response, error) {
 	s.mu.Lock()

internal/stacksplugin/stacksproto1/stacksproto1.pb.go

@@ -10,6 +10,9 @@ option go_package = "github.com/hashicorp/terraform/internal/stacksplugin/stacks
 // provided flags. It is the raw args from the HCP Terraform command.
 message CommandRequest {
   repeated string args = 1;
+  uint32 dependencies_server = 2;
+  uint32 packages_server = 3;
+  uint32 stacks_server = 4;
 }
 
 // CommandResponse contains the result of the command execution, including any