2016-12-25 16:23:35 -05:00
|
|
|
package swarm
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
2017-04-17 18:07:56 -04:00
|
|
|
"github.com/docker/cli/cli/internal/test"
|
2016-12-25 16:23:35 -05:00
|
|
|
"github.com/docker/docker/api/types"
|
|
|
|
"github.com/docker/docker/api/types/swarm"
|
2017-03-09 13:23:45 -05:00
|
|
|
"github.com/pkg/errors"
|
2016-12-25 16:23:35 -05:00
|
|
|
// Import builders to get the builder function as package function
|
2017-04-17 18:07:56 -04:00
|
|
|
. "github.com/docker/cli/cli/internal/test/builders"
|
Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.
I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.
In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.
In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-13 18:45:37 -04:00
|
|
|
"github.com/docker/docker/pkg/testutil"
|
2016-12-25 16:23:35 -05:00
|
|
|
"github.com/docker/docker/pkg/testutil/golden"
|
Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.
I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.
In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.
In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-13 18:45:37 -04:00
|
|
|
"github.com/stretchr/testify/assert"
|
2016-12-25 16:23:35 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestSwarmUpdateErrors(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
name string
|
|
|
|
args []string
|
|
|
|
flags map[string]string
|
|
|
|
swarmInspectFunc func() (swarm.Swarm, error)
|
|
|
|
swarmUpdateFunc func(swarm swarm.Spec, flags swarm.UpdateFlags) error
|
|
|
|
swarmGetUnlockKeyFunc func() (types.SwarmUnlockKeyResponse, error)
|
|
|
|
expectedError string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "too-many-args",
|
|
|
|
args: []string{"foo"},
|
|
|
|
expectedError: "accepts no argument(s)",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "swarm-inspect-error",
|
|
|
|
flags: map[string]string{
|
|
|
|
flagTaskHistoryLimit: "10",
|
|
|
|
},
|
|
|
|
swarmInspectFunc: func() (swarm.Swarm, error) {
|
2017-03-09 13:23:45 -05:00
|
|
|
return swarm.Swarm{}, errors.Errorf("error inspecting the swarm")
|
2016-12-25 16:23:35 -05:00
|
|
|
},
|
|
|
|
expectedError: "error inspecting the swarm",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "swarm-update-error",
|
|
|
|
flags: map[string]string{
|
|
|
|
flagTaskHistoryLimit: "10",
|
|
|
|
},
|
|
|
|
swarmUpdateFunc: func(swarm swarm.Spec, flags swarm.UpdateFlags) error {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("error updating the swarm")
|
2016-12-25 16:23:35 -05:00
|
|
|
},
|
|
|
|
expectedError: "error updating the swarm",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "swarm-unlockkey-error",
|
|
|
|
flags: map[string]string{
|
|
|
|
flagAutolock: "true",
|
|
|
|
},
|
|
|
|
swarmInspectFunc: func() (swarm.Swarm, error) {
|
|
|
|
return *Swarm(), nil
|
|
|
|
},
|
|
|
|
swarmGetUnlockKeyFunc: func() (types.SwarmUnlockKeyResponse, error) {
|
2017-03-09 13:23:45 -05:00
|
|
|
return types.SwarmUnlockKeyResponse{}, errors.Errorf("error getting unlock key")
|
2016-12-25 16:23:35 -05:00
|
|
|
},
|
|
|
|
expectedError: "error getting unlock key",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
|
|
cmd := newUpdateCommand(
|
2017-07-05 14:43:39 -04:00
|
|
|
test.NewFakeCli(&fakeClient{
|
2016-12-25 16:23:35 -05:00
|
|
|
swarmInspectFunc: tc.swarmInspectFunc,
|
|
|
|
swarmUpdateFunc: tc.swarmUpdateFunc,
|
|
|
|
swarmGetUnlockKeyFunc: tc.swarmGetUnlockKeyFunc,
|
2017-07-05 14:43:39 -04:00
|
|
|
}))
|
2016-12-25 16:23:35 -05:00
|
|
|
cmd.SetArgs(tc.args)
|
|
|
|
for key, value := range tc.flags {
|
|
|
|
cmd.Flags().Set(key, value)
|
|
|
|
}
|
|
|
|
cmd.SetOutput(ioutil.Discard)
|
Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.
I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.
In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.
In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-13 18:45:37 -04:00
|
|
|
testutil.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestSwarmUpdate(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
name string
|
|
|
|
args []string
|
|
|
|
flags map[string]string
|
|
|
|
swarmInspectFunc func() (swarm.Swarm, error)
|
|
|
|
swarmUpdateFunc func(swarm swarm.Spec, flags swarm.UpdateFlags) error
|
|
|
|
swarmGetUnlockKeyFunc func() (types.SwarmUnlockKeyResponse, error)
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "noargs",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "all-flags-quiet",
|
|
|
|
flags: map[string]string{
|
|
|
|
flagTaskHistoryLimit: "10",
|
|
|
|
flagDispatcherHeartbeat: "10s",
|
|
|
|
flagCertExpiry: "20s",
|
|
|
|
flagExternalCA: "protocol=cfssl,url=https://example.com.",
|
|
|
|
flagMaxSnapshots: "10",
|
|
|
|
flagSnapshotInterval: "100",
|
|
|
|
flagAutolock: "true",
|
|
|
|
flagQuiet: "true",
|
|
|
|
},
|
|
|
|
swarmUpdateFunc: func(swarm swarm.Spec, flags swarm.UpdateFlags) error {
|
|
|
|
if *swarm.Orchestration.TaskHistoryRetentionLimit != 10 {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("historyLimit not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
heartbeatDuration, err := time.ParseDuration("10s")
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if swarm.Dispatcher.HeartbeatPeriod != heartbeatDuration {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("heartbeatPeriodLimit not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
certExpiryDuration, err := time.ParseDuration("20s")
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if swarm.CAConfig.NodeCertExpiry != certExpiryDuration {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("certExpiry not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
if len(swarm.CAConfig.ExternalCAs) != 1 {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("externalCA not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
if *swarm.Raft.KeepOldSnapshots != 10 {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("keepOldSnapshots not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
if swarm.Raft.SnapshotInterval != 100 {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("snapshotInterval not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
if !swarm.EncryptionConfig.AutoLockManagers {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("autolock not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "autolock-unlock-key",
|
|
|
|
flags: map[string]string{
|
|
|
|
flagTaskHistoryLimit: "10",
|
|
|
|
flagAutolock: "true",
|
|
|
|
},
|
|
|
|
swarmUpdateFunc: func(swarm swarm.Spec, flags swarm.UpdateFlags) error {
|
|
|
|
if *swarm.Orchestration.TaskHistoryRetentionLimit != 10 {
|
2017-03-09 13:23:45 -05:00
|
|
|
return errors.Errorf("historyLimit not correctly set")
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
swarmInspectFunc: func() (swarm.Swarm, error) {
|
|
|
|
return *Swarm(), nil
|
|
|
|
},
|
|
|
|
swarmGetUnlockKeyFunc: func() (types.SwarmUnlockKeyResponse, error) {
|
|
|
|
return types.SwarmUnlockKeyResponse{
|
|
|
|
UnlockKey: "unlock-key",
|
|
|
|
}, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tc := range testCases {
|
2017-07-05 14:43:39 -04:00
|
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
|
|
swarmInspectFunc: tc.swarmInspectFunc,
|
|
|
|
swarmUpdateFunc: tc.swarmUpdateFunc,
|
|
|
|
swarmGetUnlockKeyFunc: tc.swarmGetUnlockKeyFunc,
|
|
|
|
})
|
|
|
|
cmd := newUpdateCommand(cli)
|
2016-12-25 16:23:35 -05:00
|
|
|
cmd.SetArgs(tc.args)
|
|
|
|
for key, value := range tc.flags {
|
|
|
|
cmd.Flags().Set(key, value)
|
|
|
|
}
|
2017-07-05 14:43:39 -04:00
|
|
|
cmd.SetOutput(cli.OutBuffer())
|
Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.
I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.
In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.
In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-13 18:45:37 -04:00
|
|
|
assert.NoError(t, cmd.Execute())
|
2017-07-05 14:43:39 -04:00
|
|
|
actual := cli.OutBuffer().String()
|
2016-12-25 16:23:35 -05:00
|
|
|
expected := golden.Get(t, []byte(actual), fmt.Sprintf("update-%s.golden", tc.name))
|
Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.
I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.
In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.
In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-13 18:45:37 -04:00
|
|
|
testutil.EqualNormalizedString(t, testutil.RemoveSpace, actual, string(expected))
|
2016-12-25 16:23:35 -05:00
|
|
|
}
|
|
|
|
}
|