commands: move reload command to separate pkg

command/commands.go

@@ -34,6 +34,7 @@ import (
 	"github.com/hashicorp/consul/command/operraft"
 	"github.com/hashicorp/consul/command/operraftlist"
 	"github.com/hashicorp/consul/command/operraftremove"
+	"github.com/hashicorp/consul/command/reload"
 	"github.com/hashicorp/consul/command/validate"
 	"github.com/hashicorp/consul/version"
 	"github.com/mitchellh/cli"
@@ -177,12 +178,7 @@ func init() {
 		},
 
 		"reload": func() (cli.Command, error) {
-			return &ReloadCommand{
+			return reload.New(ui), nil
-				BaseCommand: BaseCommand{
-					Flags: FlagSetClientHTTP,
-					UI:    ui,
-				},
-			}, nil
 		},
 
 		"rtt": func() (cli.Command, error) {

command/reload.go

@@ -1,47 +0,0 @@
-package command
-
-import (
-	"fmt"
-)
-
-// ReloadCommand is a Command implementation that instructs
-// the Consul agent to reload configurations
-type ReloadCommand struct {
-	BaseCommand
-}
-
-func (c *ReloadCommand) Help() string {
-	c.InitFlagSet()
-	return c.HelpCommand(`
-Usage: consul reload
-
-  Causes the agent to reload configurations. This can be used instead
-  of sending the SIGHUP signal to the agent.
-
-`)
-}
-
-func (c *ReloadCommand) Run(args []string) int {
-	c.InitFlagSet()
-	if err := c.FlagSet.Parse(args); err != nil {
-		return 1
-	}
-
-	client, err := c.HTTPClient()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
-		return 1
-	}
-
-	if err := client.Agent().Reload(); err != nil {
-		c.UI.Error(fmt.Sprintf("Error reloading: %s", err))
-		return 1
-	}
-
-	c.UI.Output("Configuration reload triggered")
-	return 0
-}
-
-func (c *ReloadCommand) Synopsis() string {
-	return "Triggers the agent to reload configuration files"
-}

command/reload/reload.go

@@ -0,0 +1,63 @@
+package reload
+
+import (
+	"flag"
+	"fmt"
+
+	"github.com/hashicorp/consul/command/flags"
+	"github.com/mitchellh/cli"
+)
+
+func New(ui cli.Ui) *cmd {
+	c := &cmd{UI: ui}
+	c.init()
+	return c
+}
+
+type cmd struct {
+	UI    cli.Ui
+	flags *flag.FlagSet
+	http  *flags.HTTPFlags
+	usage string
+}
+
+func (c *cmd) init() {
+	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
+	c.http = &flags.HTTPFlags{}
+	flags.Merge(c.flags, c.http.ClientFlags())
+	flags.Merge(c.flags, c.http.ServerFlags())
+	c.usage = flags.Usage(usage, c.flags, c.http.ClientFlags(), c.http.ServerFlags())
+}
+
+func (c *cmd) Synopsis() string {
+	return "Triggers the agent to reload configuration files"
+}
+
+func (c *cmd) Help() string {
+	return c.usage
+}
+
+func (c *cmd) Run(args []string) int {
+	if err := c.flags.Parse(args); err != nil {
+		return 1
+	}
+
+	client, err := c.http.APIClient()
+	if err != nil {
+		c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
+		return 1
+	}
+
+	if err := client.Agent().Reload(); err != nil {
+		c.UI.Error(fmt.Sprintf("Error reloading: %s", err))
+		return 1
+	}
+
+	c.UI.Output("Configuration reload triggered")
+	return 0
+}
+
+const usage = `Usage: consul reload
+
+  Causes the agent to reload configurations. This can be used instead
+  of sending the SIGHUP signal to the agent.`

command/reload/reload_test.go

@@ -1,4 +1,4 @@
-package command
+package reload
 
 import (
 	"strings"
@@ -8,9 +8,11 @@ import (
 	"github.com/mitchellh/cli"
 )
 
-func TestReloadCommand_implements(t *testing.T) {
+func TestReloadCommand_noTabs(t *testing.T) {
 	t.Parallel()
-	var _ cli.Command = &ReloadCommand{}
+	if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
+		t.Fatal("usage has tabs")
+	}
 }
 
 func TestReloadCommandRun(t *testing.T) {
@@ -25,12 +27,7 @@ func TestReloadCommandRun(t *testing.T) {
 	}()
 
 	ui := cli.NewMockUi()
-	c := &ReloadCommand{
+	c := New(ui)
-		BaseCommand: BaseCommand{
-			UI:    ui,
-			Flags: FlagSetClientHTTP,
-		},
-	}
 	args := []string{"-http-addr=" + a.HTTPAddr()}
 
 	code := c.Run(args)