Check for more arguments than required

jtyr · May 3, 2021 · 126d001 · 126d001
1 parent c1d4cad
commit 126d001
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 2 deletions.
diff --git a/cmd/apikey/apikeyCreate.go b/cmd/apikey/apikeyCreate.go
@@ -36,6 +36,8 @@ func checkCreateArgs(cmd *cobra.Command, args []string) error {
 		os.Exit(0)
 	} else if argsLen < 3 {
 		return fmt.Errorf("requires ORG_SLUG, NAME and ROLE argument")
+	} else if argsLen > 3 {
+		return fmt.Errorf("requires only ORG_SLUG, NAME and ROLE argument")
 	}
 
 	if err := ak.SetOrgSlug(args[0]); err != nil {

diff --git a/cmd/apikey/apikeyDelete.go b/cmd/apikey/apikeyDelete.go
@@ -36,6 +36,8 @@ func checkDeleteArgs(cmd *cobra.Command, args []string) error {
 		os.Exit(0)
 	} else if argsLen < 2 {
 		return fmt.Errorf("requires ORG_SLUG and NAME argument")
+	} else if argsLen > 2 {
+		return fmt.Errorf("requires only ORG_SLUG and NAME argument")
 	}
 
 	if err := ak.SetOrgSlug(args[0]); err != nil {

diff --git a/cmd/apikey/apikeyList.go b/cmd/apikey/apikeyList.go
@@ -41,6 +41,10 @@ func checkListArgs(cmd *cobra.Command, args []string) error {
 		os.Exit(0)
 	}
 
+	if argsLen > 2 {
+		return fmt.Errorf("requires only ORG_SLUG and optionally NAME argument")
+	}
+
 	if err := ak.SetOrgSlug(args[0]); err != nil {
 		return err
 	}

diff --git a/cmd/grafana/apikey/apikeyCreate.go b/cmd/grafana/apikey/apikeyCreate.go
@@ -47,6 +47,10 @@ func checkCreateArgs(cmd *cobra.Command, args []string) error {
 			return errors.New("requires NAME and ROLE argument")
 		}
 
+		if argsLen > 2 {
+			return errors.New("requires only NAME and ROLE argument")
+		}
+
 		if err := ak.SetName(args[0]); err != nil {
 			return err
 		}
@@ -66,6 +70,8 @@ func checkCreateArgs(cmd *cobra.Command, args []string) error {
 		}
 	} else if argsLen < 3 {
 		return errors.New("requires STACK_SLUG, NAME and ROLE argument")
+	} else if argsLen > 3 {
+		return errors.New("requires only STACK_SLUG, NAME and ROLE argument")
 	} else {
 		if err := ak.SetStackSlug(args[0]); err != nil {
 			return err

diff --git a/cmd/grafana/apikey/apikeyDelete.go b/cmd/grafana/apikey/apikeyDelete.go
@@ -46,6 +46,10 @@ func checkDeleteArgs(cmd *cobra.Command, args []string) error {
 			return errors.New("requires NAME argument")
 		}
 
+		if argsLen > 1 {
+			return errors.New("requires only NAME argument")
+		}
+
 		if err := ak.SetName(args[0]); err != nil {
 			return err
 		}
@@ -55,6 +59,8 @@ func checkDeleteArgs(cmd *cobra.Command, args []string) error {
 		}
 	} else if argsLen < 3 {
 		return errors.New("requires ORG_SLUG, STACK_SLUG and NAME argument")
+	} else if argsLen > 3 {
+		return errors.New("requires only ORG_SLUG, STACK_SLUG and NAME argument")
 	} else {
 		if err := ak.SetOrgSlug(args[0]); err != nil {
 			return err

diff --git a/cmd/grafana/apikey/apikeyList.go b/cmd/grafana/apikey/apikeyList.go
@@ -48,6 +48,10 @@ func checkListArgs(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
+		if argsLen > 1 {
+			return errors.New("requires only optional NAME argument")
+		}
+
 		if argsLen == 1 {
 			if err := ak.SetName(args[0]); err != nil {
 				return err
@@ -58,6 +62,8 @@ func checkListArgs(cmd *cobra.Command, args []string) error {
 		os.Exit(0)
 	} else if argsLen < 2 {
 		return errors.New("requires ORG_SLUG and STACK_SLUG argument")
+	} else if argsLen > 2 {
+		return errors.New("requires only ORG_SLUG and STACK_SLUG argument")
 	} else {
 		if err := ak.SetOrgSlug(args[0]); err != nil {
 			return err

diff --git a/cmd/grafana/grafanaRestart.go b/cmd/grafana/grafanaRestart.go
@@ -29,11 +29,17 @@ func NewCmdRestart() *cobra.Command {
 // checkRestartArgs checks if the positional arguments have correct value. If no
 // args are specified, it prints out the command usage.
 func checkRestartArgs(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 {
+	argsLen := len(args)
+
+	if argsLen == 0 {
 		cmd.Usage()
 		os.Exit(0)
 	}
 
+	if argsLen > 1 {
+		return fmt.Errorf("requires only STACK_SLUG argument")
+	}
+
 	if err := gr.SetStackSlug(args[0]); err != nil {
 		return err
 	}

diff --git a/cmd/stack/stackCreate.go b/cmd/stack/stackCreate.go
@@ -36,6 +36,10 @@ func checkCreateArgs(cmd *cobra.Command, args []string) error {
 		os.Exit(0)
 	}
 
+	if argsLen > 2 {
+		return fmt.Errorf("requires only STACK_SLUG and optionally NAME argument")
+	}
+
 	if err := st.SetStackSlug(args[0]); err != nil {
 		return err
 	}

diff --git a/cmd/stack/stackDelete.go b/cmd/stack/stackDelete.go
@@ -29,11 +29,17 @@ func NewCmdDelete() *cobra.Command {
 // checkDeleteArgs checks if the positional arguments have correct value. If no
 // args are specified, it prints out the command usage.
 func checkDeleteArgs(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 {
+	argsLen := len(args)
+
+	if argsLen == 0 {
 		cmd.Usage()
 		os.Exit(0)
 	}
 
+	if argsLen > 1 {
+		return fmt.Errorf("requires only STACK_SLUG argument")
+	}
+
 	if err := st.SetStackSlug(args[0]); err != nil {
 		return err
 	}

diff --git a/cmd/stack/stackList.go b/cmd/stack/stackList.go
@@ -37,6 +37,10 @@ func checkListArgs(cmd *cobra.Command, args []string) error {
 		os.Exit(0)
 	}
 
+	if argsLen > 2 {
+		return fmt.Errorf("requires only ORG_SLUG and optionally STACK_SLUG argument")
+	}
+
 	if err := st.SetOrgSlug(args[0]); err != nil {
 		return err
 	}