commands: move snapshot subcommands to subdirs

command/commands.go

@@ -38,9 +38,9 @@ import (
 	"github.com/hashicorp/consul/command/reload"
 	"github.com/hashicorp/consul/command/rtt"
 	"github.com/hashicorp/consul/command/snapshot"
-	"github.com/hashicorp/consul/command/snapshotinspect"
+	snapinspectcmd "github.com/hashicorp/consul/command/snapshot/inspect"
-	"github.com/hashicorp/consul/command/snapshotrestore"
+	snaprestorecmd "github.com/hashicorp/consul/command/snapshot/restore"
-	"github.com/hashicorp/consul/command/snapshotsave"
+	snapsavecmd "github.com/hashicorp/consul/command/snapshot/save"
 	"github.com/hashicorp/consul/command/validate"
 	versioncmd "github.com/hashicorp/consul/command/version"
 	watchcmd "github.com/hashicorp/consul/command/watch"
@@ -98,9 +98,9 @@ func init() {
 		"reload":                        func() (cli.Command, error) { return reload.New(ui), nil },
 		"rtt":                           func() (cli.Command, error) { return rtt.New(ui), nil },
 		"snapshot":                      func() (cli.Command, error) { return snapshot.New(), nil },
-		"snapshot inspect":              func() (cli.Command, error) { return snapshotinspect.New(ui), nil },
+		"snapshot inspect":              func() (cli.Command, error) { return snapinspectcmd.New(ui), nil },
-		"snapshot restore":              func() (cli.Command, error) { return snapshotrestore.New(ui), nil },
+		"snapshot restore":              func() (cli.Command, error) { return snaprestorecmd.New(ui), nil },
-		"snapshot save":                 func() (cli.Command, error) { return snapshotsave.New(ui), nil },
+		"snapshot save":                 func() (cli.Command, error) { return snapsavecmd.New(ui), nil },
 		"validate":                      func() (cli.Command, error) { return validate.New(ui), nil },
 		"version":                       func() (cli.Command, error) { return versioncmd.New(ui, version.GetHumanVersion()), nil },
 		"watch":                         func() (cli.Command, error) { return watchcmd.New(ui, makeShutdownCh()), nil },

command/snapshot/inspect/snapshot_inspect.go

@@ -1,4 +1,4 @@
-package snapshotinspect
+package inspect
 
 import (
 	"bytes"

command/snapshot/inspect/snapshot_inspect_test.go

@@ -1,4 +1,4 @@
-package snapshotinspect
+package inspect
 
 import (
 	"io"

command/snapshot/restore/snapshot_restore.go

@@ -1,4 +1,4 @@
-package snapshotrestore
+package restore
 
 import (
 	"flag"

command/snapshot/restore/snapshot_restore_test.go

@@ -1,4 +1,4 @@
-package snapshotrestore
+package restore
 
 import (
 	"io"

command/snapshot/save/snapshot_save.go

@@ -1,4 +1,4 @@
-package snapshotsave
+package save
 
 import (
 	"flag"

command/snapshot/save/snapshot_save_test.go

@@ -1,4 +1,4 @@
-package snapshotsave
+package save
 
 import (
 	"os"