This patch deprecates exported container commands and moves the
implementation details to an unexported function.
Commands that are affected include:
- container.NewRunCommand
- container.NewExecCommand
- container.NewPsCommand
- container.NewContainerCommand
- container.NewAttachCommand
- container.NewCommitCommand
- container.NewCopyCommand
- container.NewCreateCommand
- container.NewDiffCommand
- container.NewExportCommand
- container.NewKillCommand
- container.NewLogsCommand
- container.NewPauseCommand
- container.NewPortCommand
- container.NewRenameCommand
- container.NewRestartCommand
- container.NewRmCommand
- container.NewStartCommand
- container.NewStatsCommand
- container.NewStopCommand
- container.NewTopCommand
- container.NewUnpauseCommand
- container.NewUpdateCommand
- container.NewWaitCommand
- container.NewPruneCommand
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
(cherry picked from commit 38595fecb6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
80 lines
1.6 KiB
Go
80 lines
1.6 KiB
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/docker/docker/api/types/container"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestRunDiff(t *testing.T) {
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
containerDiffFunc: func(
|
|
ctx context.Context,
|
|
containerID string,
|
|
) ([]container.FilesystemChange, error) {
|
|
return []container.FilesystemChange{
|
|
{
|
|
Kind: container.ChangeModify,
|
|
Path: "/path/to/file0",
|
|
},
|
|
{
|
|
Kind: container.ChangeAdd,
|
|
Path: "/path/to/file1",
|
|
},
|
|
{
|
|
Kind: container.ChangeDelete,
|
|
Path: "/path/to/file2",
|
|
},
|
|
}, nil
|
|
},
|
|
})
|
|
|
|
cmd := newDiffCommand(cli)
|
|
cmd.SetOut(io.Discard)
|
|
|
|
cmd.SetArgs([]string{"container-id"})
|
|
|
|
err := cmd.Execute()
|
|
assert.NilError(t, err)
|
|
|
|
diff := strings.SplitN(cli.OutBuffer().String(), "\n", 3)
|
|
assert.Assert(t, is.Len(diff, 3))
|
|
|
|
file0 := strings.TrimSpace(diff[0])
|
|
file1 := strings.TrimSpace(diff[1])
|
|
file2 := strings.TrimSpace(diff[2])
|
|
|
|
assert.Check(t, is.Equal(file0, "C /path/to/file0"))
|
|
assert.Check(t, is.Equal(file1, "A /path/to/file1"))
|
|
assert.Check(t, is.Equal(file2, "D /path/to/file2"))
|
|
}
|
|
|
|
func TestRunDiffClientError(t *testing.T) {
|
|
clientError := errors.New("client error")
|
|
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
containerDiffFunc: func(
|
|
ctx context.Context,
|
|
containerID string,
|
|
) ([]container.FilesystemChange, error) {
|
|
return nil, clientError
|
|
},
|
|
})
|
|
|
|
cmd := newDiffCommand(cli)
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
|
|
cmd.SetArgs([]string{"container-id"})
|
|
|
|
err := cmd.Execute()
|
|
assert.ErrorIs(t, err, clientError)
|
|
}
|