2018-02-27 06:14:07 -05:00
|
|
|
package container
|
|
|
|
|
|
|
|
import (
|
2023-09-09 18:27:44 -04:00
|
|
|
"context"
|
2022-06-27 11:16:44 -04:00
|
|
|
"errors"
|
2022-02-25 07:05:59 -05:00
|
|
|
"io"
|
2024-04-08 04:11:09 -04:00
|
|
|
"net"
|
|
|
|
"syscall"
|
2018-02-27 06:14:07 -05:00
|
|
|
"testing"
|
2024-04-08 04:11:09 -04:00
|
|
|
"time"
|
2018-02-27 06:14:07 -05:00
|
|
|
|
2024-04-08 04:11:09 -04:00
|
|
|
"github.com/creack/pty"
|
2022-06-27 11:16:44 -04:00
|
|
|
"github.com/docker/cli/cli"
|
2024-04-08 04:11:09 -04:00
|
|
|
"github.com/docker/cli/cli/streams"
|
2018-02-27 06:14:07 -05:00
|
|
|
"github.com/docker/cli/internal/test"
|
2018-03-06 05:15:18 -05:00
|
|
|
"github.com/docker/cli/internal/test/notary"
|
2024-04-08 04:11:09 -04:00
|
|
|
"github.com/docker/docker/api/types"
|
2018-02-27 06:14:07 -05:00
|
|
|
"github.com/docker/docker/api/types/container"
|
|
|
|
"github.com/docker/docker/api/types/network"
|
2020-05-27 14:32:22 -04:00
|
|
|
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
2022-06-27 11:16:44 -04:00
|
|
|
"github.com/spf13/pflag"
|
2020-02-22 12:12:14 -05:00
|
|
|
"gotest.tools/v3/assert"
|
|
|
|
is "gotest.tools/v3/assert/cmp"
|
2018-02-27 06:14:07 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestRunLabel(t *testing.T) {
|
2023-11-20 11:38:50 -05:00
|
|
|
fakeCLI := test.NewFakeCli(&fakeClient{
|
2022-04-29 13:26:50 -04:00
|
|
|
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *specs.Platform, _ string) (container.CreateResponse, error) {
|
|
|
|
return container.CreateResponse{
|
2018-02-27 06:14:07 -05:00
|
|
|
ID: "id",
|
|
|
|
}, nil
|
|
|
|
},
|
|
|
|
Version: "1.36",
|
|
|
|
})
|
2023-11-20 11:38:50 -05:00
|
|
|
cmd := NewRunCommand(fakeCLI)
|
2018-12-13 07:22:38 -05:00
|
|
|
cmd.SetArgs([]string{"--detach=true", "--label", "foo", "busybox"})
|
2018-03-06 15:13:00 -05:00
|
|
|
assert.NilError(t, cmd.Execute())
|
2018-02-27 06:14:07 -05:00
|
|
|
}
|
2018-03-06 05:15:18 -05:00
|
|
|
|
2024-07-26 09:46:01 -04:00
|
|
|
func TestRunAttach(t *testing.T) {
|
2024-04-08 04:11:09 -04:00
|
|
|
p, tty, err := pty.Open()
|
|
|
|
assert.NilError(t, err)
|
2024-07-26 09:46:01 -04:00
|
|
|
defer func() {
|
|
|
|
_ = tty.Close()
|
|
|
|
_ = p.Close()
|
|
|
|
}()
|
|
|
|
|
|
|
|
var conn net.Conn
|
|
|
|
attachCh := make(chan struct{})
|
|
|
|
fakeCLI := test.NewFakeCli(&fakeClient{
|
|
|
|
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *specs.Platform, _ string) (container.CreateResponse, error) {
|
|
|
|
return container.CreateResponse{
|
|
|
|
ID: "id",
|
|
|
|
}, nil
|
|
|
|
},
|
|
|
|
containerAttachFunc: func(ctx context.Context, containerID string, options container.AttachOptions) (types.HijackedResponse, error) {
|
|
|
|
server, client := net.Pipe()
|
|
|
|
conn = server
|
|
|
|
t.Cleanup(func() {
|
|
|
|
_ = server.Close()
|
|
|
|
})
|
|
|
|
attachCh <- struct{}{}
|
|
|
|
return types.NewHijackedResponse(client, types.MediaTypeRawStream), nil
|
|
|
|
},
|
|
|
|
waitFunc: func(_ string) (<-chan container.WaitResponse, <-chan error) {
|
|
|
|
responseChan := make(chan container.WaitResponse, 1)
|
|
|
|
errChan := make(chan error)
|
|
|
|
|
|
|
|
responseChan <- container.WaitResponse{
|
|
|
|
StatusCode: 33,
|
|
|
|
}
|
|
|
|
return responseChan, errChan
|
|
|
|
},
|
|
|
|
// use new (non-legacy) wait API
|
|
|
|
// see: 38591f20d07795aaef45d400df89ca12f29c603b
|
|
|
|
Version: "1.30",
|
|
|
|
}, func(fc *test.FakeCli) {
|
|
|
|
fc.SetOut(streams.NewOut(tty))
|
|
|
|
fc.SetIn(streams.NewIn(tty))
|
|
|
|
})
|
|
|
|
|
|
|
|
cmd := NewRunCommand(fakeCLI)
|
|
|
|
cmd.SetArgs([]string{"-it", "busybox"})
|
|
|
|
cmd.SilenceUsage = true
|
|
|
|
cmdErrC := make(chan error, 1)
|
|
|
|
go func() {
|
|
|
|
cmdErrC <- cmd.Execute()
|
|
|
|
}()
|
|
|
|
|
|
|
|
// run command should attempt to attach to the container
|
|
|
|
select {
|
|
|
|
case <-time.After(5 * time.Second):
|
|
|
|
t.Fatal("containerAttachFunc was not called before the 5 second timeout")
|
|
|
|
case <-attachCh:
|
|
|
|
}
|
|
|
|
|
|
|
|
// end stream from "container" so that we'll detach
|
|
|
|
conn.Close()
|
|
|
|
|
|
|
|
select {
|
|
|
|
case cmdErr := <-cmdErrC:
|
|
|
|
assert.Equal(t, cmdErr, cli.StatusError{
|
|
|
|
StatusCode: 33,
|
|
|
|
})
|
|
|
|
case <-time.After(2 * time.Second):
|
|
|
|
t.Fatal("cmd did not return within timeout")
|
|
|
|
}
|
|
|
|
}
|
2024-04-08 04:11:09 -04:00
|
|
|
|
2024-07-26 09:46:01 -04:00
|
|
|
func TestRunAttachTermination(t *testing.T) {
|
|
|
|
p, tty, err := pty.Open()
|
|
|
|
assert.NilError(t, err)
|
2024-04-08 04:11:09 -04:00
|
|
|
defer func() {
|
|
|
|
_ = tty.Close()
|
|
|
|
_ = p.Close()
|
|
|
|
}()
|
|
|
|
|
2024-07-26 09:46:01 -04:00
|
|
|
var conn net.Conn
|
2024-04-08 04:11:09 -04:00
|
|
|
killCh := make(chan struct{})
|
|
|
|
attachCh := make(chan struct{})
|
|
|
|
fakeCLI := test.NewFakeCli(&fakeClient{
|
|
|
|
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *specs.Platform, _ string) (container.CreateResponse, error) {
|
|
|
|
return container.CreateResponse{
|
|
|
|
ID: "id",
|
|
|
|
}, nil
|
|
|
|
},
|
|
|
|
containerKillFunc: func(ctx context.Context, containerID, signal string) error {
|
|
|
|
killCh <- struct{}{}
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
containerAttachFunc: func(ctx context.Context, containerID string, options container.AttachOptions) (types.HijackedResponse, error) {
|
|
|
|
server, client := net.Pipe()
|
2024-07-26 09:46:01 -04:00
|
|
|
conn = server
|
2024-04-08 04:11:09 -04:00
|
|
|
t.Cleanup(func() {
|
|
|
|
_ = server.Close()
|
|
|
|
})
|
|
|
|
attachCh <- struct{}{}
|
|
|
|
return types.NewHijackedResponse(client, types.MediaTypeRawStream), nil
|
|
|
|
},
|
2024-07-26 09:46:01 -04:00
|
|
|
waitFunc: func(_ string) (<-chan container.WaitResponse, <-chan error) {
|
|
|
|
responseChan := make(chan container.WaitResponse, 1)
|
|
|
|
errChan := make(chan error)
|
|
|
|
|
|
|
|
responseChan <- container.WaitResponse{
|
|
|
|
StatusCode: 130,
|
|
|
|
}
|
|
|
|
return responseChan, errChan
|
|
|
|
},
|
|
|
|
// use new (non-legacy) wait API
|
|
|
|
// see: 38591f20d07795aaef45d400df89ca12f29c603b
|
|
|
|
Version: "1.30",
|
2024-04-08 04:11:09 -04:00
|
|
|
}, func(fc *test.FakeCli) {
|
|
|
|
fc.SetOut(streams.NewOut(tty))
|
|
|
|
fc.SetIn(streams.NewIn(tty))
|
|
|
|
})
|
|
|
|
|
|
|
|
cmd := NewRunCommand(fakeCLI)
|
|
|
|
cmd.SetArgs([]string{"-it", "busybox"})
|
|
|
|
cmd.SilenceUsage = true
|
2024-07-26 09:46:01 -04:00
|
|
|
cmdErrC := make(chan error, 1)
|
2024-04-08 04:11:09 -04:00
|
|
|
go func() {
|
2024-07-26 09:46:01 -04:00
|
|
|
cmdErrC <- cmd.Execute()
|
2024-04-08 04:11:09 -04:00
|
|
|
}()
|
|
|
|
|
2024-07-26 09:46:01 -04:00
|
|
|
// run command should attempt to attach to the container
|
2024-04-08 04:11:09 -04:00
|
|
|
select {
|
|
|
|
case <-time.After(5 * time.Second):
|
2024-07-26 09:46:01 -04:00
|
|
|
t.Fatal("containerAttachFunc was not called before the timeout")
|
2024-04-08 04:11:09 -04:00
|
|
|
case <-attachCh:
|
|
|
|
}
|
|
|
|
|
2024-07-26 09:46:01 -04:00
|
|
|
assert.NilError(t, syscall.Kill(syscall.Getpid(), syscall.SIGINT))
|
|
|
|
// end stream from "container" so that we'll detach
|
|
|
|
conn.Close()
|
|
|
|
|
2024-04-08 04:11:09 -04:00
|
|
|
select {
|
|
|
|
case <-killCh:
|
2024-07-26 09:46:01 -04:00
|
|
|
case <-time.After(5 * time.Second):
|
|
|
|
t.Fatal("containerKillFunc was not called before the timeout")
|
|
|
|
}
|
|
|
|
|
|
|
|
select {
|
|
|
|
case cmdErr := <-cmdErrC:
|
|
|
|
assert.Equal(t, cmdErr, cli.StatusError{
|
|
|
|
StatusCode: 130,
|
|
|
|
})
|
|
|
|
case <-time.After(2 * time.Second):
|
|
|
|
t.Fatal("cmd did not return before the timeout")
|
2024-04-08 04:11:09 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-06 05:15:18 -05:00
|
|
|
func TestRunCommandWithContentTrustErrors(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
name string
|
|
|
|
args []string
|
|
|
|
expectedError string
|
|
|
|
notaryFunc test.NotaryClientFuncType
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "offline-notary-server",
|
|
|
|
notaryFunc: notary.GetOfflineNotaryRepository,
|
|
|
|
expectedError: "client is offline",
|
|
|
|
args: []string{"image:tag"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "uninitialized-notary-server",
|
|
|
|
notaryFunc: notary.GetUninitializedNotaryRepository,
|
|
|
|
expectedError: "remote trust data does not exist",
|
|
|
|
args: []string{"image:tag"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "empty-notary-server",
|
|
|
|
notaryFunc: notary.GetEmptyTargetsNotaryRepository,
|
|
|
|
expectedError: "No valid trust data for tag",
|
|
|
|
args: []string{"image:tag"},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tc := range testCases {
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
tc := tc
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
fakeCLI := test.NewFakeCli(&fakeClient{
|
|
|
|
createContainerFunc: func(config *container.Config,
|
|
|
|
hostConfig *container.HostConfig,
|
|
|
|
networkingConfig *network.NetworkingConfig,
|
|
|
|
platform *specs.Platform,
|
|
|
|
containerName string,
|
|
|
|
) (container.CreateResponse, error) {
|
|
|
|
return container.CreateResponse{}, errors.New("shouldn't try to pull image")
|
|
|
|
},
|
|
|
|
}, test.EnableContentTrust)
|
|
|
|
fakeCLI.SetNotaryClient(tc.notaryFunc)
|
|
|
|
cmd := NewRunCommand(fakeCLI)
|
|
|
|
cmd.SetArgs(tc.args)
|
|
|
|
cmd.SetOut(io.Discard)
|
|
|
|
cmd.SetErr(io.Discard)
|
|
|
|
err := cmd.Execute()
|
cli/command/container: remove reportError, and put StatusError to use
The `reportError` utility was present because cli.StatusError would print
the error decorated with `Status: <error-message>, Code: <exit-code>`.
That was not desirable in many cases as it would mess-up the output. To
prevent this, the CLI had code to check for an empty `Status` (error message)
in which case the error would be "ignored" (and only used for the exit-status),
and the `reportError` utility would be used to manually print a custom error
message before returning the error.
Now that bca209006153d3e025cb3d31c3cd55eb2aec0c4f fixed the output format
of `cli.StatusError`, and 3dd6fc365d853e21f0e11f9e6ab62c4f8ae438e7 and
350a0b68a9584ec9ae712b6eca906c1018ba6dac no longer discard these error,
we can get rid of this utility, and just set the error-message for
the status-error.
This patch:
- Introduces a `withHelp` which takes care of decorating errors with
a "Run --help" hint for the user.
- Introduces a `toStatusError` utility that detects certain errors in
the container to assign a corresponding exit-code (these error-codes
can be used to distinguish "client" errors from "container" errors).
- Removes the `reportError` utility, and removes code that manually
printed errors before returning.
Behavior is mostly unmodified, with the exception of some slight reformatting
of the errors:
- `withHelp` adds a `docker:` prefix to the error, to indicate the error
is produced by the `docker` command. This prefix was already present
in most cases.
- The "--help" hint is slightly updated ("Run 'docker run --help' for
more information" instead of "See 'docker run --help'"), to make it
more clear that it's a "call to action".
- An empty is added before the "--help" hint to separate it better from
the error-message.
Before this patch:
$ docker run --pull=invalid-option alpine
docker: invalid pull option: 'invalid-option': must be one of "always", "missing" or "never".
See 'docker run --help'.
$ echo $?
125
$ docker run --rm alpine nosuchcommand
docker: Error response from daemon: failed to create task for container: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: exec: "nosuchcommand": executable file not found in $PATH: unknown.
$ echo $?
127
With this patch:
$ docker run --pull=invalid-option alpine
docker: invalid pull option: 'invalid-option': must be one of "always", "missing" or "never"
Run 'docker run --help' for more information
$ echo $?
125
$ docker run --rm alpine nosuchcommand
docker: Error response from daemon: failed to create task for container: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: exec: "nosuchcommand": executable file not found in $PATH: unknown.
Run 'docker run --help' for more information
$ echo $?
127
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-04 07:18:03 -04:00
|
|
|
statusErr := cli.StatusError{}
|
|
|
|
assert.Check(t, errors.As(err, &statusErr))
|
|
|
|
assert.Check(t, is.Equal(statusErr.StatusCode, 125))
|
|
|
|
assert.Check(t, is.ErrorContains(err, tc.expectedError))
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
})
|
2018-03-06 05:15:18 -05:00
|
|
|
}
|
|
|
|
}
|
2022-06-27 11:16:44 -04:00
|
|
|
|
|
|
|
func TestRunContainerImagePullPolicyInvalid(t *testing.T) {
|
|
|
|
cases := []struct {
|
|
|
|
PullPolicy string
|
|
|
|
ExpectedErrMsg string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
PullPolicy: "busybox:latest",
|
|
|
|
ExpectedErrMsg: `invalid pull option: 'busybox:latest': must be one of "always", "missing" or "never"`,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
PullPolicy: "--network=foo",
|
|
|
|
ExpectedErrMsg: `invalid pull option: '--network=foo': must be one of "always", "missing" or "never"`,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
|
|
tc := tc
|
|
|
|
t.Run(tc.PullPolicy, func(t *testing.T) {
|
|
|
|
dockerCli := test.NewFakeCli(&fakeClient{})
|
|
|
|
err := runRun(
|
2023-09-09 18:27:44 -04:00
|
|
|
context.TODO(),
|
2022-06-27 11:16:44 -04:00
|
|
|
dockerCli,
|
|
|
|
&pflag.FlagSet{},
|
|
|
|
&runOptions{createOptions: createOptions{pull: tc.PullPolicy}},
|
|
|
|
&containerOptions{},
|
|
|
|
)
|
|
|
|
|
|
|
|
statusErr := cli.StatusError{}
|
|
|
|
assert.Check(t, errors.As(err, &statusErr))
|
cli/command/container: remove reportError, and put StatusError to use
The `reportError` utility was present because cli.StatusError would print
the error decorated with `Status: <error-message>, Code: <exit-code>`.
That was not desirable in many cases as it would mess-up the output. To
prevent this, the CLI had code to check for an empty `Status` (error message)
in which case the error would be "ignored" (and only used for the exit-status),
and the `reportError` utility would be used to manually print a custom error
message before returning the error.
Now that bca209006153d3e025cb3d31c3cd55eb2aec0c4f fixed the output format
of `cli.StatusError`, and 3dd6fc365d853e21f0e11f9e6ab62c4f8ae438e7 and
350a0b68a9584ec9ae712b6eca906c1018ba6dac no longer discard these error,
we can get rid of this utility, and just set the error-message for
the status-error.
This patch:
- Introduces a `withHelp` which takes care of decorating errors with
a "Run --help" hint for the user.
- Introduces a `toStatusError` utility that detects certain errors in
the container to assign a corresponding exit-code (these error-codes
can be used to distinguish "client" errors from "container" errors).
- Removes the `reportError` utility, and removes code that manually
printed errors before returning.
Behavior is mostly unmodified, with the exception of some slight reformatting
of the errors:
- `withHelp` adds a `docker:` prefix to the error, to indicate the error
is produced by the `docker` command. This prefix was already present
in most cases.
- The "--help" hint is slightly updated ("Run 'docker run --help' for
more information" instead of "See 'docker run --help'"), to make it
more clear that it's a "call to action".
- An empty is added before the "--help" hint to separate it better from
the error-message.
Before this patch:
$ docker run --pull=invalid-option alpine
docker: invalid pull option: 'invalid-option': must be one of "always", "missing" or "never".
See 'docker run --help'.
$ echo $?
125
$ docker run --rm alpine nosuchcommand
docker: Error response from daemon: failed to create task for container: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: exec: "nosuchcommand": executable file not found in $PATH: unknown.
$ echo $?
127
With this patch:
$ docker run --pull=invalid-option alpine
docker: invalid pull option: 'invalid-option': must be one of "always", "missing" or "never"
Run 'docker run --help' for more information
$ echo $?
125
$ docker run --rm alpine nosuchcommand
docker: Error response from daemon: failed to create task for container: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: exec: "nosuchcommand": executable file not found in $PATH: unknown.
Run 'docker run --help' for more information
$ echo $?
127
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-04 07:18:03 -04:00
|
|
|
assert.Check(t, is.Equal(statusErr.StatusCode, 125))
|
|
|
|
assert.Check(t, is.ErrorContains(err, tc.ExpectedErrMsg))
|
2022-06-27 11:16:44 -04:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|