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>
137 lines
4.0 KiB
Go
137 lines
4.0 KiB
Go
package image
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/docker/docker/api/types/image"
|
|
"github.com/pkg/errors"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
"gotest.tools/v3/golden"
|
|
)
|
|
|
|
type notFound struct {
|
|
imageID string
|
|
}
|
|
|
|
func (n notFound) Error() string {
|
|
return "Error: No such image: " + n.imageID
|
|
}
|
|
|
|
func (n notFound) NotFound() {}
|
|
|
|
func TestNewRemoveCommandAlias(t *testing.T) {
|
|
cmd := newRemoveCommand(test.NewFakeCli(&fakeClient{}))
|
|
assert.Check(t, cmd.HasAlias("rmi"))
|
|
assert.Check(t, cmd.HasAlias("remove"))
|
|
assert.Check(t, !cmd.HasAlias("other"))
|
|
}
|
|
|
|
func TestNewRemoveCommandErrors(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
expectedError string
|
|
imageRemoveFunc func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error)
|
|
}{
|
|
{
|
|
name: "wrong args",
|
|
expectedError: "requires at least 1 argument",
|
|
},
|
|
{
|
|
name: "ImageRemove fail with force option",
|
|
args: []string{"-f", "image1"},
|
|
expectedError: "error removing image",
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
return []image.DeleteResponse{}, errors.Errorf("error removing image")
|
|
},
|
|
},
|
|
{
|
|
name: "ImageRemove fail",
|
|
args: []string{"arg1"},
|
|
expectedError: "error removing image",
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, !options.Force)
|
|
assert.Check(t, options.PruneChildren)
|
|
return []image.DeleteResponse{}, errors.Errorf("error removing image")
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
cmd := NewRemoveCommand(test.NewFakeCli(&fakeClient{
|
|
imageRemoveFunc: tc.imageRemoveFunc,
|
|
}))
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
cmd.SetArgs(tc.args)
|
|
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNewRemoveCommandSuccess(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
args []string
|
|
imageRemoveFunc func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error)
|
|
expectedStderr string
|
|
}{
|
|
{
|
|
name: "Image Deleted",
|
|
args: []string{"image1"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
return []image.DeleteResponse{{Deleted: img}}, nil
|
|
},
|
|
},
|
|
{
|
|
name: "Image not found with force option",
|
|
args: []string{"-f", "image1"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
assert.Check(t, is.Equal(true, options.Force))
|
|
return []image.DeleteResponse{}, notFound{"image1"}
|
|
},
|
|
expectedStderr: "Error: No such image: image1\n",
|
|
},
|
|
|
|
{
|
|
name: "Image Untagged",
|
|
args: []string{"image1"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
assert.Check(t, is.Equal("image1", img))
|
|
return []image.DeleteResponse{{Untagged: img}}, nil
|
|
},
|
|
},
|
|
{
|
|
name: "Image Deleted and Untagged",
|
|
args: []string{"image1", "image2"},
|
|
imageRemoveFunc: func(img string, options image.RemoveOptions) ([]image.DeleteResponse, error) {
|
|
if img == "image1" {
|
|
return []image.DeleteResponse{{Untagged: img}}, nil
|
|
}
|
|
return []image.DeleteResponse{{Deleted: img}}, nil
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
cli := test.NewFakeCli(&fakeClient{imageRemoveFunc: tc.imageRemoveFunc})
|
|
cmd := NewRemoveCommand(cli)
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
cmd.SetArgs(tc.args)
|
|
assert.NilError(t, cmd.Execute())
|
|
assert.Check(t, is.Equal(tc.expectedStderr, cli.ErrBuffer().String()))
|
|
golden.Assert(t, cli.OutBuffer().String(), fmt.Sprintf("remove-command-success.%s.golden", tc.name))
|
|
})
|
|
}
|
|
}
|