status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

commands: simplify import names

This commit is contained in:
Frank Schroeder 2017-10-17 13:36:34 +02:00 committed by Frank Schröder
parent 2bd8b070fb
commit 2530b9dd83
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
command/commands.go
View File

@ -5,13 +5,13 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
agentcmd "github.com/hashicorp/consul/command/agent" "github.com/hashicorp/consul/command/agent"
"github.com/hashicorp/consul/command/catalog" "github.com/hashicorp/consul/command/catalog"
catlistdccmd "github.com/hashicorp/consul/command/catalog/list/dc" catlistdc "github.com/hashicorp/consul/command/catalog/list/dc"
catlistnodescmd "github.com/hashicorp/consul/command/catalog/list/nodes" catlistnodes "github.com/hashicorp/consul/command/catalog/list/nodes"
catlistsvccmd "github.com/hashicorp/consul/command/catalog/list/services" catlistsvc "github.com/hashicorp/consul/command/catalog/list/services"
"github.com/hashicorp/consul/command/event" "github.com/hashicorp/consul/command/event"
execmd "github.com/hashicorp/consul/command/exec" "github.com/hashicorp/consul/command/exec"
"github.com/hashicorp/consul/command/forceleave" "github.com/hashicorp/consul/command/forceleave"
"github.com/hashicorp/consul/command/info" "github.com/hashicorp/consul/command/info"
"github.com/hashicorp/consul/command/join" "github.com/hashicorp/consul/command/join"
@ -38,13 +38,14 @@ import (
"github.com/hashicorp/consul/command/reload" "github.com/hashicorp/consul/command/reload"
"github.com/hashicorp/consul/command/rtt" "github.com/hashicorp/consul/command/rtt"
"github.com/hashicorp/consul/command/snapshot" "github.com/hashicorp/consul/command/snapshot"
snapinspectcmd "github.com/hashicorp/consul/command/snapshot/inspect" snapinspect "github.com/hashicorp/consul/command/snapshot/inspect"
snaprestorecmd "github.com/hashicorp/consul/command/snapshot/restore" snaprestore "github.com/hashicorp/consul/command/snapshot/restore"
snapsavecmd "github.com/hashicorp/consul/command/snapshot/save" snapsave "github.com/hashicorp/consul/command/snapshot/save"
"github.com/hashicorp/consul/command/validate" "github.com/hashicorp/consul/command/validate"
versioncmd "github.com/hashicorp/consul/command/version" "github.com/hashicorp/consul/command/version"
watchcmd "github.com/hashicorp/consul/command/watch" "github.com/hashicorp/consul/command/watch"
"github.com/hashicorp/consul/version" consulversion "github.com/hashicorp/consul/version"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
) )
@ -56,33 +57,33 @@ func init() {
Commands = map[string]cli.CommandFactory{ Commands = map[string]cli.CommandFactory{
"agent": func() (cli.Command, error) { "agent": func() (cli.Command, error) {
return agentcmd.New( return agent.New(
ui, ui,
version.GitCommit, consulversion.GitCommit,
version.Version, consulversion.Version,
version.VersionPrerelease, consulversion.VersionPrerelease,
version.GetHumanVersion(), consulversion.GetHumanVersion(),
make(chan struct{}), make(chan struct{}),
), nil ), nil
}, },
"catalog": func() (cli.Command, error) { return catalog.New(), nil }, "catalog": func() (cli.Command, error) { return catalog.New(), nil },
"catalog datacenters": func() (cli.Command, error) { return catlistdccmd.New(ui), nil }, "catalog datacenters": func() (cli.Command, error) { return catlistdc.New(ui), nil },
"catalog nodes": func() (cli.Command, error) { return catlistnodescmd.New(ui), nil }, "catalog nodes": func() (cli.Command, error) { return catlistnodes.New(ui), nil },
"catalog services": func() (cli.Command, error) { return catlistsvccmd.New(ui), nil }, "catalog services": func() (cli.Command, error) { return catlistsvc.New(ui), nil },
"event": func() (cli.Command, error) { return event.New(ui), nil }, "event": func() (cli.Command, error) { return event.New(ui), nil },
"exec": func() (cli.Command, error) { return execmd.New(ui, makeShutdownCh()), nil }, "exec": func() (cli.Command, error) { return exec.New(ui, makeShutdownCh()), nil },
"force-leave": func() (cli.Command, error) { return forceleave.New(ui), nil }, "force-leave": func() (cli.Command, error) { return forceleave.New(ui), nil },
"info": func() (cli.Command, error) { return info.New(ui), nil }, "info": func() (cli.Command, error) { return info.New(ui), nil },
"join": func() (cli.Command, error) { return join.New(ui), nil }, "join": func() (cli.Command, error) { return join.New(ui), nil },
"keygen": func() (cli.Command, error) { return keygen.New(ui), nil }, "keygen": func() (cli.Command, error) { return keygen.New(ui), nil },
"keyring": func() (cli.Command, error) { return keyring.New(ui), nil }, "keyring": func() (cli.Command, error) { return keyring.New(ui), nil },
"kv": func() (cli.Command, error) { return kv.New(), nil },
"kv delete": func() (cli.Command, error) { return kvdel.New(ui), nil }, "kv delete": func() (cli.Command, error) { return kvdel.New(ui), nil },
"kv export": func() (cli.Command, error) { return kvexp.New(ui), nil }, "kv export": func() (cli.Command, error) { return kvexp.New(ui), nil },
"kv get": func() (cli.Command, error) { return kvget.New(ui), nil }, "kv get": func() (cli.Command, error) { return kvget.New(ui), nil },
"kv import": func() (cli.Command, error) { return kvimp.New(ui), nil }, "kv import": func() (cli.Command, error) { return kvimp.New(ui), nil },
"kv put": func() (cli.Command, error) { return kvput.New(ui), nil }, "kv put": func() (cli.Command, error) { return kvput.New(ui), nil },
"kv": func() (cli.Command, error) { return kv.New(), nil },
"leave": func() (cli.Command, error) { return leave.New(ui), nil }, "leave": func() (cli.Command, error) { return leave.New(ui), nil },
"lock": func() (cli.Command, error) { return lock.New(ui), nil }, "lock": func() (cli.Command, error) { return lock.New(ui), nil },
"maint": func() (cli.Command, error) { return maint.New(ui), nil }, "maint": func() (cli.Command, error) { return maint.New(ui), nil },
@ -98,12 +99,12 @@ func init() {
"reload": func() (cli.Command, error) { return reload.New(ui), nil }, "reload": func() (cli.Command, error) { return reload.New(ui), nil },
"rtt": func() (cli.Command, error) { return rtt.New(ui), nil }, "rtt": func() (cli.Command, error) { return rtt.New(ui), nil },
"snapshot": func() (cli.Command, error) { return snapshot.New(), nil }, "snapshot": func() (cli.Command, error) { return snapshot.New(), nil },
"snapshot inspect": func() (cli.Command, error) { return snapinspectcmd.New(ui), nil }, "snapshot inspect": func() (cli.Command, error) { return snapinspect.New(ui), nil },
"snapshot restore": func() (cli.Command, error) { return snaprestorecmd.New(ui), nil }, "snapshot restore": func() (cli.Command, error) { return snaprestore.New(ui), nil },
"snapshot save": func() (cli.Command, error) { return snapsavecmd.New(ui), nil }, "snapshot save": func() (cli.Command, error) { return snapsave.New(ui), nil },
"validate": func() (cli.Command, error) { return validate.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 }, "version": func() (cli.Command, error) { return version.New(ui, consulversion.GetHumanVersion()), nil },
"watch": func() (cli.Command, error) { return watchcmd.New(ui, makeShutdownCh()), nil }, "watch": func() (cli.Command, error) { return watch.New(ui, makeShutdownCh()), nil },
} }
} }