Stop printing usage when a flag is unknown.

The usage text is long and makes it hard to notice the actual error.
bojanz · Aug 11, 2023 · 3598592 · 3598592
1 parent a9607d9
commit 3598592
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/cmd/broom/add.go b/cmd/broom/add.go
@@ -19,7 +19,7 @@ const addDescription = `Add a new profile`
 
 func addCmd(args []string) {
 	authTypes := broom.AuthTypes()
-	flags := flag.NewFlagSet("add", flag.ExitOnError)
+	flags := flag.NewFlagSet("add", flag.ContinueOnError)
 	var (
 		help            = flags.BoolP("help", "h", false, "Display this help text and exit")
 		authCredentials = flags.String("auth", "", "Auth credentials (e.g. access token or API key). Used to authenticate every request")
@@ -29,7 +29,9 @@ func addCmd(args []string) {
 		serverURL       = flags.String("server-url", "", "Server URL")
 	)
 	flags.SortFlags = false
-	flags.Parse(args)
+	if err := flags.Parse(args); err != nil {
+		exitWithError(err)
+	}
 	if *help || flags.NArg() < 3 {
 		addUsage()
 		flagUsage(flags)

diff --git a/cmd/broom/profile.go b/cmd/broom/profile.go
@@ -20,7 +20,7 @@ import (
 const profileDescription = `List the profile's operations`
 
 func profileCmd(args []string) {
-	flags := flag.NewFlagSet("profile", flag.ExitOnError)
+	flags := flag.NewFlagSet("profile", flag.ContinueOnError)
 	var (
 		help    = flags.BoolP("help", "h", false, "Display this help text and exit")
 		headers = flags.StringArrayP("header", "H", nil, "Header. Can be used multiple times")
@@ -29,7 +29,9 @@ func profileCmd(args []string) {
 		verbose = flags.BoolP("verbose", "v", false, "Print the HTTP status and headers hefore the response body")
 	)
 	flags.SortFlags = false
-	flags.Parse(args)
+	if err := flags.Parse(args); err != nil {
+		exitWithError(err)
+	}
 
 	profile := flags.Arg(0)
 	cfg, err := broom.ReadConfig(".broom.yaml")

diff --git a/cmd/broom/rm.go b/cmd/broom/rm.go
@@ -15,10 +15,12 @@ import (
 const rmDescription = `Remove a profile`
 
 func rmCmd(args []string) {
-	flags := flag.NewFlagSet("rm", flag.ExitOnError)
+	flags := flag.NewFlagSet("rm", flag.ContinueOnError)
 	help := flags.BoolP("help", "h", false, "Display this help text and exit")
 	flags.SortFlags = false
-	flags.Parse(args)
+	if err := flags.Parse(args); err != nil {
+		exitWithError(err)
+	}
 	if *help || flags.NArg() < 2 {
 		rmUsage()
 		flagUsage(flags)