no more os.Exit(1)

carole-lavillonniere · carole-lavillonniere · commit 8aae81e26511 · 2026-03-04T11:57:39.000+01:00
diff --git a/cmd/help_test.go b/cmd/help_test.go
@@ -7,12 +7,13 @@ import (
 	"testing"
 
 	"github.com/localstack/lstk/internal/env"
+	"github.com/localstack/lstk/internal/telemetry"
 )
 
 func executeWithArgs(t *testing.T, args ...string) (string, error) {
 	t.Helper()
 	buf := new(bytes.Buffer)
-	cmd := NewRootCmd(&env.Env{})
+	cmd := NewRootCmd(&env.Env{}, telemetry.New("", true))
 	cmd.SetOut(buf)
 	cmd.SetErr(buf)
 	cmd.SetArgs(args)
diff --git a/cmd/root.go b/cmd/root.go
@@ -17,25 +17,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func NewRootCmd(cfg *env.Env) *cobra.Command {
+func NewRootCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
 	root := &cobra.Command{
-		Use:     "lstk",
-		Short:   "LocalStack CLI",
-		Long:    "lstk is the command-line interface for LocalStack.",
+		Use:          "lstk",
+		Short:        "LocalStack CLI",
+		Long:         "lstk is the command-line interface for LocalStack.",
 		PreRunE: initConfig,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			rt, err := runtime.NewDockerRuntime()
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-				os.Exit(1)
-			}
-
-			if err := runStart(cmd.Context(), rt, cfg); err != nil {
-				if !output.IsSilent(err) {
-					fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-				}
-				os.Exit(1)
+				return err
 			}
+			return runStart(cmd.Context(), rt, cfg, tel)
 		},
 	}
 
@@ -48,7 +41,7 @@ func NewRootCmd(cfg *env.Env) *cobra.Command {
 	root.Flags().Lookup("version").Usage = "Show version"
 
 	root.AddCommand(
-		newStartCmd(cfg),
+		newStartCmd(cfg, tel),
 		newStopCmd(),
 		newLoginCmd(cfg),
 		newLogoutCmd(cfg),
@@ -62,12 +55,22 @@ func NewRootCmd(cfg *env.Env) *cobra.Command {
 
 func Execute(ctx context.Context) error {
 	cfg := env.Init()
-	return NewRootCmd(cfg).ExecuteContext(ctx)
-}
-
-func runStart(ctx context.Context, rt runtime.Runtime, cfg *env.Env) error {
 	tel := telemetry.New(cfg.AnalyticsEndpoint, cfg.DisableEvents)
 	defer tel.Flush()
+
+	root := NewRootCmd(cfg, tel)
+	root.SilenceErrors = true
+
+	if err := root.ExecuteContext(ctx); err != nil {
+		if !output.IsSilent(err) {
+			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		}
+		return err
+	}
+	return nil
+}
+
+func runStart(ctx context.Context, rt runtime.Runtime, cfg *env.Env, tel *telemetry.Client) error {
 	// TODO: replace map with a typed payload struct once event schema is finalised
 	tel.Track("cli_cmd", map[string]any{"cmd": "lstk start", "params": []string{}})
 
diff --git a/cmd/start.go b/cmd/start.go
@@ -1,34 +1,24 @@
 package cmd
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/localstack/lstk/internal/env"
-	"github.com/localstack/lstk/internal/output"
 	"github.com/localstack/lstk/internal/runtime"
+	"github.com/localstack/lstk/internal/telemetry"
 	"github.com/spf13/cobra"
 )
 
-func newStartCmd(cfg *env.Env) *cobra.Command {
+func newStartCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
 	return &cobra.Command{
 		Use:     "start",
 		Short:   "Start emulator",
 		Long:    "Start emulator and services.",
 		PreRunE: initConfig,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			rt, err := runtime.NewDockerRuntime()
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-				os.Exit(1)
-			}
-
-			if err := runStart(cmd.Context(), rt, cfg); err != nil {
-				if !output.IsSilent(err) {
-					fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-				}
-				os.Exit(1)
+				return err
 			}
+			return runStart(cmd.Context(), rt, cfg, tel)
 		},
 	}
 }
diff --git a/cmd/stop.go b/cmd/stop.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/localstack/lstk/internal/container"
 	"github.com/localstack/lstk/internal/runtime"
@@ -15,21 +14,14 @@ func newStopCmd() *cobra.Command {
 		Short:   "Stop emulator",
 		Long:    "Stop emulator and services",
 		PreRunE: initConfig,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			rt, err := runtime.NewDockerRuntime()
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-				os.Exit(1)
+				return err
 			}
-
-			onProgress := func(msg string) {
+			return container.Stop(cmd.Context(), rt, func(msg string) {
 				fmt.Println(msg)
-			}
-
-			if err := container.Stop(cmd.Context(), rt, onProgress); err != nil {
-				fmt.Fprintln(os.Stderr, err)
-				os.Exit(1)
-			}
+			})
 		},
 	}
 }
