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 )
390 lines
7.6 KiB
Go
390 lines
7.6 KiB
Go
package command
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/agent"
|
|
consulapi "github.com/hashicorp/consul/api"
|
|
"github.com/hashicorp/consul/testutil/retry"
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
func testExecCommand(t *testing.T) (*cli.MockUi, *ExecCommand) {
|
|
ui := cli.NewMockUi()
|
|
return ui, &ExecCommand{
|
|
BaseCommand: BaseCommand{
|
|
UI: ui,
|
|
Flags: FlagSetHTTP,
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestExecCommand_implements(t *testing.T) {
|
|
t.Parallel()
|
|
var _ cli.Command = &ExecCommand{}
|
|
}
|
|
|
|
func TestExecCommandRun(t *testing.T) {
|
|
t.Parallel()
|
|
cfg := agent.TestConfig()
|
|
cfg.DisableRemoteExec = agent.Bool(false)
|
|
a := agent.NewTestAgent(t.Name(), cfg)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testExecCommand(t)
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-wait=500ms", "uptime"}
|
|
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. Error:%#v (std)Output:%#v", code, ui.ErrorWriter.String(), ui.OutputWriter.String())
|
|
}
|
|
|
|
if !strings.Contains(ui.OutputWriter.String(), "load") {
|
|
t.Fatalf("bad: %#v", ui.OutputWriter.String())
|
|
}
|
|
}
|
|
|
|
func TestExecCommandRun_CrossDC(t *testing.T) {
|
|
t.Parallel()
|
|
cfg1 := agent.TestConfig()
|
|
cfg1.DisableRemoteExec = agent.Bool(false)
|
|
a1 := agent.NewTestAgent(t.Name(), cfg1)
|
|
defer a1.Shutdown()
|
|
|
|
cfg2 := agent.TestConfig()
|
|
cfg2.Datacenter = "dc2"
|
|
cfg2.DisableRemoteExec = agent.Bool(false)
|
|
a2 := agent.NewTestAgent(t.Name(), cfg2)
|
|
defer a1.Shutdown()
|
|
|
|
// Join over the WAN
|
|
wanAddr := fmt.Sprintf("%s:%d", a1.Config.BindAddr, a1.Config.Ports.SerfWan)
|
|
n, err := a2.JoinWAN([]string{wanAddr})
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if n != 1 {
|
|
t.Fatalf("bad %d", n)
|
|
}
|
|
|
|
ui, c := testExecCommand(t)
|
|
args := []string{"-http-addr=" + a1.HTTPAddr(), "-wait=500ms", "-datacenter=dc2", "uptime"}
|
|
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
|
|
if !strings.Contains(ui.OutputWriter.String(), "load") {
|
|
t.Fatalf("bad: %#v", ui.OutputWriter.String())
|
|
}
|
|
}
|
|
|
|
func TestExecCommand_Validate(t *testing.T) {
|
|
t.Parallel()
|
|
conf := &rExecConf{}
|
|
err := conf.validate()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
conf.node = "("
|
|
err = conf.validate()
|
|
if err == nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
conf.node = ""
|
|
conf.service = "("
|
|
err = conf.validate()
|
|
if err == nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
conf.service = "()"
|
|
conf.tag = "("
|
|
err = conf.validate()
|
|
if err == nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
conf.service = ""
|
|
conf.tag = "foo"
|
|
err = conf.validate()
|
|
if err == nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestExecCommand_Sessions(t *testing.T) {
|
|
t.Parallel()
|
|
cfg := agent.TestConfig()
|
|
cfg.DisableRemoteExec = agent.Bool(false)
|
|
a := agent.NewTestAgent(t.Name(), cfg)
|
|
defer a.Shutdown()
|
|
|
|
client := a.Client()
|
|
_, c := testExecCommand(t)
|
|
c.client = client
|
|
|
|
id, err := c.createSession()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
se, _, err := client.Session().Info(id, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if se == nil || se.Name != "Remote Exec" {
|
|
t.Fatalf("bad: %v", se)
|
|
}
|
|
|
|
c.sessionID = id
|
|
err = c.destroySession()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
se, _, err = client.Session().Info(id, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if se != nil {
|
|
t.Fatalf("bad: %v", se)
|
|
}
|
|
}
|
|
|
|
func TestExecCommand_Sessions_Foreign(t *testing.T) {
|
|
t.Parallel()
|
|
cfg := agent.TestConfig()
|
|
cfg.DisableRemoteExec = agent.Bool(false)
|
|
a := agent.NewTestAgent(t.Name(), cfg)
|
|
defer a.Shutdown()
|
|
|
|
client := a.Client()
|
|
_, c := testExecCommand(t)
|
|
c.client = client
|
|
|
|
c.conf.foreignDC = true
|
|
c.conf.localDC = "dc1"
|
|
c.conf.localNode = "foo"
|
|
|
|
var id string
|
|
retry.Run(t, func(r *retry.R) {
|
|
var err error
|
|
id, err = c.createSession()
|
|
if err != nil {
|
|
r.Fatal(err)
|
|
}
|
|
if id == "" {
|
|
r.Fatal("no id")
|
|
}
|
|
})
|
|
|
|
se, _, err := client.Session().Info(id, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if se == nil || se.Name != "Remote Exec via foo@dc1" {
|
|
t.Fatalf("bad: %v", se)
|
|
}
|
|
|
|
c.sessionID = id
|
|
err = c.destroySession()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
se, _, err = client.Session().Info(id, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if se != nil {
|
|
t.Fatalf("bad: %v", se)
|
|
}
|
|
}
|
|
|
|
func TestExecCommand_UploadDestroy(t *testing.T) {
|
|
t.Parallel()
|
|
cfg := agent.TestConfig()
|
|
cfg.DisableRemoteExec = agent.Bool(false)
|
|
a := agent.NewTestAgent(t.Name(), cfg)
|
|
defer a.Shutdown()
|
|
|
|
client := a.Client()
|
|
_, c := testExecCommand(t)
|
|
c.client = client
|
|
|
|
id, err := c.createSession()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
c.sessionID = id
|
|
|
|
c.conf.prefix = "_rexec"
|
|
c.conf.cmd = "uptime"
|
|
c.conf.wait = time.Second
|
|
|
|
buf, err := c.makeRExecSpec()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
err = c.uploadPayload(buf)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
pair, _, err := client.KV().Get("_rexec/"+id+"/job", nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
if pair == nil || len(pair.Value) == 0 {
|
|
t.Fatalf("missing job spec")
|
|
}
|
|
|
|
err = c.destroyData()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
pair, _, err = client.KV().Get("_rexec/"+id+"/job", nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
if pair != nil {
|
|
t.Fatalf("should be destroyed")
|
|
}
|
|
}
|
|
|
|
func TestExecCommand_StreamResults(t *testing.T) {
|
|
t.Parallel()
|
|
cfg := agent.TestConfig()
|
|
cfg.DisableRemoteExec = agent.Bool(false)
|
|
a := agent.NewTestAgent(t.Name(), cfg)
|
|
defer a.Shutdown()
|
|
|
|
client := a.Client()
|
|
_, c := testExecCommand(t)
|
|
c.client = client
|
|
c.conf.prefix = "_rexec"
|
|
|
|
id, err := c.createSession()
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
c.sessionID = id
|
|
|
|
ackCh := make(chan rExecAck, 128)
|
|
heartCh := make(chan rExecHeart, 128)
|
|
outputCh := make(chan rExecOutput, 128)
|
|
exitCh := make(chan rExecExit, 128)
|
|
doneCh := make(chan struct{})
|
|
errCh := make(chan struct{}, 1)
|
|
defer close(doneCh)
|
|
go c.streamResults(doneCh, ackCh, heartCh, outputCh, exitCh, errCh)
|
|
|
|
prefix := "_rexec/" + id + "/"
|
|
ok, _, err := client.KV().Acquire(&consulapi.KVPair{
|
|
Key: prefix + "foo/ack",
|
|
Session: id,
|
|
}, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if !ok {
|
|
t.Fatalf("should be ok bro")
|
|
}
|
|
|
|
select {
|
|
case a := <-ackCh:
|
|
if a.Node != "foo" {
|
|
t.Fatalf("bad: %#v", a)
|
|
}
|
|
case <-time.After(50 * time.Millisecond):
|
|
t.Fatalf("timeout")
|
|
}
|
|
|
|
ok, _, err = client.KV().Acquire(&consulapi.KVPair{
|
|
Key: prefix + "foo/exit",
|
|
Value: []byte("127"),
|
|
Session: id,
|
|
}, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if !ok {
|
|
t.Fatalf("should be ok bro")
|
|
}
|
|
|
|
select {
|
|
case e := <-exitCh:
|
|
if e.Node != "foo" || e.Code != 127 {
|
|
t.Fatalf("bad: %#v", e)
|
|
}
|
|
case <-time.After(50 * time.Millisecond):
|
|
t.Fatalf("timeout")
|
|
}
|
|
|
|
// Random key, should ignore
|
|
ok, _, err = client.KV().Acquire(&consulapi.KVPair{
|
|
Key: prefix + "foo/random",
|
|
Session: id,
|
|
}, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if !ok {
|
|
t.Fatalf("should be ok bro")
|
|
}
|
|
|
|
// Output heartbeat
|
|
ok, _, err = client.KV().Acquire(&consulapi.KVPair{
|
|
Key: prefix + "foo/out/00000",
|
|
Session: id,
|
|
}, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if !ok {
|
|
t.Fatalf("should be ok bro")
|
|
}
|
|
|
|
select {
|
|
case h := <-heartCh:
|
|
if h.Node != "foo" {
|
|
t.Fatalf("bad: %#v", h)
|
|
}
|
|
case <-time.After(50 * time.Millisecond):
|
|
t.Fatalf("timeout")
|
|
}
|
|
|
|
// Output value
|
|
ok, _, err = client.KV().Acquire(&consulapi.KVPair{
|
|
Key: prefix + "foo/out/00001",
|
|
Value: []byte("test"),
|
|
Session: id,
|
|
}, nil)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if !ok {
|
|
t.Fatalf("should be ok bro")
|
|
}
|
|
|
|
select {
|
|
case o := <-outputCh:
|
|
if o.Node != "foo" || string(o.Output) != "test" {
|
|
t.Fatalf("bad: %#v", o)
|
|
}
|
|
case <-time.After(50 * time.Millisecond):
|
|
t.Fatalf("timeout")
|
|
}
|
|
}
|