Improve the output for these validation errors:
- Removes the short command description from the output. This information
does not provide much useful help, and distracts from the error message.
- Reduces punctuation, and
- Prefixes the error message with the binary / root-command name
(usually `docker:`) to be consistent with other similar errors.
- Adds an empty line between the error-message and the "call to action"
(`Run 'docker volume --help'...` in the example below). This helps
separating the error message and "usage" from the call-to-action.
Before this patch:
$ docker volume ls one two three
"docker volume ls" accepts no arguments.
See 'docker volume ls --help'.
Usage: docker volume ls [OPTIONS]
List volumes
$ docker volume create one two three
"docker volume create" requires at most 1 argument.
See 'docker volume create --help'.
Usage: docker volume create [OPTIONS] [VOLUME]
Create a volume
With this patch:
$ docker volume ls one two three
docker: 'docker volume ls' accepts no arguments
Usage: docker volume ls [OPTIONS]
Run 'docker volume ls --help' for more information
$ docker voludocker volume create one two three
docker: 'docker volume create' requires at most 1 argument
Usage: docker volume create [OPTIONS] [VOLUME]
SRun 'docker volume create --help' for more information
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
116 lines
3.2 KiB
Go
116 lines
3.2 KiB
Go
package image
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/pkg/errors"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestNewSaveCommandErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
isTerminal bool
|
|
expectedError string
|
|
imageSaveFunc func(images []string) (io.ReadCloser, error)
|
|
}{
|
|
{
|
|
name: "wrong args",
|
|
args: []string{},
|
|
expectedError: "requires at least 1 argument",
|
|
},
|
|
{
|
|
name: "output to terminal",
|
|
args: []string{"output", "file", "arg1"},
|
|
isTerminal: true,
|
|
expectedError: "cowardly refusing to save to a terminal. Use the -o flag or redirect",
|
|
},
|
|
{
|
|
name: "ImageSave fail",
|
|
args: []string{"arg1"},
|
|
isTerminal: false,
|
|
expectedError: "error saving image",
|
|
imageSaveFunc: func(images []string) (io.ReadCloser, error) {
|
|
return io.NopCloser(strings.NewReader("")), errors.Errorf("error saving image")
|
|
},
|
|
},
|
|
{
|
|
name: "output directory does not exist",
|
|
args: []string{"-o", "fakedir/out.tar", "arg1"},
|
|
expectedError: "failed to save image: invalid output path: directory \"fakedir\" does not exist",
|
|
},
|
|
{
|
|
name: "output file is irregular",
|
|
args: []string{"-o", "/dev/null", "arg1"},
|
|
expectedError: "failed to save image: invalid output path: \"/dev/null\" must be a directory or a regular file",
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
cli := test.NewFakeCli(&fakeClient{imageSaveFunc: tc.imageSaveFunc})
|
|
cli.Out().SetIsTerminal(tc.isTerminal)
|
|
cmd := NewSaveCommand(cli)
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
cmd.SetArgs(tc.args)
|
|
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNewSaveCommandSuccess(t *testing.T) {
|
|
testCases := []struct {
|
|
args []string
|
|
isTerminal bool
|
|
imageSaveFunc func(images []string) (io.ReadCloser, error)
|
|
deferredFunc func()
|
|
}{
|
|
{
|
|
args: []string{"-o", "save_tmp_file", "arg1"},
|
|
isTerminal: true,
|
|
imageSaveFunc: func(images []string) (io.ReadCloser, error) {
|
|
assert.Assert(t, is.Len(images, 1))
|
|
assert.Check(t, is.Equal("arg1", images[0]))
|
|
return io.NopCloser(strings.NewReader("")), nil
|
|
},
|
|
deferredFunc: func() {
|
|
_ = os.Remove("save_tmp_file")
|
|
},
|
|
},
|
|
{
|
|
args: []string{"arg1", "arg2"},
|
|
isTerminal: false,
|
|
imageSaveFunc: func(images []string) (io.ReadCloser, error) {
|
|
assert.Assert(t, is.Len(images, 2))
|
|
assert.Check(t, is.Equal("arg1", images[0]))
|
|
assert.Check(t, is.Equal("arg2", images[1]))
|
|
return io.NopCloser(strings.NewReader("")), nil
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(strings.Join(tc.args, " "), func(t *testing.T) {
|
|
cmd := NewSaveCommand(test.NewFakeCli(&fakeClient{
|
|
imageSaveFunc: func(images []string) (io.ReadCloser, error) {
|
|
return io.NopCloser(strings.NewReader("")), nil
|
|
},
|
|
}))
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
cmd.SetArgs(tc.args)
|
|
assert.NilError(t, cmd.Execute())
|
|
if tc.deferredFunc != nil {
|
|
tc.deferredFunc()
|
|
}
|
|
})
|
|
}
|
|
}
|