catch arg errors early

Everbridge · Jan 15, 2019 · 020aae5 · 020aae5
1 parent 847fbdc
commit 020aae5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/cmd/decrypt.go b/cmd/decrypt.go
@@ -44,6 +44,11 @@ var decryptCmd = &cobra.Command{
 			logger.Fatal(err)
 		}
 
+		if len(args) == 0 {
+			cmd.Help()
+			return
+		}
+
 		// process args
 		switch args[0] {
 		case all:
@@ -65,7 +70,7 @@ var decryptCmd = &cobra.Command{
 			s := sls.New(inputFilePath, pk, topLevelElement)
 			utils.PathAction(&s, yamlPath, "decrypt")
 		default:
-			logger.Fatalf("unknown argument: '%s'", args[0])
+			cmd.Help()
 		}
 	},
 }

diff --git a/cmd/encrypt.go b/cmd/encrypt.go
@@ -44,6 +44,11 @@ var encryptCmd = &cobra.Command{
 			logger.Fatal(err)
 		}
 
+		if len(args) == 0 {
+			cmd.Help()
+			return
+		}
+
 		// process args
 		switch args[0] {
 		case all:
@@ -65,7 +70,7 @@ var encryptCmd = &cobra.Command{
 			s := sls.New(inputFilePath, pk, topLevelElement)
 			utils.PathAction(&s, yamlPath, "encrypt")
 		default:
-			logger.Fatalf("unknown argument: '%s'", args[0])
+			cmd.Help()
 		}
 	},
 }

diff --git a/cmd/rotate.go b/cmd/rotate.go
@@ -42,6 +42,8 @@ var rotateCmd = &cobra.Command{
 			s := sls.New(inputFilePath, pk, topLevelElement)
 			buf, err := s.PerformAction("rotate")
 			utils.SafeWrite(buf, outputFilePath, err)
+		} else {
+			cmd.Help()
 		}
 	},
 }