cd837b0b18
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 )
163 lines
3 KiB
Go
163 lines
3 KiB
Go
package consul
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/hashicorp/consul/types"
|
|
"github.com/hashicorp/serf/serf"
|
|
)
|
|
|
|
func makeNode(dc, name, id string, server bool) *serf.Member {
|
|
var role string
|
|
if server {
|
|
role = "consul"
|
|
} else {
|
|
role = "node"
|
|
}
|
|
|
|
return &serf.Member{
|
|
Name: name,
|
|
Tags: map[string]string{
|
|
"role": role,
|
|
"dc": dc,
|
|
"id": id,
|
|
"port": "8300",
|
|
"build": "0.7.5",
|
|
"vsn": "2",
|
|
"vsn_max": "3",
|
|
"vsn_min": "2",
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestMerge_LAN(t *testing.T) {
|
|
t.Parallel()
|
|
cases := []struct {
|
|
members []*serf.Member
|
|
expect string
|
|
}{
|
|
// Client in the wrong datacenter.
|
|
{
|
|
members: []*serf.Member{
|
|
makeNode("dc2",
|
|
"node1",
|
|
"96430788-246f-4379-94ce-257f7429e340",
|
|
false),
|
|
},
|
|
expect: "wrong datacenter",
|
|
},
|
|
// Server in the wrong datacenter.
|
|
{
|
|
members: []*serf.Member{
|
|
makeNode("dc2",
|
|
"node1",
|
|
"96430788-246f-4379-94ce-257f7429e340",
|
|
true),
|
|
},
|
|
expect: "wrong datacenter",
|
|
},
|
|
// Node ID conflict with delegate's ID.
|
|
{
|
|
members: []*serf.Member{
|
|
makeNode("dc1",
|
|
"node1",
|
|
"ee954a2f-80de-4b34-8780-97b942a50a99",
|
|
true),
|
|
},
|
|
expect: "with this agent's ID",
|
|
},
|
|
// Cluster with existing conflicting node IDs.
|
|
{
|
|
members: []*serf.Member{
|
|
makeNode("dc1",
|
|
"node1",
|
|
"6185913b-98d7-4441-bd8f-f7f7d854a4af",
|
|
true),
|
|
makeNode("dc1",
|
|
"node2",
|
|
"6185913b-98d7-4441-bd8f-f7f7d854a4af",
|
|
true),
|
|
},
|
|
expect: "with member",
|
|
},
|
|
// Good cluster.
|
|
{
|
|
members: []*serf.Member{
|
|
makeNode("dc1",
|
|
"node1",
|
|
"6185913b-98d7-4441-bd8f-f7f7d854a4af",
|
|
true),
|
|
makeNode("dc1",
|
|
"node2",
|
|
"cda916bc-a357-4a19-b886-59419fcee50c",
|
|
true),
|
|
},
|
|
expect: "",
|
|
},
|
|
}
|
|
|
|
delegate := &lanMergeDelegate{
|
|
dc: "dc1",
|
|
nodeID: types.NodeID("ee954a2f-80de-4b34-8780-97b942a50a99"),
|
|
nodeName: "node0",
|
|
}
|
|
for i, c := range cases {
|
|
if err := delegate.NotifyMerge(c.members); c.expect == "" {
|
|
if err != nil {
|
|
t.Fatalf("case %d: err: %v", i+1, err)
|
|
}
|
|
} else {
|
|
if err == nil || !strings.Contains(err.Error(), c.expect) {
|
|
t.Fatalf("case %d: err: %v", i+1, err)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestMerge_WAN(t *testing.T) {
|
|
t.Parallel()
|
|
cases := []struct {
|
|
members []*serf.Member
|
|
expect string
|
|
}{
|
|
// Not a server
|
|
{
|
|
members: []*serf.Member{
|
|
makeNode("dc2",
|
|
"node1",
|
|
"96430788-246f-4379-94ce-257f7429e340",
|
|
false),
|
|
},
|
|
expect: "not a server",
|
|
},
|
|
// Good cluster.
|
|
{
|
|
members: []*serf.Member{
|
|
makeNode("dc2",
|
|
"node1",
|
|
"6185913b-98d7-4441-bd8f-f7f7d854a4af",
|
|
true),
|
|
makeNode("dc3",
|
|
"node2",
|
|
"cda916bc-a357-4a19-b886-59419fcee50c",
|
|
true),
|
|
},
|
|
expect: "",
|
|
},
|
|
}
|
|
|
|
delegate := &wanMergeDelegate{}
|
|
for i, c := range cases {
|
|
if err := delegate.NotifyMerge(c.members); c.expect == "" {
|
|
if err != nil {
|
|
t.Fatalf("case %d: err: %v", i+1, err)
|
|
}
|
|
} else {
|
|
if err == nil || !strings.Contains(err.Error(), c.expect) {
|
|
t.Fatalf("case %d: err: %v", i+1, err)
|
|
}
|
|
}
|
|
}
|
|
}
|