fix: Improve error handling (#270)

blackstork-io · Dec 16, 2024 · 72012c6 · 72012c6
1 parent 8c040aa
commit 72012c6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 41 deletions.
diff --git a/cmd/data.go b/cmd/data.go
@@ -34,17 +34,11 @@ var dataCmd = &cobra.Command{
 			engine.WithBuiltIn(builtin.Plugin(version, slog.Default(), tracer)),
 		)
 		defer func() {
-			diags.Extend(eng.Cleanup())
-			if diags.HasErrors() {
-				err = diags
-				cmd.SilenceErrors = true
-				cmd.SilenceUsage = true
-			}
-			eng.PrintDiagnostics(os.Stderr, diags, cliArgs.colorize)
+			err = exitCommand(eng, cmd, diags)
 		}()
 		diag := eng.ParseDir(ctx, os.DirFS(cliArgs.sourceDir))
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 		if diags.Extend(eng.LoadPluginResolver(ctx, false)) {
 			return

diff --git a/cmd/install.go b/cmd/install.go
@@ -31,26 +31,20 @@ var installCmd = &cobra.Command{
 			engine.WithBuiltIn(builtin.Plugin(version, slog.Default(), tracer)),
 		)
 		defer func() {
-			diags.Extend(eng.Cleanup())
-			if diags.HasErrors() {
-				err = diags
-				cmd.SilenceErrors = true
-				cmd.SilenceUsage = true
-			}
-			eng.PrintDiagnostics(os.Stderr, diags, cliArgs.colorize)
+			err = exitCommand(eng, cmd, diags)
 		}()
 		diag := eng.ParseDir(ctx, os.DirFS(cliArgs.sourceDir))
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 		diag = eng.LoadPluginResolver(ctx, true)
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 		diag = eng.Install(ctx, installUpgrade)
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
-		return nil
+		return
 	},
 }
diff --git a/cmd/lint.go b/cmd/lint.go
@@ -31,17 +31,11 @@ var lintCmd = &cobra.Command{
 			engine.WithBuiltIn(builtin.Plugin(version, slog.Default(), tracer)),
 		)
 		defer func() {
-			diags.Extend(eng.Cleanup())
-			if diags.HasErrors() {
-				err = diags
-				cmd.SilenceErrors = true
-				cmd.SilenceUsage = true
-			}
-			eng.PrintDiagnostics(os.Stderr, diags, cliArgs.colorize)
+			err = exitCommand(eng, cmd, diags)
 		}()
 		diag := eng.ParseDir(ctx, os.DirFS(cliArgs.sourceDir))
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 		if fullLint {
 			if diags.Extend(eng.LoadPluginResolver(ctx, false)) {
@@ -53,6 +47,6 @@ var lintCmd = &cobra.Command{
 		}
 		diag = eng.Lint(ctx, fullLint)
 		diags.Extend(diag)
-		return nil
+		return
 	},
 }
diff --git a/cmd/render.go b/cmd/render.go
@@ -68,35 +68,31 @@ var renderCmd = &cobra.Command{
 			engine.WithBuiltIn(builtin.Plugin(version, slog.Default(), tracer)),
 		)
 		defer func() {
-			diags.Extend(eng.Cleanup())
-			if diags.HasErrors() {
-				err = diags
-				cmd.SilenceErrors = true
-				cmd.SilenceUsage = true
-			}
-			eng.PrintDiagnostics(os.Stderr, diags, cliArgs.colorize)
+			err = exitCommand(eng, cmd, diags)
 		}()
 		diag := eng.ParseDir(ctx, os.DirFS(cliArgs.sourceDir))
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 		diag = eng.LoadPluginResolver(ctx, false)
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 		diag = eng.LoadPluginRunner(ctx)
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 
 		doc, content, dataCtx, diag := eng.RenderContent(ctx, target, requiredTags)
 		if diags.Extend(diag) {
-			return diags
+			return
 		}
 
 		if publish {
-			diags.Extend(eng.PublishContent(ctx, target, doc, content, dataCtx))
-			return diags
+			diag = eng.PublishContent(ctx, target, doc, content, dataCtx)
+			if diags.Extend(diag) {
+				return
+			}
 		}
 
 		logger.InfoContext(ctx, "Printing to stdout", "format", format)

diff --git a/cmd/root.go b/cmd/root.go
@@ -24,6 +24,8 @@ import (
 	"github.com/blackstork-io/fabric/cmd/fabctx"
 	"github.com/blackstork-io/fabric/cmd/internal/multilog"
 	"github.com/blackstork-io/fabric/cmd/internal/telemetry"
+	"github.com/blackstork-io/fabric/engine"
+	"github.com/blackstork-io/fabric/pkg/diagnostics"
 	"github.com/blackstork-io/fabric/pkg/utils/slogutil"
 )
 
@@ -206,3 +208,16 @@ func recoverExecute(ctx context.Context, cmd *cobra.Command) (err error) {
 	}()
 	return cmd.ExecuteContext(ctx)
 }
+
+func exitCommand(eng *engine.Engine, cmd *cobra.Command, diags diagnostics.Diag) (err error) {
+	diags.Extend(eng.Cleanup())
+	if diags.HasErrors() {
+		err = diags
+		cmd.SilenceErrors = true
+		cmd.SilenceUsage = true
+	} else {
+		err = nil
+	}
+	eng.PrintDiagnostics(os.Stderr, diags, cliArgs.colorize)
+	return err
+}