luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity
open-consul/agent/consul
History
Frank Schroeder 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
..
agent pkg refactor 2017-06-10 18:52:45 +02:00
prepared_query pkg refactor 2017-06-10 18:52:45 +02:00
servers pkg refactor 2017-06-10 18:52:45 +02:00
state pkg refactor 2017-06-10 18:52:45 +02:00
structs pkg refactor 2017-06-10 18:52:45 +02:00
acl.go pkg refactor 2017-06-10 18:52:45 +02:00
acl_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
acl_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
acl_replication.go pkg refactor 2017-06-10 18:52:45 +02:00
acl_replication_test.go pkg refactor 2017-06-10 18:52:45 +02:00
acl_test.go pkg refactor 2017-06-10 18:52:45 +02:00
autopilot.go pkg refactor 2017-06-10 18:52:45 +02:00
autopilot_test.go pkg refactor 2017-06-10 18:52:45 +02:00
catalog_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
catalog_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
client.go pkg refactor 2017-06-10 18:52:45 +02:00
client_test.go pkg refactor 2017-06-10 18:52:45 +02:00
config.go pkg refactor 2017-06-10 18:52:45 +02:00
config_test.go pkg refactor 2017-06-10 18:52:45 +02:00
coordinate_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
coordinate_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
filter.go pkg refactor 2017-06-10 18:52:45 +02:00
filter_test.go pkg refactor 2017-06-10 18:52:45 +02:00
flood.go pkg refactor 2017-06-10 18:52:45 +02:00
fsm.go pkg refactor 2017-06-10 18:52:45 +02:00
fsm_test.go pkg refactor 2017-06-10 18:52:45 +02:00
health_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
health_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
helper_test.go pkg refactor 2017-06-10 18:52:45 +02:00
internal_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
internal_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
issue_test.go pkg refactor 2017-06-10 18:52:45 +02:00
kvs_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
kvs_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
leader.go pkg refactor 2017-06-10 18:52:45 +02:00
leader_test.go pkg refactor 2017-06-10 18:52:45 +02:00
merge.go pkg refactor 2017-06-10 18:52:45 +02:00
merge_test.go pkg refactor 2017-06-10 18:52:45 +02:00
operator_autopilot_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
operator_autopilot_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
operator_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
operator_raft_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
operator_raft_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
pool.go pkg refactor 2017-06-10 18:52:45 +02:00
prepared_query_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
prepared_query_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
raft_rpc.go pkg refactor 2017-06-10 18:52:45 +02:00
rpc.go pkg refactor 2017-06-10 18:52:45 +02:00
rpc_test.go pkg refactor 2017-06-10 18:52:45 +02:00
rtt.go pkg refactor 2017-06-10 18:52:45 +02:00
rtt_test.go pkg refactor 2017-06-10 18:52:45 +02:00
serf.go pkg refactor 2017-06-10 18:52:45 +02:00
serf_test.go pkg refactor 2017-06-10 18:52:45 +02:00
server.go pkg refactor 2017-06-10 18:52:45 +02:00
server_test.go pkg refactor 2017-06-10 18:52:45 +02:00
session_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
session_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
session_ttl.go pkg refactor 2017-06-10 18:52:45 +02:00
session_ttl_test.go pkg refactor 2017-06-10 18:52:45 +02:00
snapshot_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
snapshot_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
stats_fetcher.go pkg refactor 2017-06-10 18:52:45 +02:00
stats_fetcher_test.go pkg refactor 2017-06-10 18:52:45 +02:00
status_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
status_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
txn_endpoint.go pkg refactor 2017-06-10 18:52:45 +02:00
txn_endpoint_test.go pkg refactor 2017-06-10 18:52:45 +02:00
util.go pkg refactor 2017-06-10 18:52:45 +02:00
util_test.go pkg refactor 2017-06-10 18:52:45 +02:00