cli.WrapRun(): change to be given to RunE field

this field actually propagates the error through Cobra to the `Command.Execute()`

Author: joonas-fi

app/cli/cobrawrappers.go

@@ -36,22 +36,18 @@ func Execute(app *cobra.Command) {
 // fixes problems of cobra commands' bare run callbacks with regards to application quality:
 // 1. logging not configured
 // 2. no interrupt handling
-// 3. no error handling
-func WrapRun(run func(ctx context.Context, args []string) error) func(*cobra.Command, []string) {
-	return func(_ *cobra.Command, args []string) {
+//
+// this is intended to be given to `RunE` field in `*cobra.Command`
+func WrapRun(run func(ctx context.Context, args []string) error) func(*cobra.Command, []string) error {
+	return func(_ *cobra.Command, args []string) error {
 		// handle logging
 		configureLogging()
 
 		// handle interrupts
 		ctx := notifyContextInterruptOrTerminate()
 
 		// run the actual code (jump from CLI context to higher-level application context)
-		// this can be kinda read as:
-		//  output = logic(input)
-		err := run(ctx, args)
-
-		// handle errors
-		osutil.ExitIfError(err)
+		return run(ctx, args)
 	}
 }
 

os/systemdcli/cli.go

@@ -39,7 +39,7 @@ func Entrypoint(serviceName string, makeAdditionalCommands func(string) []*cobra
 		Use:   "start",
 		Short: "Start the service",
 		Args:  cobra.NoArgs,
-		Run: cli.WrapRun(func(ctx context.Context, _ []string) error {
+		RunE: cli.WrapRun(func(ctx context.Context, _ []string) error {
 			return runSystemctlVerb(ctx, "start")
 		}),
 	})
@@ -48,7 +48,7 @@ func Entrypoint(serviceName string, makeAdditionalCommands func(string) []*cobra
 		Use:   "stop",
 		Short: "Stop the service",
 		Args:  cobra.NoArgs,
-		Run: cli.WrapRun(func(ctx context.Context, _ []string) error {
+		RunE: cli.WrapRun(func(ctx context.Context, _ []string) error {
 			return runSystemctlVerb(ctx, "stop")
 		}),
 	})
@@ -57,7 +57,7 @@ func Entrypoint(serviceName string, makeAdditionalCommands func(string) []*cobra
 		Use:   "restart",
 		Short: "Restart the service",
 		Args:  cobra.NoArgs,
-		Run: cli.WrapRun(func(ctx context.Context, _ []string) error {
+		RunE: cli.WrapRun(func(ctx context.Context, _ []string) error {
 			return runSystemctlVerb(ctx, "restart")
 		}),
 	})
@@ -66,7 +66,7 @@ func Entrypoint(serviceName string, makeAdditionalCommands func(string) []*cobra
 		Use:   "status",
 		Short: "Show status of the service",
 		Args:  cobra.NoArgs,
-		Run: cli.WrapRun(func(ctx context.Context, _ []string) error {
+		RunE: cli.WrapRun(func(ctx context.Context, _ []string) error {
 			translateNonError := func(err error) error {
 				if err != nil {
 					// LSB dictates that successful status show of non-running program must return 3:
@@ -89,7 +89,7 @@ func Entrypoint(serviceName string, makeAdditionalCommands func(string) []*cobra
 		Use:   "logs",
 		Short: "Get logs for the service",
 		Args:  cobra.NoArgs,
-		Run: cli.WrapRun(func(ctx context.Context, _ []string) error {
+		RunE: cli.WrapRun(func(ctx context.Context, _ []string) error {
 			//nolint:gosec // ok, is expected to not be user input.
 			logsCmd := exec.CommandContext(ctx, "journalctl", "--unit="+serviceName)
 			logsCmd.Stdout = os.Stdout
@@ -108,7 +108,7 @@ func WithInstallAndUninstallCommands(makeSvc func(string) (*systemdinstaller.Ser
 				Use:   "install",
 				Short: "Installs the background service",
 				Args:  cobra.NoArgs,
-				Run: cli.WrapRun(func(_ context.Context, _ []string) error {
+				RunE: cli.WrapRun(func(_ context.Context, _ []string) error {
 					svc, err := makeSvc(serviceName)
 					if err != nil {
 						return err