be04bfed34
* Clean up handling of subprocesses and make using a shell optional * Update docs for subprocess changes * Fix tests for new subprocess behavior * More cleanup of subprocesses * Minor adjustments and cleanup for subprocess logic * Makes the watch handler reload test use the new path. * Adds check tests for new args path, and updates existing tests to use new path. * Adds support for script args in Docker checks. * Fixes the sanitize unit test. * Adds panic for unknown watch type, and reverts back to Run(). * Adds shell option back to consul lock command. * Adds shell option back to consul exec command. * Adds shell back into consul watch command. * Refactors signal forwarding and makes Windows-friendly. * Adds a clarifying comment. * Changes error wording to a warning. * Scopes signals to interrupt and kill. This avoids us trying to send SIGCHILD to the dead process. * Adds an error for shell=false for consul exec. * Adds notes about the deprecated script and handler fields. * De-nests an if statement.
303 lines
7.7 KiB
Go
303 lines
7.7 KiB
Go
package command
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/agent"
|
|
"github.com/hashicorp/consul/api"
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
func testLockCommand(t *testing.T) (*cli.MockUi, *LockCommand) {
|
|
ui := cli.NewMockUi()
|
|
return ui, &LockCommand{
|
|
BaseCommand: BaseCommand{
|
|
UI: ui,
|
|
Flags: FlagSetHTTP,
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_implements(t *testing.T) {
|
|
t.Parallel()
|
|
var _ cli.Command = &LockCommand{}
|
|
}
|
|
|
|
func argFail(t *testing.T, args []string, expected string) {
|
|
ui, c := testLockCommand(t)
|
|
if code := c.Run(args); code != 1 {
|
|
t.Fatalf("expected return code 1, got %d", code)
|
|
}
|
|
if reason := ui.ErrorWriter.String(); !strings.Contains(reason, expected) {
|
|
t.Fatalf("bad reason: got='%s', expected='%s'", reason, expected)
|
|
}
|
|
|
|
}
|
|
|
|
func TestLockCommand_BadArgs(t *testing.T) {
|
|
t.Parallel()
|
|
argFail(t, []string{"-try=blah", "test/prefix", "date"}, "invalid duration")
|
|
argFail(t, []string{"-try=-10s", "test/prefix", "date"}, "Timeout must be positive")
|
|
argFail(t, []string{"-monitor-retry=-5", "test/prefix", "date"}, "must be >= 0")
|
|
}
|
|
|
|
func TestLockCommand_Run(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "test/prefix", "touch", filePath}
|
|
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
|
|
// Check for the file
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_Run_NoShell(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-shell=false", "test/prefix", "touch", filePath}
|
|
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
|
|
// Check for the file
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_Try_Lock(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-try=10s", "test/prefix", "touch", filePath}
|
|
|
|
// Run the command.
|
|
var lu *LockUnlock
|
|
code := c.run(args, &lu)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
// Make sure the try options were set correctly.
|
|
opts, ok := lu.rawOpts.(*api.LockOptions)
|
|
if !ok {
|
|
t.Fatalf("bad type")
|
|
}
|
|
if !opts.LockTryOnce || opts.LockWaitTime != 10*time.Second {
|
|
t.Fatalf("bad: %#v", opts)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_Try_Semaphore(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-n=3", "-try=10s", "test/prefix", "touch", filePath}
|
|
|
|
// Run the command.
|
|
var lu *LockUnlock
|
|
code := c.run(args, &lu)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
// Make sure the try options were set correctly.
|
|
opts, ok := lu.rawOpts.(*api.SemaphoreOptions)
|
|
if !ok {
|
|
t.Fatalf("bad type")
|
|
}
|
|
if !opts.SemaphoreTryOnce || opts.SemaphoreWaitTime != 10*time.Second {
|
|
t.Fatalf("bad: %#v", opts)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_MonitorRetry_Lock_Default(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "test/prefix", "touch", filePath}
|
|
|
|
// Run the command.
|
|
var lu *LockUnlock
|
|
code := c.run(args, &lu)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
// Make sure the monitor options were set correctly.
|
|
opts, ok := lu.rawOpts.(*api.LockOptions)
|
|
if !ok {
|
|
t.Fatalf("bad type")
|
|
}
|
|
if opts.MonitorRetries != defaultMonitorRetry ||
|
|
opts.MonitorRetryTime != defaultMonitorRetryTime {
|
|
t.Fatalf("bad: %#v", opts)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_MonitorRetry_Semaphore_Default(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-n=3", "test/prefix", "touch", filePath}
|
|
|
|
// Run the command.
|
|
var lu *LockUnlock
|
|
code := c.run(args, &lu)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
// Make sure the monitor options were set correctly.
|
|
opts, ok := lu.rawOpts.(*api.SemaphoreOptions)
|
|
if !ok {
|
|
t.Fatalf("bad type")
|
|
}
|
|
if opts.MonitorRetries != defaultMonitorRetry ||
|
|
opts.MonitorRetryTime != defaultMonitorRetryTime {
|
|
t.Fatalf("bad: %#v", opts)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_MonitorRetry_Lock_Arg(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-monitor-retry=9", "test/prefix", "touch", filePath}
|
|
|
|
// Run the command.
|
|
var lu *LockUnlock
|
|
code := c.run(args, &lu)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
// Make sure the monitor options were set correctly.
|
|
opts, ok := lu.rawOpts.(*api.LockOptions)
|
|
if !ok {
|
|
t.Fatalf("bad type")
|
|
}
|
|
if opts.MonitorRetries != 9 ||
|
|
opts.MonitorRetryTime != defaultMonitorRetryTime {
|
|
t.Fatalf("bad: %#v", opts)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_MonitorRetry_Semaphore_Arg(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
ui, c := testLockCommand(t)
|
|
filePath := filepath.Join(a.Config.DataDir, "test_touch")
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-n=3", "-monitor-retry=9", "test/prefix", "touch", filePath}
|
|
|
|
// Run the command.
|
|
var lu *LockUnlock
|
|
code := c.run(args, &lu)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
_, err := ioutil.ReadFile(filePath)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
|
|
// Make sure the monitor options were set correctly.
|
|
opts, ok := lu.rawOpts.(*api.SemaphoreOptions)
|
|
if !ok {
|
|
t.Fatalf("bad type")
|
|
}
|
|
if opts.MonitorRetries != 9 ||
|
|
opts.MonitorRetryTime != defaultMonitorRetryTime {
|
|
t.Fatalf("bad: %#v", opts)
|
|
}
|
|
}
|
|
|
|
func TestLockCommand_ChildExitCode(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), ``)
|
|
defer a.Shutdown()
|
|
|
|
t.Run("clean exit", func(t *testing.T) {
|
|
_, c := testLockCommand(t)
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-child-exit-code", "test/prefix", "sh", "-c", "exit", "0"}
|
|
if got, want := c.Run(args), 0; got != want {
|
|
t.Fatalf("got %d want %d", got, want)
|
|
}
|
|
})
|
|
|
|
t.Run("error exit", func(t *testing.T) {
|
|
_, c := testLockCommand(t)
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "-child-exit-code", "test/prefix", "exit", "1"}
|
|
if got, want := c.Run(args), 2; got != want {
|
|
t.Fatalf("got %d want %d", got, want)
|
|
}
|
|
})
|
|
|
|
t.Run("not propagated", func(t *testing.T) {
|
|
_, c := testLockCommand(t)
|
|
args := []string{"-http-addr=" + a.HTTPAddr(), "test/prefix", "sh", "-c", "exit", "1"}
|
|
if got, want := c.Run(args), 0; got != want {
|
|
t.Fatalf("got %d want %d", got, want)
|
|
}
|
|
})
|
|
}
|