#1 Fix panic error thrown on help command

fhussonnois · Apr 24, 2017 · 6cbaa05 · 6cbaa05
1 parent c24d460
commit 6cbaa05
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/cmd/kafkaconnectcli/kafkaconnectcli.go b/cmd/kafkaconnectcli/kafkaconnectcli.go
@@ -195,8 +195,12 @@ func main() {
 	case "scale":
 		commandArgParser = ScaleArgParser
 	case "help":
-		fmt.Printf("Usage of %s: %s\nThe arguments are :\n", os.Args[2], Commands[os.Args[2]])
-		switch os.Args[2] {
+		if len(os.Args) < 3 {
+			usage()
+		}
+		subCommand := os.Args[2]
+		fmt.Printf("Usage of %s: %s\nThe arguments are :\n", subCommand, Commands[subCommand])
+		switch subCommand {
 		case "config", "status", "delete", "resume", "pause", "tasks", "restart-failed":
 			ConnectorArgParser.Flag.PrintDefaults()
 		case "create":
@@ -208,7 +212,7 @@ func main() {
 		case "delete-all", "plugins", "version":
 			CommonArgParser.Flag.PrintDefaults()
 		default:
-			fmt.Fprint(os.Stderr, "Unknown help command `"+os.Args[2]+"`.  Run '"+os.Args[0]+" help'.\n")
+			fmt.Fprint(os.Stderr, "Unknown help command `"+subCommand+"`.  Run '"+os.Args[0]+" help'.\n")
 		}
 		os.Exit(1)
 	default:

diff --git a/cmd/schemaregistrycli/registrycli.go b/cmd/schemaregistrycli/registrycli.go
@@ -238,7 +238,12 @@ func main() {
 	case "test":
 		commandArgParser = TestCompatibilityArgParser
 	case "help":
-		switch os.Args[2] {
+		if len(os.Args) < 3 {
+			usage()
+		}
+		subCommand := os.Args[2]
+		fmt.Printf("Usage of %s: %s\nThe arguments are :\n", subCommand, Commands[subCommand])
+		switch subCommand {
 		case "subjects", "global-compatibility":
 			CommonArgParser.Flag.PrintDefaults()
 		case "versions", "compatibility":
@@ -254,7 +259,7 @@ func main() {
 		case "test":
 			TestCompatibilityArgParser.Flag.PrintDefaults()
 		default:
-			fmt.Fprint(os.Stderr, "Unknown help command `"+os.Args[2]+"`.  Run '"+os.Args[0]+" help'.\n")
+			fmt.Fprint(os.Stderr, "Unknown help command `"+subCommand+"`.  Run '"+os.Args[0]+" help'.\n")
 		}
 		os.Exit(1)
 	default: