Merge branch 'main' into tenants

Author: lionello

src/pkg/cli/client/byoc/aws/byoc.go

@@ -230,6 +230,7 @@ func (b *ByocAws) deploy(ctx context.Context, req *defangv1.DeployRequest, cmd s
 	data, err := proto.Marshal(&defangv1.ProjectUpdate{
 		CdVersion: b.CDImage,
 		Compose:   req.Compose,
+		Mode:      req.Mode,
 		Services:  serviceInfos,
 	})
 	if err != nil {

src/pkg/cli/client/byoc/do/byoc.go

@@ -154,9 +154,9 @@ func (b *ByocDo) deploy(ctx context.Context, req *defangv1.DeployRequest, cmd st
 	data, err := proto.Marshal(&defangv1.ProjectUpdate{
 		CdVersion: b.CDImage,
 		Compose:   req.Compose,
+		Mode:      req.Mode,
 		Services:  serviceInfos,
 	})
-
 	if err != nil {
 		return nil, err
 	}

src/pkg/cli/client/byoc/gcp/byoc.go

@@ -460,6 +460,7 @@ func (b *ByocGcp) deploy(ctx context.Context, req *defangv1.DeployRequest, comma
 	data, err := proto.Marshal(&defangv1.ProjectUpdate{
 		CdVersion: b.CDImage,
 		Compose:   req.Compose,
+		Mode:      req.Mode,
 		Services:  serviceInfos,
 	})
 	if err != nil {

src/pkg/cli/composeDown.go

@@ -15,7 +15,7 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-func ComposeDown(ctx context.Context, projectName string, c client.FabricClient, provider client.Provider, names ...string) (types.ETag, error) {
+func ComposeDown(ctx context.Context, projectName string, fabric client.FabricClient, provider client.Provider, names ...string) (types.ETag, error) {
 	term.Debugf("Destroying project %q %q", projectName, names)
 
 	if dryrun.DoDryRun {
@@ -34,7 +34,7 @@ func ComposeDown(ctx context.Context, projectName string, c client.FabricClient,
 			return "", err
 		}
 
-		err = c.PutDeployment(ctx, &defangv1.PutDeploymentRequest{
+		err = fabric.PutDeployment(ctx, &defangv1.PutDeploymentRequest{
 			Deployment: &defangv1.Deployment{
 				Action:            defangv1.DeploymentAction_DEPLOYMENT_ACTION_DOWN,
 				Id:                etag,
@@ -54,7 +54,7 @@ func ComposeDown(ctx context.Context, projectName string, c client.FabricClient,
 		return etag, nil
 	}
 
-	delegateDomain, err := c.GetDelegateSubdomainZone(ctx, &defangv1.GetDelegateSubdomainZoneRequest{}) // TODO: pass projectName
+	delegateDomain, err := fabric.GetDelegateSubdomainZone(ctx, &defangv1.GetDelegateSubdomainZoneRequest{}) // TODO: pass projectName
 	if err != nil {
 		term.Debug("GetDelegateSubdomainZone failed:", err)
 		return "", errors.New("failed to get delegate domain")

src/pkg/cli/composeUp.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"time"
 
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/compose"
@@ -94,12 +93,19 @@ func ComposeUp(ctx context.Context, project *compose.Project, fabric client.Fabr
 		deployRequest.DelegationSetId = delegation.DelegationSetId
 	}
 
+	accountInfo, err := p.AccountInfo(ctx)
+	if err != nil {
+		return nil, project, err
+	}
+
+	var action defangv1.DeploymentAction
 	var resp *defangv1.DeployResponse
 	if upload == compose.UploadModePreview || upload == compose.UploadModeEstimate {
 		resp, err = p.Preview(ctx, deployRequest)
 		if err != nil {
 			return nil, project, err
 		}
+		action = defangv1.DeploymentAction_DEPLOYMENT_ACTION_PREVIEW
 	} else {
 		if delegation != nil && len(delegation.NameServers) > 0 {
 			req := &defangv1.DelegateSubdomainZoneRequest{NameServerRecords: delegation.NameServers, Project: project.Name}
@@ -109,33 +115,29 @@ func ComposeUp(ctx context.Context, project *compose.Project, fabric client.Fabr
 			}
 		}
 
-		accountInfo, err := p.AccountInfo(ctx)
-		if err != nil {
-			return nil, project, err
-		}
-
-		timestamp := time.Now()
 		resp, err = p.Deploy(ctx, deployRequest)
 		if err != nil {
 			return nil, project, err
 		}
+		action = defangv1.DeploymentAction_DEPLOYMENT_ACTION_UP
+	}
 
-		err = fabric.PutDeployment(ctx, &defangv1.PutDeploymentRequest{
-			Deployment: &defangv1.Deployment{
-				Action:            defangv1.DeploymentAction_DEPLOYMENT_ACTION_UP,
-				Id:                resp.Etag,
-				Project:           project.Name,
-				Provider:          accountInfo.Provider.Value(),
-				ProviderAccountId: accountInfo.AccountID,
-				ProviderString:    string(accountInfo.Provider),
-				Region:            accountInfo.Region,
-				Timestamp:         timestamppb.New(timestamp),
-			},
-		})
-		if err != nil {
-			term.Debugf("PutDeployment failed: %v", err)
-			term.Warn("Unable to update deployment history, but deployment will proceed anyway.")
-		}
+	err = fabric.PutDeployment(ctx, &defangv1.PutDeploymentRequest{
+		Deployment: &defangv1.Deployment{
+			Action:            action,
+			Id:                resp.Etag,
+			Project:           project.Name,
+			Provider:          accountInfo.Provider.Value(),
+			ProviderAccountId: accountInfo.AccountID,
+			ProviderString:    string(accountInfo.Provider),
+			Region:            accountInfo.Region,
+			ServiceCount:      int32(len(fixedProject.Services)), // #nosec G115 - service count will not overflow int32
+			Timestamp:         timestamppb.Now(),
+		},
+	})
+	if err != nil {
+		term.Debugf("PutDeployment failed: %v", err)
+		term.Warn("Unable to update deployment history, but deployment will proceed anyway.")
 	}
 
 	if term.DoDebug() {