commands: get HTTP API flags for usage automatically

command/agent/agent.go

@@ -70,7 +70,7 @@ type cmd struct {
 func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	config.AddFlags(c.flags, &c.flagArgs)
-	c.help = flags.Usage(help, c.flags, nil, nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/catalog/catalog.go

@@ -20,7 +20,7 @@ func (c *cmd) Synopsis() string {
 }
 
 func (c *cmd) Help() string {
-	return flags.Usage(help, nil, nil, nil)
+	return flags.Usage(help, nil)
 }
 
 const synopsis = "Interact with the catalog"

command/catalog/list/dc/catalog_list_datacenters.go

@@ -26,7 +26,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/catalog/list/nodes/catalog_list_nodes.go

@@ -48,7 +48,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/catalog/list/services/catalog_list_services.go

@@ -46,7 +46,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/event/event.go

@@ -40,7 +40,7 @@ func (c *cmd) init() {
 
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/exec/exec.go

@@ -60,7 +60,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/flags/merge.go

@@ -10,6 +10,6 @@ func Merge(dst, src *flag.FlagSet) {
 		return
 	}
 	src.VisitAll(func(f *flag.Flag) {
-		dst.Var(f.Value, f.Name, f.DefValue)
+		dst.Var(f.Value, f.Name, f.Usage)
 	})
 }

command/flags/usage.go

@@ -10,21 +10,17 @@ import (
 	text "github.com/tonnerre/golang-text"
 )
 
-func Usage(txt string, cmdFlags, clientFlags, serverFlags *flag.FlagSet) string {
+func Usage(txt string, flags *flag.FlagSet) string {
 	u := &Usager{
-		Usage:           txt,
-		CmdFlags:        cmdFlags,
-		HTTPClientFlags: clientFlags,
-		HTTPServerFlags: serverFlags,
+		Usage: txt,
+		Flags: flags,
 	}
 	return u.String()
 }
 
 type Usager struct {
-	Usage           string
-	CmdFlags        *flag.FlagSet
-	HTTPClientFlags *flag.FlagSet
-	HTTPServerFlags *flag.FlagSet
+	Usage string
+	Flags *flag.FlagSet
 }
 
 func (u *Usager) String() string {
@@ -33,28 +29,39 @@ func (u *Usager) String() string {
 	out.WriteString("\n")
 	out.WriteString("\n")
 
-	httpFlags := u.HTTPClientFlags
-	if httpFlags == nil {
-		httpFlags = u.HTTPServerFlags
-	} else {
-		Merge(httpFlags, u.HTTPServerFlags)
-	}
+	if u.Flags != nil {
+		f := &HTTPFlags{}
+		clientFlags := f.ClientFlags()
+		serverFlags := f.ServerFlags()
 
-	if httpFlags != nil {
-		printTitle(out, "HTTP API Options")
-		httpFlags.VisitAll(func(f *flag.Flag) {
-			printFlag(out, f)
-		})
-	}
-
-	if u.CmdFlags != nil {
-		printTitle(out, "Command Options")
-		u.CmdFlags.VisitAll(func(f *flag.Flag) {
-			if flagContains(httpFlags, f) {
-				return
+		var httpFlags, cmdFlags *flag.FlagSet
+		u.Flags.VisitAll(func(f *flag.Flag) {
+			if contains(clientFlags, f) || contains(serverFlags, f) {
+				if httpFlags == nil {
+					httpFlags = flag.NewFlagSet("", flag.ContinueOnError)
+				}
+				httpFlags.Var(f.Value, f.Name, f.Usage)
+			} else {
+				if cmdFlags == nil {
+					cmdFlags = flag.NewFlagSet("", flag.ContinueOnError)
+				}
+				cmdFlags.Var(f.Value, f.Name, f.Usage)
 			}
-			printFlag(out, f)
 		})
+
+		if httpFlags != nil {
+			printTitle(out, "HTTP API Options")
+			httpFlags.VisitAll(func(f *flag.Flag) {
+				printFlag(out, f)
+			})
+		}
+
+		if cmdFlags != nil {
+			printTitle(out, "Command Options")
+			cmdFlags.VisitAll(func(f *flag.Flag) {
+				printFlag(out, f)
+			})
+		}
 	}
 
 	return strings.TrimRight(out.String(), "\n")
@@ -78,26 +85,18 @@ func printFlag(w io.Writer, f *flag.Flag) {
 	fmt.Fprintf(w, "%s\n\n", indented)
 }
 
-// flagContains returns true if the given flag is contained in the given flag
+// contains returns true if the given flag is contained in the given flag
 // set or false otherwise.
-func flagContains(fs *flag.FlagSet, f *flag.Flag) bool {
+func contains(fs *flag.FlagSet, f *flag.Flag) bool {
 	if fs == nil {
 		return false
 	}
 
-	var skip bool
+	var in bool
 	fs.VisitAll(func(hf *flag.Flag) {
-		if skip {
-			return
-		}
-
-		if f.Name == hf.Name {
-			skip = true
-			return
-		}
+		in = in || f.Name == hf.Name
 	})
-
-	return skip
+	return in
 }
 
 // maxLineLength is the maximum width of any line.

command/forceleave/forceleave.go

@@ -25,7 +25,7 @@ func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/info/info.go

@@ -26,7 +26,7 @@ func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/join/join.go

@@ -29,7 +29,7 @@ func (c *cmd) init() {
 
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/keygen/keygen.go

@@ -24,7 +24,7 @@ type cmd struct {
 
 func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.help = flags.Usage(help, c.flags, nil, nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/keyring/keyring.go

@@ -51,7 +51,7 @@ func (c *cmd) init() {
 
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/kv/del/kv_delete.go

@@ -39,7 +39,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/kv/exp/kv_export.go

@@ -29,7 +29,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/kv/get/kv_get.go

@@ -54,7 +54,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/kv/imp/kv_import.go

@@ -38,7 +38,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/kv/kv.go

@@ -20,7 +20,7 @@ func (c *cmd) Synopsis() string {
 }
 
 func (c *cmd) Help() string {
-	return flags.Usage(help, nil, nil, nil)
+	return flags.Usage(help, nil)
 }
 
 const synopsis = "Interact with the key-value store"

command/kv/put/kv_put.go

@@ -70,7 +70,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/leave/leave.go

@@ -25,7 +25,7 @@ func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/lock/lock.go

@@ -103,7 +103,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/maint/maint.go

@@ -44,7 +44,7 @@ func (c *cmd) init() {
 	c.flags.StringVar(&c.serviceID, "service", "",
 		"Control maintenance mode for a specific service ID.")
 
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/members/members.go

@@ -51,7 +51,7 @@ func (c *cmd) init() {
 	c.flags.StringVar(&c.segment, "segment", consulapi.AllSegments,
 		"(Enterprise-only) If provided, output is filtered to only nodes in"+
 			"the given segment.")
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/monitor/monitor.go

@@ -40,7 +40,7 @@ func (c *cmd) init() {
 	c.flags.StringVar(&c.logLevel, "log-level", "INFO",
 		"Log level of the agent.")
 
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/operator/autopilot/get/operator_autopilot_get.go

@@ -27,7 +27,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/operator/autopilot/operator_autopilot.go

@@ -20,7 +20,7 @@ func (c *cmd) Synopsis() string {
 }
 
 func (c *cmd) Help() string {
-	return flags.Usage(help, nil, nil, nil)
+	return flags.Usage(help, nil)
 }
 
 const synopsis = "Provides tools for modifying Autopilot configuration"

command/operator/autopilot/set/operator_autopilot_set.go

@@ -62,7 +62,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/operator/operator.go

@@ -20,7 +20,7 @@ func (c *cmd) Synopsis() string {
 }
 
 func (c *cmd) Help() string {
-	return flags.Usage(help, nil, nil, nil)
+	return flags.Usage(help, nil)
 }
 
 const synopsis = "Provides cluster-level tools for Consul operators"

command/operator/raft/listpeers/operator_raft_list.go

@@ -28,7 +28,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/operator/raft/operator_raft.go

@@ -20,7 +20,7 @@ func (c *cmd) Synopsis() string {
 }
 
 func (c *cmd) Help() string {
-	return flags.Usage(help, nil, nil, nil)
+	return flags.Usage(help, nil)
 }
 
 const synopsis = "Provides cluster-level tools for Consul operators"

command/operator/raft/removepeer/operator_raft_remove.go

@@ -36,7 +36,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/reload/reload.go

@@ -25,7 +25,7 @@ func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/rtt/rtt.go

@@ -34,7 +34,7 @@ func (c *cmd) init() {
 
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/snapshot/inspect/snapshot_inspect.go

@@ -26,7 +26,7 @@ type cmd struct {
 
 func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.help = flags.Usage(help, c.flags, nil, nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/snapshot/restore/snapshot_restore.go

@@ -27,7 +27,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/snapshot/save/snapshot_save.go

@@ -30,7 +30,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/snapshot/snapshot_command.go

@@ -20,7 +20,7 @@ func (c *cmd) Synopsis() string {
 }
 
 func (c *cmd) Help() string {
-	return flags.Usage(help, nil, nil, nil)
+	return flags.Usage(help, nil)
 }
 
 const synopsis = "Saves, restores and inspects snapshots of Consul server state"

command/validate/validate.go

@@ -26,7 +26,7 @@ func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	c.flags.BoolVar(&c.quiet, "quiet", false,
 		"When given, a successful run will produce no output.")
-	c.help = flags.Usage(help, c.flags, nil, nil)
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {

command/watch/watch.go

@@ -70,7 +70,7 @@ func (c *cmd) init() {
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
-	c.help = flags.Usage(help, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+	c.help = flags.Usage(help, c.flags)
 }
 
 func (c *cmd) Run(args []string) int {