internal/core: return error if type is ErrSentinel to signal exit codes

internal/cli/app_docs.go

@@ -443,7 +443,7 @@ func (c *AppDocsCommand) Run(args []string) int {
 		return c.builtinMDX(args)
 	}
 
-	c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
+	err = c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
 		docs, err := app.Docs(ctx, &pb.Job_DocsOp{})
 		if err != nil {
 			app.UI.Output(clierrors.Humanize(err), terminal.WithErrorStyle())
@@ -537,6 +537,9 @@ func (c *AppDocsCommand) Run(args []string) int {
 
 		return nil
 	})
+	if err != nil {
+		return 1
+	}
 
 	return 0
 }

internal/cli/artifact_build.go

@@ -28,7 +28,7 @@ func (c *ArtifactBuildCommand) Run(args []string) int {
 		return 1
 	}
 
-	c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
+	err := c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
 		_, err := app.Build(ctx, &pb.Job_BuildOp{
 			DisablePush: !c.flagPush,
 		})
@@ -39,6 +39,9 @@ func (c *ArtifactBuildCommand) Run(args []string) int {
 
 		return nil
 	})
+	if err != nil {
+		return 1
+	}
 
 	return 0
 }

internal/cli/artifact_push.go

@@ -28,7 +28,7 @@ func (c *ArtifactPushCommand) Run(args []string) int {
 
 	client := c.project.Client()
 
-	c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
+	err := c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
 		// Get the most recent build
 		build, err := client.GetLatestBuild(ctx, &pb.GetLatestBuildRequest{
 			Application: app.Ref(),
@@ -50,6 +50,9 @@ func (c *ArtifactPushCommand) Run(args []string) int {
 
 		return nil
 	})
+	if err != nil {
+		return 1
+	}
 
 	return 0
 }

internal/cli/base.go

@@ -275,7 +275,7 @@ func (c *baseCommand) Init(opts ...Option) error {
 // thread-safe.
 //
 // If any error is returned, the caller should just exit. The error handling
-// including messaging to the user is handling by this function call.
+// including messaging to the user is handled by this function call.
 //
 // If you want to early exit all the running functions, you should use
 // the callback closure properties to cancel the passed in context. This
@@ -306,6 +306,9 @@ func (c *baseCommand) DoApp(ctx context.Context, f func(context.Context, *client
 		if err := f(ctx, app); err != nil {
 			if err != ErrSentinel {
 				finalErr = multierror.Append(finalErr, err)
+			} else {
+				// if we have an ErrSentinel here, we've already output info to the UI
+				return err
 			}
 		}
 	}

internal/cli/deployment_create.go

@@ -31,7 +31,7 @@ func (c *DeploymentCreateCommand) Run(args []string) int {
 
 	client := c.project.Client()
 
-	c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
+	err := c.DoApp(c.Ctx, func(ctx context.Context, app *clientpkg.App) error {
 		// Get the most recent pushed artifact
 		push, err := client.GetLatestPushedArtifact(ctx, &pb.GetLatestPushedArtifactRequest{
 			Application: app.Ref(),
@@ -106,6 +106,9 @@ func (c *DeploymentCreateCommand) Run(args []string) int {
 
 		return nil
 	})
+	if err != nil {
+		return 1
+	}
 
 	return 0
 }

internal/core/operation.go

@@ -112,7 +112,7 @@ func (a *App) doOperation(
 			log.Warn("error running before hook", "err", err)
 
 			if h.ContinueOnFailure() {
-				log.Info("hook configured to continueon failure, ignoring error")
+				log.Info("hook configured to continue on failure, ignoring error")
 				doErr = nil
 			}
 		}