3a5ac6f7cc
commands: add shorter helper vars to keep fmt sane
2017-10-18 02:39:10 +02:00
7d7281ab54
commands: simplify import names
2017-10-18 00:08:45 +02:00
5a34eb1e52
commands: move operator subcommands to subdirs
2017-10-18 00:08:45 +02:00
f09f6f2ec2
commands: move kv subcommands to subdirs
2017-10-18 00:08:45 +02:00
0a9478b1f1
commands: move catalog subcommands to subdirs
2017-10-18 00:08:45 +02:00
abd7c73627
commands: move snapshot subcommands to subdirs
2017-10-18 00:08:45 +02:00
0fb4ea3a30
commands: simplify commands.go
2017-10-18 00:08:45 +02:00
a0b017d976
commands: move agent command to separate pkg
2017-10-18 00:08:45 +02:00
127bd3d295
commands: move watch command to separate pkg
2017-10-18 00:08:45 +02:00
6998d82be5
commands: move snapshot save command to separate pkg
2017-10-18 00:08:45 +02:00
3a16c93eab
commands: move snapshot restore command to separate pkg
2017-10-18 00:08:45 +02:00
758199813b
commands: move version command to separate pkg
2017-10-18 00:08:45 +02:00
776cffa33d
commands: move snapshot inspect command to separate pkg
2017-10-18 00:08:45 +02:00
8724aece07
commands: move snapshot command to separate pkg
2017-10-18 00:08:45 +02:00
602e896fb9
commands: move rtt command to separate pkg
2017-10-18 00:08:45 +02:00
1ba816b0ae
commands: move reload command to separate pkg
2017-10-18 00:08:45 +02:00
eb0640efd0
commands: move operator autopilot set command to separate pkg
2017-10-18 00:08:45 +02:00
3dd4841b36
commands: move operator autopilot get command to separate pkg
2017-10-18 00:08:45 +02:00
393bf50e71
commands: move operator autopilot command to separate pkg
2017-10-18 00:08:45 +02:00
c024fcaaa5
commands: move operator list remove-peer command to separate pkg
2017-10-18 00:08:45 +02:00
6850c8723f
commands: move operator raft list-peers command to separate pkg
2017-10-18 00:08:45 +02:00
78aa062990
commands: move operator raft command to separate pkg
2017-10-18 00:08:45 +02:00
fe84af448b
commands: move operator command to separate pkg
2017-10-18 00:08:45 +02:00
684362b1d0
Move monitor command to its own package
2017-10-18 00:08:45 +02:00
4fa3987bdc
Move members command to its own package
2017-10-18 00:08:45 +02:00
8d2e6f10c7
Move maint command to its own package
2017-10-18 00:08:45 +02:00
4b06c971d2
Move lock command to its own package
2017-10-18 00:08:45 +02:00
9825b6709a
commands: move catalog list services to separate pkg
2017-10-18 00:08:45 +02:00
33a4e997b4
commands: move catalog list nodes command to separate pkg
2017-10-18 00:08:45 +02:00
cfd110395b
commands: move catalog list datacenters command to separate pkg
2017-10-18 00:08:45 +02:00
bcf53b98d1
commands: move catalog command to separate pkg
2017-10-18 00:08:45 +02:00
5d75449419
commands: move leave command to separate pkg
2017-10-18 00:08:45 +02:00
ffb747a744
commands: move force-leave command to separate pkg
2017-10-18 00:08:45 +02:00
41f13de7f5
commands: move keyring command to separate pkg
2017-10-18 00:08:45 +02:00
b1dac89b95
commands: move kv put command to separate pkg
2017-10-18 00:08:45 +02:00
e50c8d8f73
commands: move kv get command to separate pkg
2017-10-18 00:08:45 +02:00
19f2dab416
commands: move kv import command to separate pkg
2017-10-18 00:08:45 +02:00
215cda4775
commands: move kv export command to separate pkg
2017-10-18 00:08:45 +02:00
926aa72246
commands: move kv delete command to separate pkg
2017-10-18 00:08:45 +02:00
50f039191d
commands: move kv command to separate pkg
2017-10-18 00:08:45 +02:00
bd825687dd
commands: move keygen command to separate pkg
2017-10-18 00:08:45 +02:00
74cf5c1c2c
commands: move info command to separate pkg
2017-10-18 00:08:45 +02:00
8c7f013ae1
commands: move exec command to separate pkg
2017-10-18 00:08:45 +02:00
ad50e2a410
commands: move event command to separate pkg
2017-10-18 00:08:45 +02:00
dc3c722b2c
commands: move join command to separate pkg
2017-10-18 00:08:45 +02:00
8880ae714b
commands: move validate command to separate pkg
2017-10-18 00:08:45 +02:00
7568a19433
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
7bab8d3eb7
command: drop deprecated 'configtest' command
...
'configtest' has been replaced with 'validate'
2017-10-05 17:22:34 +02:00
a2ba7071e9
Add catalog CLI functions ( #3204 )
2017-07-14 12:45:08 -07:00
cd837b0b18
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