use Cobra's functionality to validate arguments

Closes #1125

Author: elhimov

cli/cmd/aeon.go

@@ -37,18 +37,13 @@ func newAeonConnectCmd() *cobra.Command {
 		tt aeon connect http://localhost:50051
 		tt aeon connect unix://<socket-path>
 		tt aeon connect /path/to/config INSTANCE_NAME>`,
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			err := aeonConnectValidateArgs(cmd, args)
-			util.HandleCmdErr(cmd, err)
-			return err
-		},
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdCtx.CommandName = cmd.Name()
 			err := modules.RunCmd(&cmdCtx, cmd.CommandPath(), &modulesInfo,
 				internalAeonConnect, args)
 			util.HandleCmdErr(cmd, err)
 		},
-		Args: cobra.RangeArgs(1, 2),
+		Args: cobra.MatchAll(cobra.RangeArgs(1, 2), aeonConnectValidateArgs),
 	}
 
 	aeonCmd.Flags().StringVar(&connectCtx.Ssl.KeyFile, "sslkeyfile", "",

cli/cmd/daemon.go

@@ -22,56 +22,44 @@ func NewDaemonCmd() *cobra.Command {
 		Use:   "start",
 		Short: "start tt daemon",
 		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) != 0 {
-				log.Fatalf("Wrong number of arguments")
-			}
-
 			err := modules.RunCmd(&cmdCtx, cmd.CommandPath(), &modulesInfo,
 				internalDaemonStartModule, args)
 			util.HandleCmdErr(cmd, err)
 		},
+		Args: cobra.ExactArgs(0),
 	}
 
 	var stopCmd = &cobra.Command{
 		Use:   "stop",
 		Short: "stop tt daemon",
 		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) != 0 {
-				log.Fatalf("Wrong number of arguments")
-			}
-
 			err := modules.RunCmd(&cmdCtx, cmd.CommandPath(), &modulesInfo,
 				internalDaemonStopModule, args)
 			util.HandleCmdErr(cmd, err)
 		},
+		Args: cobra.ExactArgs(0),
 	}
 
 	var statusCmd = &cobra.Command{
 		Use:   "status",
 		Short: "status of tt daemon",
 		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) != 0 {
-				log.Fatalf("Wrong number of arguments")
-			}
-
 			err := modules.RunCmd(&cmdCtx, cmd.CommandPath(), &modulesInfo,
 				internalDaemonStatusModule, args)
 			util.HandleCmdErr(cmd, err)
 		},
+		Args: cobra.ExactArgs(0),
 	}
 
 	var restartCmd = &cobra.Command{
 		Use:   "restart",
 		Short: "restart tt daemon",
 		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) != 0 {
-				log.Fatalf("Wrong number of arguments")
-			}
-
 			err := modules.RunCmd(&cmdCtx, cmd.CommandPath(), &modulesInfo,
 				internalDaemonRestartModule, args)
 			util.HandleCmdErr(cmd, err)
 		},
+		Args: cobra.ExactArgs(0),
 	}
 
 	daemonSubCommands := []*cobra.Command{

cli/cmd/pack.go

@@ -24,29 +24,12 @@ func NewPackCmd() *cobra.Command {
 The supported types are: tgz, deb, rpm`,
 		ValidArgs: []string{"tgz", "deb", "rpm"},
 		Run: func(cmd *cobra.Command, args []string) {
-			err := cobra.ExactArgs(1)(cmd, args)
-			if err != nil {
-				err = fmt.Errorf("incorrect combination of command parameters: %s", err.Error())
-				log.Fatalf(err.Error())
-			}
-			err = cobra.OnlyValidArgs(cmd, args)
-			if err != nil {
-				err = fmt.Errorf("incorrect combination of command parameters: %s", err.Error())
-				log.Fatalf(err.Error())
-			}
-			if packCtx.CartridgeCompat && args[0] != "tgz" {
-				err = fmt.Errorf("cartridge-compat flag can only be used while packing tgz bundle")
-				log.Fatalf(err.Error())
-			}
-			if packCtx.TarantoolVersion != "" && !packCtx.UseDocker {
-				err = fmt.Errorf("tarantool-version argument can only be " +
-					"used while packing in docker")
-				log.Fatalf(err.Error())
-			}
 			cmdCtx.CommandName = cmd.Name()
-			err = modules.RunCmd(&cmdCtx, cmd.CommandPath(), &modulesInfo, internalPackModule, args)
+			err := modules.RunCmd(&cmdCtx, cmd.CommandPath(), &modulesInfo,
+				internalPackModule, args)
 			util.HandleCmdErr(cmd, err)
 		},
+		Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
 	}
 
 	// Common flags.
@@ -150,12 +133,19 @@ func checkFlags(packCtx *pack.PackCtx) error {
 			log.Warnf("You specified the --all flag," +
 				" but you are not packaging a tarball. Flag will be ignored")
 		}
+		if packCtx.CartridgeCompat {
+			return fmt.Errorf("cartridge-compat flag can only be used while packing tgz bundle")
+		}
 	}
 	// Check if --with-integrity-check and --without-binaries flags are provided
 	// simultaneously. If this is the case, return an error for safety reasons.
 	if packCtx.IntegrityPrivateKey != "" && packCtx.WithoutBinaries {
 		return fmt.Errorf("impossible combination of --with-integrity-check" +
 			" and --without-binaries flags")
 	}
+	if packCtx.TarantoolVersion != "" && !packCtx.UseDocker {
+		return fmt.Errorf("tarantool-version argument can only be " +
+			"used while packing in docker")
+	}
 	return nil
 }

test/integration/pack/test_pack.py

@@ -1031,8 +1031,7 @@ def test_pack_incorrect_pack_type(tt_cmd, tmp_path):
                     copy_function=shutil.copy2, ignore_dangling_symlinks=True,
                     dirs_exist_ok=True)
 
-    expected_output = "incorrect combination of command parameters: " \
-                      "invalid argument \"de\" for \"tt pack\""
+    expected_output = "invalid argument \"de\" for \"tt pack\""
 
     rc, output = run_command_and_get_output(
         [tt_cmd, "pack", "de"],