fix: cobra could throw error that will end up in json parser

Signed-off-by: Timur Tuktamyshev <[email protected]>

Author: timmilesdw

pkg/app/root.go

@@ -8,28 +8,36 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/deckhouse/deckhouse/pkg/log"
+
 	"github.com/deckhouse/module-sdk/internal/controller"
 )
 
 func newCMD(controller *controller.HookController) *cmd {
 	return &cmd{
 		controller: controller,
+		logger:     log.Default(),
 	}
 }
 
 type cmd struct {
 	controller *controller.HookController
+	logger     *log.Logger
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func (c *cmd) Execute() {
+
 	rootCmd := c.rootCmd()
 	rootCmd.AddCommand(c.hooksCmd())
 	rootCmd.CompletionOptions.DisableDefaultCmd = true
+	rootCmd.SilenceUsage = true
+	rootCmd.SilenceErrors = true
 
 	err := rootCmd.Execute()
 	if err != nil {
+		c.logger.Error("failed to execute root command", "error", err)
 		os.Exit(1)
 	}
 }
@@ -67,77 +75,82 @@ func (c *cmd) hooksCmd() *cobra.Command {
 		},
 	})
 
-	hooksCmd.AddCommand(&cobra.Command{
+	configCmd := &cobra.Command{
 		Use:   "config",
 		Short: "Print hooks configs",
 		Long:  `Print list of hooks configs in json format`,
-		RunE: func(_ *cobra.Command, _ []string) error {
+		Run: func(_ *cobra.Command, _ []string) {
 			err := c.controller.PrintHookConfigs()
 			if err != nil {
-				return fmt.Errorf("can not print configs: %w", err)
+				c.logger.Error("can not print configs", "error", err)
+				os.Exit(1)
 			}
-
-			return nil
 		},
-	})
+	}
+	hooksCmd.AddCommand(configCmd)
 
-	hooksCmd.AddCommand(&cobra.Command{
+	dumpCmd := &cobra.Command{
 		Use:    "dump",
 		Short:  "Dump hooks configs",
 		Long:   `Dump list of hooks configs in config.json file`,
 		Hidden: true,
-		RunE: func(_ *cobra.Command, _ []string) error {
+		Run: func(_ *cobra.Command, _ []string) {
 			err := c.controller.WriteHookConfigsInFile()
 			if err != nil {
-				return fmt.Errorf("can not write configs to file: %w", err)
+				c.logger.Error("can not write configs to file", "error", err)
+				os.Exit(1)
 			}
 
 			fmt.Println("dump successfully")
-
-			return nil
 		},
-	})
+	}
+	hooksCmd.AddCommand(dumpCmd)
 
-	hooksCmd.AddCommand(&cobra.Command{
+	runCmd := &cobra.Command{
 		Use:    "run",
 		Short:  "Running hook",
 		Long:   `Run hook from binary registry`,
 		Hidden: true,
-		Args:   cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args: func(cmd *cobra.Command, args []string) error {
+			if len(args) != 1 {
+				c.logger.Error("invalid number of arguments", "expected", 1, "received", len(args))
+				os.Exit(1)
+			}
+			return nil
+		},
+		Run: func(cmd *cobra.Command, args []string) {
 			ctx := cmd.Context()
 
 			idxRaw := args[0]
 			idx, err := strconv.Atoi(idxRaw)
 			if err != nil {
-				return fmt.Errorf("argument '%s' is not integer", idxRaw)
+				c.logger.Error("invalid argument", "argument", idxRaw, "error", err)
+				os.Exit(1)
 			}
 
 			err = c.controller.RunHook(ctx, idx)
 			if err != nil {
-				return fmt.Errorf("run hook error: %w", err)
+				c.logger.Warn("hook shutdown", "error", err)
 			}
-
-			return nil
 		},
-	})
+	}
+	hooksCmd.AddCommand(runCmd)
 
-	hooksCmd.AddCommand(&cobra.Command{
+	readyCmd := &cobra.Command{
 		Use:    "ready",
 		Short:  "Check readiness",
 		Long:   `Run readiness hook for module`,
 		Hidden: true,
-		RunE: func(cmd *cobra.Command, _ []string) error {
+		Run: func(cmd *cobra.Command, _ []string) {
 			ctx := cmd.Context()
 
 			err := c.controller.RunReadiness(ctx)
 			if err != nil {
-				return fmt.Errorf("run readiness hook error: %w", err)
+				c.logger.Warn("readiness hook shutdown", "error", err)
 			}
-
-			return nil
 		},
-	})
+	}
+	hooksCmd.AddCommand(readyCmd)
 
 	return hooksCmd
 }