2017-10-17 11:06:40 +00:00
|
|
|
package save
|
2016-10-26 02:20:24 +00:00
|
|
|
|
|
|
|
import (
|
2020-04-24 22:18:56 +00:00
|
|
|
"crypto/rand"
|
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"net/http"
|
2016-10-26 02:20:24 +00:00
|
|
|
"os"
|
2020-04-24 22:18:56 +00:00
|
|
|
"path/filepath"
|
2016-10-26 02:20:24 +00:00
|
|
|
"strings"
|
2020-04-24 22:18:56 +00:00
|
|
|
"sync/atomic"
|
2016-10-26 02:20:24 +00:00
|
|
|
"testing"
|
|
|
|
|
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/agent"
|
2020-04-24 22:18:56 +00:00
|
|
|
"github.com/hashicorp/consul/api"
|
|
|
|
"github.com/hashicorp/consul/lib"
|
2019-03-27 12:54:56 +00:00
|
|
|
"github.com/hashicorp/consul/sdk/testutil"
|
2020-06-03 19:18:52 +00:00
|
|
|
"github.com/hashicorp/consul/sdk/testutil/retry"
|
2016-10-26 02:20:24 +00:00
|
|
|
"github.com/mitchellh/cli"
|
2020-04-24 22:18:56 +00:00
|
|
|
"github.com/stretchr/testify/require"
|
2016-10-26 02:20:24 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestSnapshotSaveCommand_noTabs(t *testing.T) {
|
2017-10-17 14:07:48 +00:00
|
|
|
t.Parallel()
|
2017-10-17 08:15:11 +00:00
|
|
|
if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
|
2017-10-17 13:44:20 +00:00
|
|
|
t.Fatal("help has tabs")
|
2017-10-17 08:15:11 +00:00
|
|
|
}
|
2016-10-26 02:20:24 +00:00
|
|
|
}
|
2020-04-24 22:18:56 +00:00
|
|
|
|
2016-10-26 02:20:24 +00:00
|
|
|
func TestSnapshotSaveCommand_Validation(t *testing.T) {
|
2017-10-17 14:07:48 +00:00
|
|
|
t.Parallel()
|
2016-10-26 02:20:24 +00:00
|
|
|
|
|
|
|
cases := map[string]struct {
|
|
|
|
args []string
|
|
|
|
output string
|
|
|
|
}{
|
|
|
|
"no file": {
|
|
|
|
[]string{},
|
|
|
|
"Missing FILE argument",
|
|
|
|
},
|
|
|
|
"extra args": {
|
|
|
|
[]string{"foo", "bar", "baz"},
|
|
|
|
"Too many arguments",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for name, tc := range cases {
|
2017-10-17 08:15:11 +00:00
|
|
|
ui := cli.NewMockUi()
|
|
|
|
c := New(ui)
|
2017-10-11 12:51:18 +00:00
|
|
|
|
2016-10-26 02:20:24 +00:00
|
|
|
// Ensure our buffer is always clear
|
|
|
|
if ui.ErrorWriter != nil {
|
|
|
|
ui.ErrorWriter.Reset()
|
|
|
|
}
|
|
|
|
if ui.OutputWriter != nil {
|
|
|
|
ui.OutputWriter.Reset()
|
|
|
|
}
|
|
|
|
|
|
|
|
code := c.Run(tc.args)
|
|
|
|
if code == 0 {
|
|
|
|
t.Errorf("%s: expected non-zero exit", name)
|
|
|
|
}
|
|
|
|
|
|
|
|
output := ui.ErrorWriter.String()
|
|
|
|
if !strings.Contains(output, tc.output) {
|
|
|
|
t.Errorf("%s: expected %q to contain %q", name, output, tc.output)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-17 12:04:51 +00:00
|
|
|
func TestSnapshotSaveCommand(t *testing.T) {
|
2017-10-17 14:07:48 +00:00
|
|
|
t.Parallel()
|
2020-03-31 19:59:56 +00:00
|
|
|
a := agent.NewTestAgent(t, ``)
|
2017-05-22 11:59:36 +00:00
|
|
|
defer a.Shutdown()
|
|
|
|
client := a.Client()
|
2016-10-26 02:20:24 +00:00
|
|
|
|
2017-10-17 08:15:11 +00:00
|
|
|
ui := cli.NewMockUi()
|
|
|
|
c := New(ui)
|
2016-10-26 02:20:24 +00:00
|
|
|
|
2017-05-12 13:41:13 +00:00
|
|
|
dir := testutil.TempDir(t, "snapshot")
|
2016-10-26 02:20:24 +00:00
|
|
|
defer os.RemoveAll(dir)
|
|
|
|
|
2020-04-24 22:18:56 +00:00
|
|
|
file := filepath.Join(dir, "backup.tgz")
|
2016-10-26 02:20:24 +00:00
|
|
|
args := []string{
|
2017-05-22 11:59:36 +00:00
|
|
|
"-http-addr=" + a.HTTPAddr(),
|
2016-10-26 02:20:24 +00:00
|
|
|
file,
|
|
|
|
}
|
|
|
|
|
|
|
|
code := c.Run(args)
|
|
|
|
if code != 0 {
|
|
|
|
t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
|
|
|
|
}
|
|
|
|
|
|
|
|
f, err := os.Open(file)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
|
|
|
|
if err := client.Snapshot().Restore(nil, f); err != nil {
|
|
|
|
t.Fatalf("err: %v", err)
|
|
|
|
}
|
|
|
|
}
|
2020-04-24 22:18:56 +00:00
|
|
|
|
|
|
|
func TestSnapshotSaveCommand_TruncatedStream(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
a := agent.NewTestAgent(t, ``)
|
|
|
|
defer a.Shutdown()
|
|
|
|
client := a.Client()
|
|
|
|
|
|
|
|
// Seed it with 64K of random data just so we have something to work with.
|
|
|
|
{
|
|
|
|
blob := make([]byte, 64*1024)
|
|
|
|
_, err := rand.Read(blob)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
_, err = client.KV().Put(&api.KVPair{Key: "blob", Value: blob}, nil)
|
|
|
|
require.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Do a manual snapshot so we can send back roughly reasonable data.
|
|
|
|
var inputData []byte
|
|
|
|
{
|
|
|
|
rc, _, err := client.Snapshot().Save(nil)
|
|
|
|
require.NoError(t, err)
|
|
|
|
defer rc.Close()
|
|
|
|
|
|
|
|
inputData, err = ioutil.ReadAll(rc)
|
|
|
|
require.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
var fakeResult atomic.Value
|
|
|
|
|
|
|
|
// Run a fake webserver to pretend to be the snapshot API.
|
|
|
|
fakeAddr := lib.StartTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
|
|
|
if req.URL.Path != "/v1/snapshot" {
|
|
|
|
w.WriteHeader(http.StatusNotFound)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if req.Method != "GET" {
|
|
|
|
w.WriteHeader(http.StatusMethodNotAllowed)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
raw := fakeResult.Load()
|
|
|
|
if raw == nil {
|
|
|
|
w.WriteHeader(http.StatusNotFound)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
data := raw.([]byte)
|
|
|
|
_, _ = w.Write(data)
|
|
|
|
}))
|
|
|
|
|
2020-06-03 19:18:52 +00:00
|
|
|
// Wait until the server is actually listening.
|
|
|
|
retry.Run(t, func(r *retry.R) {
|
|
|
|
resp, err := http.Get("http://" + fakeAddr + "/not-real")
|
|
|
|
require.NoError(r, err)
|
|
|
|
require.Equal(r, http.StatusNotFound, resp.StatusCode)
|
|
|
|
})
|
|
|
|
|
2020-04-24 22:18:56 +00:00
|
|
|
dir := testutil.TempDir(t, "snapshot")
|
|
|
|
defer os.RemoveAll(dir)
|
|
|
|
|
|
|
|
for _, removeBytes := range []int{200, 16, 8, 4, 2, 1} {
|
|
|
|
t.Run(fmt.Sprintf("truncate %d bytes from end", removeBytes), func(t *testing.T) {
|
|
|
|
// Lop off part of the end.
|
|
|
|
data := inputData[0 : len(inputData)-removeBytes]
|
|
|
|
|
|
|
|
fakeResult.Store(data)
|
|
|
|
|
|
|
|
ui := cli.NewMockUi()
|
|
|
|
c := New(ui)
|
|
|
|
|
|
|
|
file := filepath.Join(dir, "backup.tgz")
|
|
|
|
args := []string{
|
|
|
|
"-http-addr=" + fakeAddr, // point to the fake
|
|
|
|
file,
|
|
|
|
}
|
|
|
|
|
|
|
|
code := c.Run(args)
|
|
|
|
require.Equal(t, 1, code, "expected non-zero exit")
|
|
|
|
|
|
|
|
output := ui.ErrorWriter.String()
|
|
|
|
require.Contains(t, output, "Error verifying snapshot file")
|
|
|
|
require.Contains(t, output, "EOF")
|
2020-04-24 22:34:47 +00:00
|
|
|
|
|
|
|
// file should not have been created
|
|
|
|
|
|
|
|
_, err := os.Stat(file)
|
|
|
|
require.Error(t, err, "file is not supposed to exist")
|
|
|
|
require.True(t, os.IsNotExist(err), "file is not supposed to exist")
|
|
|
|
|
|
|
|
// also check that the unverified inputs are gone as well
|
|
|
|
_, err = os.Stat(file + ".unverified")
|
|
|
|
require.Error(t, err, "unverified file is not supposed to exist")
|
|
|
|
require.True(t, os.IsNotExist(err), "unverified file is not supposed to exist")
|
2020-04-24 22:18:56 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|