2013-12-19 19:22:08 +00:00
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"log"
|
|
|
|
"os"
|
2016-01-30 01:00:08 +00:00
|
|
|
|
2021-06-03 16:16:45 +00:00
|
|
|
mcli "github.com/mitchellh/cli"
|
|
|
|
|
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-09 22:28:28 +00:00
|
|
|
"github.com/hashicorp/consul/command"
|
2021-06-03 16:16:45 +00:00
|
|
|
"github.com/hashicorp/consul/command/cli"
|
2020-03-26 19:35:34 +00:00
|
|
|
"github.com/hashicorp/consul/command/version"
|
2016-01-30 01:00:08 +00:00
|
|
|
"github.com/hashicorp/consul/lib"
|
2018-06-18 18:55:11 +00:00
|
|
|
_ "github.com/hashicorp/consul/service_os"
|
2013-12-19 19:22:08 +00:00
|
|
|
)
|
|
|
|
|
2016-01-30 01:00:08 +00:00
|
|
|
func init() {
|
|
|
|
lib.SeedMathRand()
|
|
|
|
}
|
|
|
|
|
2013-12-19 19:22:08 +00:00
|
|
|
func main() {
|
|
|
|
os.Exit(realMain())
|
|
|
|
}
|
|
|
|
|
|
|
|
func realMain() int {
|
|
|
|
log.SetOutput(ioutil.Discard)
|
|
|
|
|
2021-06-03 16:16:45 +00:00
|
|
|
ui := &cli.BasicUI{
|
|
|
|
BasicUi: mcli.BasicUi{Writer: os.Stdout, ErrorWriter: os.Stderr},
|
|
|
|
}
|
|
|
|
cmds := command.CommandsFromRegistry(ui)
|
2017-11-28 20:44:01 +00:00
|
|
|
var names []string
|
|
|
|
for c := range cmds {
|
|
|
|
names = append(names, c)
|
2017-02-11 00:29:00 +00:00
|
|
|
}
|
|
|
|
|
2021-06-03 16:16:45 +00:00
|
|
|
cli := &mcli.CLI{
|
2020-03-26 19:35:34 +00:00
|
|
|
Args: os.Args[1:],
|
2017-11-28 20:44:01 +00:00
|
|
|
Commands: cmds,
|
2017-10-06 20:05:45 +00:00
|
|
|
Autocomplete: true,
|
|
|
|
Name: "consul",
|
2021-06-03 16:16:45 +00:00
|
|
|
HelpFunc: mcli.FilteredHelpFunc(names, mcli.BasicHelpFunc("consul")),
|
2020-03-26 19:27:34 +00:00
|
|
|
HelpWriter: os.Stdout,
|
|
|
|
ErrorWriter: os.Stderr,
|
2013-12-19 19:22:08 +00:00
|
|
|
}
|
|
|
|
|
2020-03-26 19:35:34 +00:00
|
|
|
if cli.IsVersion() {
|
2020-07-08 20:19:01 +00:00
|
|
|
cmd := version.New(ui)
|
2020-03-26 19:35:34 +00:00
|
|
|
return cmd.Run(nil)
|
|
|
|
}
|
|
|
|
|
2013-12-19 19:22:08 +00:00
|
|
|
exitCode, err := cli.Run()
|
|
|
|
if err != nil {
|
2020-06-30 11:12:29 +00:00
|
|
|
fmt.Fprintf(os.Stderr, "Error executing CLI: %v\n", err)
|
2013-12-19 19:22:08 +00:00
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
|
|
|
return exitCode
|
|
|
|
}
|