Use Preview RPC for GCP estimates (#1288)

* restore estimation provider selector

* use new Preview rpc instead of Deploy with preview bool

Author: jordanstephens

src/cmd/cli/command/estimate.go

@@ -7,6 +7,7 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/cli"
 	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc/aws"
+	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc/gcp"
 	"github.com/DefangLabs/defang/src/pkg/term"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 	"github.com/spf13/cobra"
@@ -30,13 +31,20 @@ func makeEstimateCmd() *cobra.Command {
 
 			var previewProvider cliClient.Provider = &cliClient.PlaygroundProvider{FabricClient: client}
 			switch providerID {
-			case cliClient.ProviderAuto:
-				providerID = cliClient.ProviderAWS // default to AWS for estimates; TODO: show a picker
-				fallthrough
 			case cliClient.ProviderAWS:
 				if awsInEnv() {
 					previewProvider = aws.NewByocProvider(ctx, client.GetTenantName())
 				}
+			case cliClient.ProviderGCP:
+				if gcpInEnv() {
+					previewProvider = gcp.NewByocProvider(ctx, client.GetTenantName())
+				}
+			case cliClient.ProviderAuto:
+				fallthrough
+			case cliClient.ProviderDefang:
+				if _, err := interactiveSelectProvider([]cliClient.ProviderID{cliClient.ProviderAWS, cliClient.ProviderGCP}); err != nil {
+					return err
+				}
 			default:
 				return fmt.Errorf("unsupported provider %s; must be one of %v", providerID, []cliClient.ProviderID{cliClient.ProviderAWS})
 			}
@@ -46,13 +54,6 @@ func makeEstimateCmd() *cobra.Command {
 				mode = Mode(defangv1.DeploymentMode_DEVELOPMENT)
 			}
 
-			// TODO: bring this back when GCP is supported
-			// if providerID == cliClient.ProviderAuto || providerID == cliClient.ProviderDefang {
-			// 	if _, err := interactiveSelectProvider([]cliClient.ProviderID{cliClient.ProviderAWS, cliClient.ProviderGCP}); err != nil {
-			// 		return err
-			// 	}
-			// }
-
 			estimate, err := cli.RunEstimate(ctx, project, client, previewProvider, providerID, region, mode.Value())
 			if err != nil {
 				return fmt.Errorf("failed to run estimate: %w", err)

src/pkg/cli/client/client.go

@@ -29,6 +29,7 @@ type FabricClient interface {
 	GetTenantName() types.TenantName
 	GetVersions(context.Context) (*defangv1.Version, error)
 	ListDeployments(context.Context, *defangv1.ListDeploymentsRequest) (*defangv1.ListDeploymentsResponse, error)
+	Preview(context.Context, *defangv1.PreviewRequest) (*defangv1.PreviewResponse, error)
 	Publish(context.Context, *defangv1.PublishRequest) error
 	PutDeployment(context.Context, *defangv1.PutDeploymentRequest) error
 	RevokeToken(context.Context) error

src/pkg/cli/client/grpc.go

@@ -173,3 +173,7 @@ func (g GrpcClient) SetOptions(ctx context.Context, req *defangv1.SetOptionsRequ
 func (g GrpcClient) Estimate(ctx context.Context, req *defangv1.EstimateRequest) (*defangv1.EstimateResponse, error) {
 	return getMsg(g.client.Estimate(ctx, connect.NewRequest(req)))
 }
+
+func (g GrpcClient) Preview(ctx context.Context, req *defangv1.PreviewRequest) (*defangv1.PreviewResponse, error) {
+	return getMsg(g.client.Preview(ctx, connect.NewRequest(req)))
+}

src/pkg/cli/estimate.go

@@ -22,7 +22,7 @@ import (
 
 func RunEstimate(ctx context.Context, project *compose.Project, client cliClient.FabricClient, previewProvider cliClient.Provider, estimateProviderID cliClient.ProviderID, region string, mode defangv1.DeploymentMode) (*defangv1.EstimateResponse, error) {
 	term.Debugf("Running estimate for project %s in region %s with mode %s", project.Name, region, mode)
-	preview, err := GeneratePreview(ctx, project, client, previewProvider, mode)
+	preview, err := GeneratePreview(ctx, project, client, previewProvider, estimateProviderID, mode, region)
 	if err != nil {
 		return nil, err
 	}
@@ -40,11 +40,15 @@ func RunEstimate(ctx context.Context, project *compose.Project, client cliClient
 	return estimate, nil
 }
 
-func GeneratePreview(ctx context.Context, project *compose.Project, client client.FabricClient, provider cliClient.Provider, mode defangv1.DeploymentMode) (string, error) {
+func GeneratePreview(ctx context.Context, project *compose.Project, client client.FabricClient, previewProvider cliClient.Provider, estimateProviderID cliClient.ProviderID, mode defangv1.DeploymentMode, region string) (string, error) {
 	os.Setenv("DEFANG_JSON", "1") // HACK: always show JSON output for estimate
 	since := time.Now()
 
-	resp, project, err := ComposeUp(ctx, project, client, provider, compose.UploadModeEstimate, mode)
+	resp, err := client.Preview(ctx, &defangv1.PreviewRequest{
+		Provider: estimateProviderID.Value(),
+		Mode:     mode,
+		Region:   region,
+	})
 	if err != nil {
 		return "", err
 	}
@@ -58,7 +62,7 @@ func GeneratePreview(ctx context.Context, project *compose.Project, client clien
 		Verbose:    true,
 	}
 
-	err = streamLogs(ctx, provider, project.Name, options, func(entry *defangv1.LogEntry, options *TailOptions) error {
+	err = streamLogs(ctx, previewProvider, project.Name, options, func(entry *defangv1.LogEntry, options *TailOptions) error {
 		if strings.HasPrefix(entry.Message, "Preview succeeded") {
 			return io.EOF
 		} else if strings.HasPrefix(entry.Message, "Preview failed") {