Add stacks plugin proto

commands.go

@@ -434,6 +434,12 @@ func initCommands(
 			}, nil
 		}
 
+		Commands["stacks"] = func() (cli.Command, error) {
+			return &command.StacksCommand{
+				Meta: meta,
+			}, nil
+		}
+
 		// "rpcapi" is handled a bit differently because the whole point of
 		// this interface is to bypass the CLI layer so wrapping automation can
 		// get as-direct-as-possible access to Terraform Core functionality,

internal/cloud/backend.go

@@ -227,6 +227,10 @@ func (b *Cloud) ServiceDiscoveryAliases() ([]backendrun.HostAlias, error) {
 	}, nil
 }
 
+func (b *Cloud) Services() *disco.Disco {
+	return b.services
+}
+
 // Configure implements backend.Backend (which is embedded in backendrun.OperationsBackend).
 func (b *Cloud) Configure(obj cty.Value) tfdiags.Diagnostics {
 	var diags tfdiags.Diagnostics

internal/cloudplugin/cloudplugin1/grpc_client.go

@@ -9,8 +9,8 @@ import (
 	"io"
 	"log"
 
-	"github.com/hashicorp/terraform/internal/cloudplugin"
 	"github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1"
+	"github.com/hashicorp/terraform/internal/pluginshared"
 )
 
 // GRPCCloudClient is the client interface for interacting with terraform-cloudplugin
@@ -20,7 +20,7 @@ type GRPCCloudClient struct {
 }
 
 // Proof that GRPCCloudClient fulfills the go-plugin interface
-var _ cloudplugin.Cloud1 = GRPCCloudClient{}
+var _ pluginshared.CustomPluginClient = GRPCCloudClient{}
 
 // Execute sends the client Execute request and waits for the plugin to return
 // an exit code response before returning

internal/cloudplugin/cloudplugin1/grpc_plugin.go

@@ -9,8 +9,8 @@ import (
 	"net/rpc"
 
 	"github.com/hashicorp/go-plugin"
-	"github.com/hashicorp/terraform/internal/cloudplugin"
 	"github.com/hashicorp/terraform/internal/cloudplugin/cloudproto1"
+	"github.com/hashicorp/terraform/internal/pluginshared"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
@@ -19,7 +19,7 @@ import (
 // implementation exists in this package.
 type GRPCCloudPlugin struct {
 	plugin.GRPCPlugin
-	Impl cloudplugin.Cloud1
+	Impl pluginshared.CustomPluginClient
 	// Any configuration metadata that the plugin executable needs in order to
 	// do something useful, which will be passed along via gRPC metadata headers.
 	Metadata metadata.MD

internal/command/cloud.go

@@ -18,9 +18,9 @@ import (
 
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/terraform/internal/cloud"
-	"github.com/hashicorp/terraform/internal/cloudplugin"
 	"github.com/hashicorp/terraform/internal/cloudplugin/cloudplugin1"
 	"github.com/hashicorp/terraform/internal/logging"
+	"github.com/hashicorp/terraform/internal/pluginshared"
 	"github.com/hashicorp/terraform/internal/tfdiags"
 )
 
@@ -112,7 +112,7 @@ func (c *CloudCommand) realRun(args []string, stdout, stderr io.Writer) int {
 	// Proxy the request
 	// Note: future changes will need to determine the type of raw when
 	// multiple versions are possible.
-	cloud1, ok := raw.(cloudplugin.Cloud1)
+	cloud1, ok := raw.(pluginshared.CustomPluginClient)
 	if !ok {
 		c.Ui.Error("If more than one cloudplugin versions are available, they need to be added to the cloud command. This is a bug in Terraform.")
 		return ExitRPCError
@@ -217,7 +217,7 @@ func (c *CloudCommand) initPlugin() tfdiags.Diagnostics {
 
 	overridePath := os.Getenv("TF_CLOUD_PLUGIN_DEV_OVERRIDE")
 
-	bm, err := cloudplugin.NewBinaryManager(ctx, packagesPath, overridePath, c.pluginService, runtime.GOOS, runtime.GOARCH)
+	bm, err := pluginshared.NewCloudBinaryManager(ctx, packagesPath, overridePath, c.pluginService, runtime.GOOS, runtime.GOARCH)
 	if err != nil {
 		return diags.Append(tfdiags.Sourceless(tfdiags.Error, errorSummary, err.Error()))
 	}