Revert "Exit when CD task is done (#1056)" (#1073)

This reverts commit c22d63d.

Author: lionello

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

@@ -186,10 +186,6 @@ func (b *ByocAws) setUpCD(ctx context.Context) error {
 	return nil
 }
 
-func (b *ByocAws) GetDeploymentStatus(ctx context.Context) error {
-	return ecs.GetTaskStatus(ctx, b.cdTaskArn)
-}
-
 func (b *ByocAws) Deploy(ctx context.Context, req *defangv1.DeployRequest) (*defangv1.DeployResponse, error) {
 	return b.deploy(ctx, req, "up")
 }
@@ -709,8 +705,8 @@ func (b *ByocAws) QueryLogs(ctx context.Context, req *defangv1.TailRequest) (cli
 	var err error
 	var taskArn ecs.TaskArn
 	var tailStream ecs.LiveTailStream
-	var stopWhenCDTaskDone bool
-
+	stopWhenCDTaskDone := false
+	logType := logs.LogType(req.LogType)
 	if etag != "" && !pkg.IsValidRandomID(etag) { // Assume invalid "etag" is a task ID
 		tailStream, err = b.driver.TailTaskID(ctx, etag)
 		taskArn, _ = b.driver.GetTaskArn(etag)
@@ -729,23 +725,20 @@ func (b *ByocAws) QueryLogs(ctx context.Context, req *defangv1.TailRequest) (cli
 		if req.Until.IsValid() {
 			end = req.Until.AsTime()
 		}
-		tailStream, err = ecs.QueryAndTailLogGroups(ctx, start, end, b.getLogGroupInputs(etag, req.Project, service, req.Pattern, logs.LogType(req.LogType))...)
+		tailStream, err = ecs.QueryAndTailLogGroups(ctx, start, end, b.getLogGroupInputs(etag, req.Project, service, req.Pattern, logType)...)
 		taskArn = b.cdTaskArn
-		stopWhenCDTaskDone = false
 	}
 	if err != nil {
 		return nil, AnnotateAwsError(err)
 	}
 	if taskArn != nil {
-		// When we have a CD task, override the context so we can cancel the tailing when the CD task is done
 		var cancel context.CancelCauseFunc
 		ctx, cancel = context.WithCancelCause(ctx)
 		go func() {
 			if err := ecs.WaitForTask(ctx, taskArn, 2*time.Second); err != nil {
-				isTaskFailure := errors.As(err, &ecs.TaskFailure{})
-				if stopWhenCDTaskDone || isTaskFailure {
+				if stopWhenCDTaskDone || errors.As(err, &ecs.TaskFailure{}) {
 					time.Sleep(2 * time.Second) // make sure we got all the logs from the task/ecs before cancelling
-					if isTaskFailure {
+					if !errors.Is(err, io.EOF) {
 						err = pkg.ErrDeploymentFailed{Message: err.Error()}
 					}
 					cancel(err)

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

@@ -211,22 +211,6 @@ func (b *ByocDo) deploy(ctx context.Context, req *defangv1.DeployRequest, cmd st
 	}, nil
 }
 
-func (b *ByocDo) GetDeploymentStatus(ctx context.Context) error {
-	deploymentInfo, _, err := b.client.Apps.GetDeployment(ctx, b.cdAppID, b.cdDeploymentID)
-	if err != nil {
-		return err
-	}
-
-	switch deploymentInfo.GetPhase() {
-	default:
-		return nil
-	case godo.DeploymentPhase_Active:
-		return io.EOF
-	case godo.DeploymentPhase_Error, godo.DeploymentPhase_Canceled:
-		return pkg.ErrDeploymentFailed{}
-	}
-}
-
 func (b *ByocDo) BootstrapCommand(ctx context.Context, req client.BootstrapCommandRequest) (string, error) {
 	if err := b.setUp(ctx); err != nil {
 		return "", err
@@ -597,11 +581,7 @@ func (s *subscribeStream) Receive() bool {
 			State:  phaseToState(deployment.Phase),
 		}
 	}
-	select {
-	case s.msg = <-s.queue:
-	default:
-		s.msg = nil
-	}
+	s.msg = <-s.queue
 	return err == nil
 }
 

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

@@ -7,15 +7,12 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"path"
 	"strings"
 	"time"
 
 	"cloud.google.com/go/logging/apiv2/loggingpb"
-	run "cloud.google.com/go/run/apiv2"
-	"cloud.google.com/go/run/apiv2/runpb"
 	"cloud.google.com/go/storage"
 	"github.com/DefangLabs/defang/src/pkg"
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
@@ -399,37 +396,6 @@ func (b *ByocGcp) Preview(ctx context.Context, req *defangv1.DeployRequest) (*de
 	return b.deploy(ctx, req, "preview")
 }
 
-func (b *ByocGcp) GetDeploymentStatus(ctx context.Context) error {
-	client, err := run.NewExecutionsClient(ctx)
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	execution, err := client.GetExecution(ctx, &runpb.GetExecutionRequest{Name: b.cdExecution})
-	if err != nil {
-		log.Fatal("Failed to get execution:", err)
-	}
-
-	isCompleted := false
-	for _, condition := range execution.GetConditions() {
-		if condition.GetType() == "Completed" {
-			isCompleted = condition.GetState() == runpb.Condition_CONDITION_SUCCEEDED ||
-				condition.GetState() == runpb.Condition_CONDITION_FAILED
-			break
-		}
-	}
-
-	if isCompleted {
-		if execution.GetSucceededCount() > 0 {
-			return io.EOF
-		}
-		return pkg.ErrDeploymentFailed{}
-	} else {
-		return nil // no completed yet
-	}
-}
-
 func (b *ByocGcp) deploy(ctx context.Context, req *defangv1.DeployRequest, command string) (*defangv1.DeployResponse, error) {
 	// If multiple Compose files were provided, req.Compose is the merged representation of all the files
 	project, err := compose.LoadFromContent(ctx, req.Compose, "")

src/pkg/cli/client/playground.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 
-	"github.com/DefangLabs/defang/src/pkg"
 	"github.com/DefangLabs/defang/src/pkg/term"
 	"github.com/DefangLabs/defang/src/pkg/types"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
@@ -22,10 +21,6 @@ func (g *PlaygroundProvider) Deploy(ctx context.Context, req *defangv1.DeployReq
 	return getMsg(g.GetController().Deploy(ctx, connect.NewRequest(req)))
 }
 
-func (g *PlaygroundProvider) GetDeploymentStatus(ctx context.Context) error {
-	return pkg.ErrDeploymentCompleted{} // TODO: implement on fabric, for now assume service is deployed
-}
-
 func (g *PlaygroundProvider) Preview(ctx context.Context, req *defangv1.DeployRequest) (*defangv1.DeployResponse, error) {
 	return nil, errors.New("the preview command is not valid for the Defang playground; did you forget --provider?")
 }

src/pkg/cli/client/provider.go

@@ -144,7 +144,6 @@ type Provider interface {
 	ListConfig(context.Context, *defangv1.ListConfigsRequest) (*defangv1.Secrets, error)
 	QueryForDebug(context.Context, *defangv1.DebugRequest) error
 	Preview(context.Context, *defangv1.DeployRequest) (*defangv1.DeployResponse, error)
-	GetDeploymentStatus(context.Context) error // nil means deployment is pending/running; io.EOF means deployment is done
 	PutConfig(context.Context, *defangv1.PutConfigRequest) error
 	RemoteProjectName(context.Context) (string, error)
 	ServiceDNS(string) string

src/pkg/cli/composeUp.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
-	"sync"
 	"time"
 
 	"github.com/DefangLabs/defang/src/pkg"
@@ -188,11 +186,6 @@ func TailUp(ctx context.Context, provider client.Provider, project *compose.Proj
 }
 
 func WaitAndTail(ctx context.Context, project *compose.Project, client client.FabricClient, provider client.Provider, deploy *defangv1.DeployResponse, waitTimeout time.Duration, since time.Time, verbose bool) error {
-	if DoDryRun {
-		// If we are in dry-run mode, we don't need to wait for the deployment to complete
-		return ErrDryRun
-	}
-
 	ctx, cancelTail := context.WithCancelCause(ctx)
 	defer cancelTail(nil) // to cancel WaitServiceState and clean-up context
 
@@ -202,39 +195,14 @@ func WaitAndTail(ctx context.Context, project *compose.Project, client client.Fa
 		defer cancelTimeout()
 	}
 
-	var deploymentStatusCh = make(chan error, 2)
-	wg := waitForDeploymentCompleted(ctx, provider, project, deploy, cancelTail, deploymentStatusCh)
-
-	tailOptions := NewTailOptionsForDeploy(deploy, since, verbose)
-	// blocking call to tail
-	TailUp(ctx, provider, project, deploy, tailOptions)
-	wg.Wait()
-
-	close(deploymentStatusCh)
-	for errDeployment := range deploymentStatusCh {
-		var errDeploymentCompleted pkg.ErrDeploymentCompleted
-		if !errors.As(errDeployment, &errDeploymentCompleted) && !(strings.Contains(errDeployment.Error(), "EOF")) {
-			return errDeployment
-		}
-	}
-
-	return nil
-}
+	errCompleted := errors.New("deployment succeeded") // tail canceled because of deployment completion
 
-func waitForDeploymentCompleted(ctx context.Context, provider client.Provider, project *compose.Project, deploy *defangv1.DeployResponse, cancelTail context.CancelCauseFunc, deploymentStatusCh chan error) *sync.WaitGroup {
 	const targetState = defangv1.ServiceState_DEPLOYMENT_COMPLETED
 	_, unmanagedServices := SplitManagedAndUnmanagedServices(project.Services)
-
-	var wg sync.WaitGroup
-	wg.Add(2)
 	go func() {
-		defer wg.Done()
-
-		// block on waiting for services to reach target state
 		if err := WaitServiceState(ctx, provider, targetState, project.Name, deploy.Etag, unmanagedServices); err != nil {
 			var errDeploymentFailed pkg.ErrDeploymentFailed
 			if errors.As(err, &errDeploymentFailed) {
-				deploymentStatusCh <- err
 				cancelTail(err)
 			} else if !(errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)) {
 				term.Warnf("error waiting for deployment completion: %v", err) // TODO: don't print in Go-routine
@@ -244,25 +212,22 @@ func waitForDeploymentCompleted(ctx context.Context, provider client.Provider, p
 				service.State = targetState
 			}
 
-			var errDeploymentCompleted = pkg.ErrDeploymentCompleted{}
-			deploymentStatusCh <- errDeploymentCompleted
-			cancelTail(errDeploymentCompleted)
+			cancelTail(errCompleted)
 		}
 	}()
 
-	go func() {
-		defer wg.Done()
-
-		// block on waiting for cdTask to complete
-		err := WaitCdTaskState(ctx, provider)
-		deploymentStatusCh <- err
-		var errDeploymentFailed pkg.ErrDeploymentFailed
-		if errors.As(err, &errDeploymentFailed) {
-			cancelTail(err)
-		}
-	}()
+	tailOptions := NewTailOptionsForDeploy(deploy, since, verbose)
+	// blocking call to tail
+	err := TailUp(ctx, provider, project, deploy, tailOptions)
+	var errDeploymentFailed pkg.ErrDeploymentFailed
+	if errors.As(context.Cause(ctx), &errDeploymentFailed) {
+		return errDeploymentFailed
+	}
+	if !errors.Is(context.Cause(ctx), errCompleted) {
+		return err
+	}
 
-	return &wg
+	return nil
 }
 
 func NewTailOptionsForDeploy(deploy *defangv1.DeployResponse, since time.Time, verbose bool) TailOptions {

src/pkg/cli/getDeploymentStatus.go

@@ -22,6 +22,10 @@ func WaitServiceState(
 ) error {
 	term.Debugf("waiting for services %v to reach state %s\n", services, targetState) // TODO: don't print in Go-routine
 
+	if DoDryRun {
+		return ErrDryRun
+	}
+
 	if len(services) == 0 {
 		return ErrNothingToMonitor
 	}

src/pkg/cli/subscribe.go

@@ -14,9 +14,3 @@ func (e ErrDeploymentFailed) Error() string {
 	}
 	return fmt.Sprintf("deployment failed%s: %s", service, e.Message)
 }
-
-type ErrDeploymentCompleted struct{}
-
-func (e ErrDeploymentCompleted) Error() string {
-	return "deployment COMPLETED"
-}