Call debugger on composeUp errors

Author: lionello

src/cmd/cli/command/compose.go

@@ -89,7 +89,7 @@ func makeComposeUpCmd() *cobra.Command {
 				}
 
 				track.Evt("Debug Prompted", P("loadErr", loadErr))
-				return cli.InteractiveDebugForLoadError(ctx, client, project, loadErr)
+				return cli.InteractiveDebugForClientError(ctx, client, project, loadErr)
 			}
 
 			provider, err := newProvider(ctx, loader)
@@ -152,23 +152,28 @@ func makeComposeUpCmd() *cobra.Command {
 			}
 
 			deploy, project, err := cli.ComposeUp(ctx, project, client, provider, upload, mode.Value())
-
 			if err != nil {
-				if !nonInteractive && strings.Contains(err.Error(), "maximum number of projects") {
-					if projectName, err2 := provider.RemoteProjectName(cmd.Context()); err2 == nil {
-						term.Error("Error:", prettyError(err))
-						if _, err := cli.InteractiveComposeDown(cmd.Context(), provider, projectName); err != nil {
-							term.Debug("ComposeDown failed:", err)
-							printDefangHint("To deactivate a project, do:", "compose down --project-name "+projectName)
-						} else {
-							printDefangHint("To try deployment again, do:", "compose up")
-						}
-						return nil
-					}
-				}
 				if errors.Is(err, types.ErrComposeFileNotFound) {
 					printDefangHint("To start a new project, do:", "new")
 				}
+				if !nonInteractive {
+					if strings.Contains(err.Error(), "maximum number of projects") {
+						if projectName, err2 := provider.RemoteProjectName(cmd.Context()); err2 == nil {
+							term.Error("Error:", prettyError(err))
+							if _, err := cli.InteractiveComposeDown(cmd.Context(), provider, projectName); err != nil {
+								term.Debug("ComposeDown failed:", err)
+								printDefangHint("To deactivate a project, do:", "compose down --project-name "+projectName)
+							} else {
+								printDefangHint("To try deployment again, do:", "compose up")
+							}
+							return nil
+						}
+						return err
+					}
+					term.Error("Error:", prettyError(err))
+					track.Evt("Debug Prompted", P("composeErr", err))
+					return cli.InteractiveDebugForClientError(ctx, client, project, err)
+				}
 				return err
 			}
 
@@ -438,7 +443,7 @@ func makeComposeConfigCmd() *cobra.Command {
 				}
 
 				track.Evt("Debug Prompted", P("loadErr", loadErr))
-				return cli.InteractiveDebugForLoadError(ctx, client, project, loadErr)
+				return cli.InteractiveDebugForClientError(ctx, client, project, loadErr)
 			}
 
 			provider, err := newProvider(ctx, loader)

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

@@ -207,7 +207,7 @@ func topologicalSort(nodes map[string]*Node) []*defangv1.ServiceInfo {
 // This function was based on update function from Fabric controller and slightly modified to work with BYOC
 func (b *ByocBaseClient) update(ctx context.Context, projectName, delegateDomain string, service composeTypes.ServiceConfig) (*defangv1.ServiceInfo, error) {
 	if err := compose.ValidateService(&service); err != nil {
-		return nil, fmt.Errorf("service %q: %w", service.Name, err)
+		return nil, err // caller prepends service name
 	}
 
 	pkg.Ensure(projectName != "", "ProjectName not set")
@@ -257,7 +257,7 @@ func (b *ByocBaseClient) update(ctx context.Context, projectName, delegateDomain
 
 	if siUpdater, ok := b.projectBackend.(ServiceInfoUpdater); ok {
 		if err := siUpdater.UpdateServiceInfo(ctx, si, projectName, delegateDomain, service); err != nil {
-			return nil, fmt.Errorf("service %q: %w", service.Name, err)
+			return nil, err // caller prepends service name
 		}
 	}
 

src/pkg/cli/debug.go

@@ -72,27 +72,27 @@ func InteractiveDebugDeployment(ctx context.Context, client client.FabricClient,
 	return interactiveDebug(ctx, client, debugConfig, nil)
 }
 
-func InteractiveDebugForLoadError(ctx context.Context, client client.FabricClient, project *compose.Project, loadErr error) error {
-	return interactiveDebug(ctx, client, DebugConfig{Project: project}, loadErr)
+func InteractiveDebugForClientError(ctx context.Context, client client.FabricClient, project *compose.Project, clientErr error) error {
+	return interactiveDebug(ctx, client, DebugConfig{Project: project}, clientErr)
 }
 
-func interactiveDebug(ctx context.Context, client client.FabricClient, debugConfig DebugConfig, loadError error) error {
+func interactiveDebug(ctx context.Context, client client.FabricClient, debugConfig DebugConfig, clientErr error) error {
 	var aiDebug bool
 	if err := survey.AskOne(&survey.Confirm{
 		Message: "Would you like to debug the deployment with AI?",
 		Help:    "This will send logs and artifacts to our backend and attempt to diagnose the issue and provide a solution.",
 	}, &aiDebug, survey.WithStdio(term.DefaultTerm.Stdio())); err != nil {
-		track.Evt("Debug Prompt Failed", P("etag", debugConfig.Deployment), P("reason", err), P("loadErr", loadError))
+		track.Evt("Debug Prompt Failed", P("etag", debugConfig.Deployment), P("reason", err), P("loadErr", clientErr))
 		return err
 	} else if !aiDebug {
-		track.Evt("Debug Prompt Skipped", P("etag", debugConfig.Deployment), P("loadErr", loadError))
+		track.Evt("Debug Prompt Skipped", P("etag", debugConfig.Deployment), P("loadErr", clientErr))
 		return ErrDebugSkipped
 	}
 
-	track.Evt("Debug Prompt Accepted", P("etag", debugConfig.Deployment), P("loadErr", loadError))
+	track.Evt("Debug Prompt Accepted", P("etag", debugConfig.Deployment), P("loadErr", clientErr))
 
-	if loadError != nil {
-		if err := debugComposeFileLoadError(ctx, client, debugConfig.Project, loadError); err != nil {
+	if clientErr != nil {
+		if err := debugComposeFileLoadError(ctx, client, debugConfig.Project, clientErr); err != nil {
 			term.Warnf("Failed to debug compose file load: %v", err)
 			return err
 		}
@@ -110,9 +110,9 @@ func interactiveDebug(ctx context.Context, client client.FabricClient, debugConf
 		Message: "Was the debugging helpful?",
 		Help:    "Please provide feedback to help us improve the debugging experience.",
 	}, &goodBad); err != nil {
-		track.Evt("Debug Feedback Prompt Failed", P("etag", debugConfig.Deployment), P("reason", err), P("loadErr", loadError))
+		track.Evt("Debug Feedback Prompt Failed", P("etag", debugConfig.Deployment), P("reason", err), P("loadErr", clientErr))
 	} else {
-		track.Evt("Debug Feedback Prompt Answered", P("etag", debugConfig.Deployment), P("feedback", goodBad), P("loadErr", loadError))
+		track.Evt("Debug Feedback Prompt Answered", P("etag", debugConfig.Deployment), P("feedback", goodBad), P("loadErr", clientErr))
 	}
 	return nil
 }