commands: move operator subcommands to subdirs

command/commands.go

@@ -28,13 +28,13 @@ import (
 	"github.com/hashicorp/consul/command/maint"
 	"github.com/hashicorp/consul/command/members"
 	"github.com/hashicorp/consul/command/monitor"
-	"github.com/hashicorp/consul/command/oper"
-	"github.com/hashicorp/consul/command/operauto"
-	"github.com/hashicorp/consul/command/operautoget"
-	"github.com/hashicorp/consul/command/operautoset"
-	"github.com/hashicorp/consul/command/operraft"
-	"github.com/hashicorp/consul/command/operraftlist"
-	"github.com/hashicorp/consul/command/operraftremove"
+	"github.com/hashicorp/consul/command/operator"
+	operauto "github.com/hashicorp/consul/command/operator/autopilot"
+	operautoget "github.com/hashicorp/consul/command/operator/autopilot/get"
+	operautoset "github.com/hashicorp/consul/command/operator/autopilot/set"
+	operraft "github.com/hashicorp/consul/command/operator/raft"
+	operraftlist "github.com/hashicorp/consul/command/operator/raft/listpeers"
+	operraftremove "github.com/hashicorp/consul/command/operator/raft/removepeer"
 	"github.com/hashicorp/consul/command/reload"
 	"github.com/hashicorp/consul/command/rtt"
 	"github.com/hashicorp/consul/command/snapshot"
@@ -88,7 +88,7 @@ func init() {
 		"maint":                         func() (cli.Command, error) { return maint.New(ui), nil },
 		"members":                       func() (cli.Command, error) { return members.New(ui), nil },
 		"monitor":                       func() (cli.Command, error) { return monitor.New(ui, makeShutdownCh()), nil },
-		"operator":                      func() (cli.Command, error) { return oper.New(), nil },
+		"operator":                      func() (cli.Command, error) { return operator.New(), nil },
 		"operator autopilot":            func() (cli.Command, error) { return operauto.New(), nil },
 		"operator autopilot get-config": func() (cli.Command, error) { return operautoget.New(ui), nil },
 		"operator autopilot set-config": func() (cli.Command, error) { return operautoset.New(ui), nil },

command/operator/autopilot/get/operator_autopilot_get.go

@@ -1,4 +1,4 @@
-package operautoget
+package get
 
 import (
 	"flag"

command/operator/autopilot/get/operator_autopilot_get_test.go

@@ -1,4 +1,4 @@
-package operautoget
+package get
 
 import (
 	"strings"

command/operator/autopilot/operator_autopilot.go

@@ -1,4 +1,4 @@
-package operauto
+package autopilot
 
 import (
 	"github.com/mitchellh/cli"

command/operator/autopilot/operator_autopilot_test.go

@@ -1,4 +1,4 @@
-package operauto
+package autopilot
 
 import (
 	"strings"

command/operator/autopilot/set/operator_autopilot_set.go

@@ -1,4 +1,4 @@
-package operautoset
+package set
 
 import (
 	"flag"

command/operator/autopilot/set/operator_autopilot_set_test.go

@@ -1,4 +1,4 @@
-package operautoset
+package set
 
 import (
 	"strings"

command/operator/operator.go

@@ -1,4 +1,4 @@
-package oper
+package operator
 
 import (
 	"github.com/mitchellh/cli"

command/operator/operator_test.go

@@ -1,4 +1,4 @@
-package oper
+package operator
 
 import (
 	"strings"

command/operator/raft/listpeers/operator_raft_list.go

@@ -1,4 +1,4 @@
-package operraftlist
+package listpeers
 
 import (
 	"flag"

command/operator/raft/listpeers/operator_raft_list_test.go

@@ -1,4 +1,4 @@
-package operraftlist
+package listpeers
 
 import (
 	"fmt"

command/operator/raft/operator_raft.go

@@ -1,4 +1,4 @@
-package operraft
+package raft
 
 import (
 	"github.com/mitchellh/cli"

command/operator/raft/operator_raft_test.go

@@ -1,4 +1,4 @@
-package operraft
+package raft
 
 import (
 	"strings"

command/operator/raft/removepeer/operator_raft_remove.go

@@ -1,4 +1,4 @@
-package operraftremove
+package removepeer
 
 import (
 	"flag"

command/operator/raft/removepeer/operator_raft_remove_test.go

@@ -1,4 +1,4 @@
-package operraftremove
+package removepeer
 
 import (
 	"strings"