feat: deploy --no-converge-checks & finish app errors

cli/app/deploy.go

@@ -14,6 +14,7 @@ var appDeployCommand = &cli.Command{
 		internal.ForceFlag,
 		internal.ChaosFlag,
 		internal.NoDomainChecksFlag,
+		internal.DontWaitConvergeFlag,
 	},
 	Description: `
 This command deploys a new instance of an app. It does not support changing the

cli/app/errors.go

@@ -3,14 +3,17 @@ package app
 import (
 	"strconv"
 	"strings"
+	"time"
 
-	abraFormatter "coopcloud.tech/abra/cli/formatter"
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/recipe"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
@@ -26,7 +29,7 @@ or having issues, it could be a lot of things. This command is best accompanied
 by "abra app logs <app>".
 `,
 	Aliases:      []string{"e"},
-	Flags:        []cli.Flag{},
+	Flags:        []cli.Flag{internal.WatchFlag},
 	BashComplete: autocomplete.AppNameComplete,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
@@ -45,54 +48,69 @@ by "abra app logs <app>".
 			logrus.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		filters := filters.NewArgs()
-		filters.Add("name", app.StackName())
+		if !internal.Watch {
+			if err := checkErrors(c, cl, app); err != nil {
+				logrus.Fatal(err)
+			}
+			return nil
+		}
 
+		for {
+			if err := checkErrors(c, cl, app); err != nil {
+				logrus.Fatal(err)
+			}
+			time.Sleep(2 * time.Second)
+		}
+
+		return nil
+	},
+}
+
+func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error {
+	recipe, err := recipe.Get(app.Type)
+	if err != nil {
+		return err
+	}
+
+	for _, service := range recipe.Config.Services {
+		filters := filters.NewArgs()
+		filters.Add("name", service.Name)
 		containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
+		if err != nil {
+			return err
+		}
+
+		if len(containers) == 0 {
+			logrus.Warnf("%s is not up, something seems wrong", service.Name)
+			continue
+		}
+
+		container := containers[0]
+		containerState, err := cl.ContainerInspect(c.Context, container.ID)
 		if err != nil {
 			logrus.Fatal(err)
 		}
 
-		tableCol := []string{"app name", "status", "error", "out of memory", "restart count", "healthcheck"}
-		table := abraFormatter.CreateTable(tableCol)
-
-		for _, container := range containers {
-			serviceName := getServiceName(container.Names)
-
-			containerState, err := cl.ContainerInspect(c.Context, container.ID)
-			if err != nil {
-				logrus.Fatal(err)
-			}
-
-			errMsg := "N/A"
-			hcStat := "N/A"
-			var hcLogs []string
-			if containerState.State.Health != nil {
-				hcStat = containerState.State.Health.Status
-				for _, log := range containerState.State.Health.Log {
-					hcLogs = append(hcLogs, log.Output)
-				}
-			}
-
-			if containerState.State.Error != "" {
-				errMsg = containerState.State.Error
-			}
-
-			table.Append([]string{
-				serviceName,
-				containerState.State.Status,
-				errMsg,
-				strconv.FormatBool(containerState.State.OOMKilled),
-				strconv.Itoa(containerState.RestartCount),
-				hcStat,
-				strings.Join(hcLogs, "\n"),
-			})
+		if containerState.State.OOMKilled {
+			logrus.Warnf("%s has been killed due to an out of memory error", service.Name)
 		}
 
-		table.Render()
+		if containerState.State.Error != "" {
+			logrus.Warnf("%s reports this error: ", containerState.State.Error)
+		}
 
-		return nil
-	},
+		if containerState.State.Health != nil {
+			if containerState.State.Health.Status != "healthy" {
+				logrus.Warnf("%s healthcheck status is %s", service.Name, containerState.State.Health.Status)
+				logrus.Warnf("%s healthcheck has failed %s times", service.Name, strconv.Itoa(containerState.State.Health.FailingStreak))
+				for _, log := range containerState.State.Health.Log {
+					logrus.Warnf("%s healthcheck logs: %s", service.Name, strings.TrimSpace(log.Output))
+				}
+			}
+		}
+	}
+
+	return nil
 }
 
 func getServiceName(names []string) string {

cli/app/ps.go

@@ -15,26 +15,17 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var watch bool
-var watchFlag = &cli.BoolFlag{
-	Name:        "watch",
-	Aliases:     []string{"w"},
-	Value:       false,
-	Usage:       "Watch status by polling repeatedly",
-	Destination: &watch,
-}
-
 var appPsCommand = &cli.Command{
 	Name:        "ps",
 	Usage:       "Check app status",
 	Description: "This command shows a more detailed status output of a specific deployed app.",
 	Aliases:     []string{"p"},
 	Flags: []cli.Flag{
-		watchFlag,
+		internal.WatchFlag,
 	},
 	BashComplete: autocomplete.AppNameComplete,
 	Action: func(c *cli.Context) error {
-		if !watch {
+		if !internal.Watch {
 			showPSOutput(c)
 			return nil
 		}

cli/app/rollback.go

@@ -25,6 +25,7 @@ var appRollbackCommand = &cli.Command{
 	Flags: []cli.Flag{
 		internal.ForceFlag,
 		internal.ChaosFlag,
+		internal.DontWaitConvergeFlag,
 	},
 	Description: `
 This command rolls an app back to a previous version if one exists.
@@ -164,7 +165,7 @@ recipes.
 			}
 		}
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, app.Type); err != nil {
+		if err := stack.RunDeploy(cl, deployOpts, compose, app.Type, internal.DontWaitConverge); err != nil {
 			logrus.Fatal(err)
 		}
 

cli/app/upgrade.go

@@ -25,6 +25,7 @@ var appUpgradeCommand = &cli.Command{
 		internal.ForceFlag,
 		internal.ChaosFlag,
 		internal.NoDomainChecksFlag,
+		internal.NoDomainChecksFlag,
 	},
 	Description: `
 This command supports upgrading an app. You can use it to choose and roll out a
@@ -165,7 +166,7 @@ recipes.
 			logrus.Fatal(err)
 		}
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, app.Type); err != nil {
+		if err := stack.RunDeploy(cl, deployOpts, compose, app.Type, internal.DontWaitConverge); err != nil {
 			logrus.Fatal(err)
 		}