9dec64dd17
commands: add shorter helper vars to keep fmt sane
2017-10-18 02:39:10 +02:00
2530b9dd83
commands: simplify import names
2017-10-18 00:08:45 +02:00
2bd8b070fb
commands: move operator subcommands to subdirs
2017-10-18 00:08:45 +02:00
ce1ec000ca
commands: move kv subcommands to subdirs
2017-10-18 00:08:45 +02:00
e16ef316d4
commands: move catalog subcommands to subdirs
2017-10-18 00:08:45 +02:00
51799e5d23
commands: move snapshot subcommands to subdirs
2017-10-18 00:08:45 +02:00
6bc5716336
commands: simplify commands.go
2017-10-18 00:08:45 +02:00
31d5fb7f47
commands: move agent command to separate pkg
2017-10-18 00:08:45 +02:00
10e0be65a9
commands: move watch command to separate pkg
2017-10-18 00:08:45 +02:00
e2b686b982
commands: move snapshot save command to separate pkg
2017-10-18 00:08:45 +02:00
fb1f09d447
commands: move snapshot restore command to separate pkg
2017-10-18 00:08:45 +02:00
3acbc278f0
commands: move version command to separate pkg
2017-10-18 00:08:45 +02:00
3a02ce9ebc
commands: move snapshot inspect command to separate pkg
2017-10-18 00:08:45 +02:00
c8992cbe28
commands: move snapshot command to separate pkg
2017-10-18 00:08:45 +02:00
4d6a0b94dd
commands: move rtt command to separate pkg
2017-10-18 00:08:45 +02:00
566359234a
commands: move reload command to separate pkg
2017-10-18 00:08:45 +02:00
4947ba7f3d
commands: move operator autopilot set command to separate pkg
2017-10-18 00:08:45 +02:00
f719d78441
commands: move operator autopilot get command to separate pkg
2017-10-18 00:08:45 +02:00
bd1b189990
commands: move operator autopilot command to separate pkg
2017-10-18 00:08:45 +02:00
c50e43a4ea
commands: move operator list remove-peer command to separate pkg
2017-10-18 00:08:45 +02:00
2a824f0575
commands: move operator raft list-peers command to separate pkg
2017-10-18 00:08:45 +02:00
f10f07b448
commands: move operator raft command to separate pkg
2017-10-18 00:08:45 +02:00
cc103391b2
commands: move operator command to separate pkg
2017-10-18 00:08:45 +02:00
1eec0e757c
Move monitor command to its own package
2017-10-18 00:08:45 +02:00
5b6f0504ae
Move members command to its own package
2017-10-18 00:08:45 +02:00
ba546b0c1d
Move maint command to its own package
2017-10-18 00:08:45 +02:00
ff4d070bdf
Move lock command to its own package
2017-10-18 00:08:45 +02:00
0ec520582d
commands: move catalog list services to separate pkg
2017-10-18 00:08:45 +02:00
117305eb4f
commands: move catalog list nodes command to separate pkg
2017-10-18 00:08:45 +02:00
bd73c4cecf
commands: move catalog list datacenters command to separate pkg
2017-10-18 00:08:45 +02:00
675e727224
commands: move catalog command to separate pkg
2017-10-18 00:08:45 +02:00
9a9e5ef82d
commands: move leave command to separate pkg
2017-10-18 00:08:45 +02:00
076361a37d
commands: move force-leave command to separate pkg
2017-10-18 00:08:45 +02:00
631502009d
commands: move keyring command to separate pkg
2017-10-18 00:08:45 +02:00
9e19207918
commands: move kv put command to separate pkg
2017-10-18 00:08:45 +02:00
3377f46085
commands: move kv get command to separate pkg
2017-10-18 00:08:45 +02:00
e1785a0e8f
commands: move kv import command to separate pkg
2017-10-18 00:08:45 +02:00
585b5b8d4e
commands: move kv export command to separate pkg
2017-10-18 00:08:45 +02:00
5e3371eee1
commands: move kv delete command to separate pkg
2017-10-18 00:08:45 +02:00
200199a875
commands: move kv command to separate pkg
2017-10-18 00:08:45 +02:00
aca803ca8d
commands: move keygen command to separate pkg
2017-10-18 00:08:45 +02:00
b1c5ee39a5
commands: move info command to separate pkg
2017-10-18 00:08:45 +02:00
0ada23f92f
commands: move exec command to separate pkg
2017-10-18 00:08:45 +02:00
85bfd8f339
commands: move event command to separate pkg
2017-10-18 00:08:45 +02:00
d870c6289b
commands: move join command to separate pkg
2017-10-18 00:08:45 +02:00
e0551b80a6
commands: move validate command to separate pkg
2017-10-18 00:08:45 +02:00
a49711b8bf
config: refactor commands to print help for flags ( #3536 )
...
This patch refactors the commands that use the mitchellh/cli library to
populate the command line flag set in both the Run() and the Help()
method. Earlier versions of the mitchellh/cli library relied on the
Run() method to populuate the flagset for generating the usage screen.
This has changed in later versions and was previously solved with a
small monkey patch to the library to restore the old behavior.
However, this makes upgrading the library difficult since the patch has
to be restored every time.
This patch addresses this by moving the command line flags into an
initFlags() method where appropriate and also moving all variables for
the flags from the Run() method into the command itself.
Fixes #3536
2017-10-18 00:08:45 +02:00
ce0d03c46a
command: drop deprecated 'configtest' command
...
'configtest' has been replaced with 'validate'
2017-10-05 17:22:34 +02:00
afd83a9705
Add catalog CLI functions ( #3204 )
2017-07-14 12:45:08 -07:00
1c75cf1af5
pkg refactor
...
command/agent/* -> agent/*
command/consul/* -> agent/consul/*
command/agent/command{,_test}.go -> command/agent{,_test}.go
command/base/command.go -> command/base.go
command/base/* -> command/*
commands.go -> command/commands.go
The script which did the refactor is:
(
cd $GOPATH/src/github.com/hashicorp/consul
git mv command/agent/command.go command/agent.go
git mv command/agent/command_test.go command/agent_test.go
git mv command/agent/flag_slice_value{,_test}.go command/
git mv command/agent .
git mv command/base/command.go command/base.go
git mv command/base/config_util{,_test}.go command/
git mv commands.go command/
git mv consul agent
rmdir command/base/
gsed -i -e 's|package agent|package command|' command/agent{,_test}.go
gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go
gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go
gsed -i -e 's|package main|package command|' command/commands.go
gsed -i -e 's|base.Command|BaseCommand|' command/commands.go
gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go
gsed -i -e 's|base\.||' command/commands.go
gsed -i -e 's|command\.||' command/commands.go
gsed -i -e 's|command|c|' main.go
gsed -i -e 's|range Commands|range command.Commands|' main.go
gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go
gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go
gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go
gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go
gsed -i -e 's|base.Command|BaseCommand|' command/*.go
gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go
gsed -i -e 's|base\.||' command/*_test.go
gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go
gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go
gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go
gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go
gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go
gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go
gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go
gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go
gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go
gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go
gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go
gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go
gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go
gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go
gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go
gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go
gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile
gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go
# fix imports
f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f
goimports -w $f
f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f
goimports -w $f
goimports -w command/*.go main.go
)
2017-06-10 18:52:45 +02:00
Frank Schroeder
Preetha Appan
Seth Vargo