Skip to content

Commit 0640a14

Browse files
dnephindnephin
committed
Move api/client -> cli/command
Using gomvpkg -from github.com/docker/docker/api/client -to github.com/docker/docker/cli/command -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}' Signed-off-by: Daniel Nephin <[email protected]>
1 parent d959e7f commit 0640a14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+343
-348
lines changed

‎api/client/client.go

-5
This file was deleted.

‎api/client/bundlefile/bundlefile.go ‎cli/command/bundlefile/bundlefile.go

File renamed without changes.

‎api/client/bundlefile/bundlefile_test.go ‎cli/command/bundlefile/bundlefile_test.go

File renamed without changes.

‎api/client/cli.go ‎cli/command/cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package client
1+
package command
22

33
import (
44
"errors"

‎api/client/command/commands.go ‎cli/command/commands/commands.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
package command
1+
package commands
22

33
import (
4-
"github.com/docker/docker/api/client"
5-
"github.com/docker/docker/api/client/container"
6-
"github.com/docker/docker/api/client/image"
7-
"github.com/docker/docker/api/client/network"
8-
"github.com/docker/docker/api/client/node"
9-
"github.com/docker/docker/api/client/plugin"
10-
"github.com/docker/docker/api/client/registry"
11-
"github.com/docker/docker/api/client/service"
12-
"github.com/docker/docker/api/client/stack"
13-
"github.com/docker/docker/api/client/swarm"
14-
"github.com/docker/docker/api/client/system"
15-
"github.com/docker/docker/api/client/volume"
4+
"github.com/docker/docker/cli/command"
5+
"github.com/docker/docker/cli/command/container"
6+
"github.com/docker/docker/cli/command/image"
7+
"github.com/docker/docker/cli/command/network"
8+
"github.com/docker/docker/cli/command/node"
9+
"github.com/docker/docker/cli/command/plugin"
10+
"github.com/docker/docker/cli/command/registry"
11+
"github.com/docker/docker/cli/command/service"
12+
"github.com/docker/docker/cli/command/stack"
13+
"github.com/docker/docker/cli/command/swarm"
14+
"github.com/docker/docker/cli/command/system"
15+
"github.com/docker/docker/cli/command/volume"
1616
"github.com/spf13/cobra"
1717
)
1818

1919
// AddCommands adds all the commands from api/client to the root command
20-
func AddCommands(cmd *cobra.Command, dockerCli *client.DockerCli) {
20+
func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
2121
cmd.AddCommand(
2222
node.NewNodeCommand(dockerCli),
2323
service.NewServiceCommand(dockerCli),

‎api/client/container/attach.go ‎cli/command/container/attach.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"golang.org/x/net/context"
99

1010
"github.com/Sirupsen/logrus"
11-
"github.com/docker/docker/api/client"
1211
"github.com/docker/docker/api/types"
1312
"github.com/docker/docker/cli"
13+
"github.com/docker/docker/cli/command"
1414
"github.com/docker/docker/pkg/signal"
1515
"github.com/spf13/cobra"
1616
)
@@ -24,7 +24,7 @@ type attachOptions struct {
2424
}
2525

2626
// NewAttachCommand creates a new cobra.Command for `docker attach`
27-
func NewAttachCommand(dockerCli *client.DockerCli) *cobra.Command {
27+
func NewAttachCommand(dockerCli *command.DockerCli) *cobra.Command {
2828
var opts attachOptions
2929

3030
cmd := &cobra.Command{
@@ -44,7 +44,7 @@ func NewAttachCommand(dockerCli *client.DockerCli) *cobra.Command {
4444
return cmd
4545
}
4646

47-
func runAttach(dockerCli *client.DockerCli, opts *attachOptions) error {
47+
func runAttach(dockerCli *command.DockerCli, opts *attachOptions) error {
4848
ctx := context.Background()
4949
client := dockerCli.Client()
5050

‎api/client/container/commit.go ‎cli/command/container/commit.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"golang.org/x/net/context"
77

8-
"github.com/docker/docker/api/client"
98
"github.com/docker/docker/api/types"
109
"github.com/docker/docker/cli"
10+
"github.com/docker/docker/cli/command"
1111
dockeropts "github.com/docker/docker/opts"
1212
"github.com/spf13/cobra"
1313
)
@@ -23,7 +23,7 @@ type commitOptions struct {
2323
}
2424

2525
// NewCommitCommand creates a new cobra.Command for `docker commit`
26-
func NewCommitCommand(dockerCli *client.DockerCli) *cobra.Command {
26+
func NewCommitCommand(dockerCli *command.DockerCli) *cobra.Command {
2727
var opts commitOptions
2828

2929
cmd := &cobra.Command{
@@ -52,7 +52,7 @@ func NewCommitCommand(dockerCli *client.DockerCli) *cobra.Command {
5252
return cmd
5353
}
5454

55-
func runCommit(dockerCli *client.DockerCli, opts *commitOptions) error {
55+
func runCommit(dockerCli *command.DockerCli, opts *commitOptions) error {
5656
ctx := context.Background()
5757

5858
name := opts.container

‎api/client/container/cp.go ‎cli/command/container/cp.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"golang.org/x/net/context"
1111

12-
"github.com/docker/docker/api/client"
1312
"github.com/docker/docker/api/types"
1413
"github.com/docker/docker/cli"
14+
"github.com/docker/docker/cli/command"
1515
"github.com/docker/docker/pkg/archive"
1616
"github.com/docker/docker/pkg/system"
1717
"github.com/spf13/cobra"
@@ -36,7 +36,7 @@ type cpConfig struct {
3636
}
3737

3838
// NewCopyCommand creates a new `docker cp` command
39-
func NewCopyCommand(dockerCli *client.DockerCli) *cobra.Command {
39+
func NewCopyCommand(dockerCli *command.DockerCli) *cobra.Command {
4040
var opts copyOptions
4141

4242
cmd := &cobra.Command{
@@ -71,7 +71,7 @@ func NewCopyCommand(dockerCli *client.DockerCli) *cobra.Command {
7171
return cmd
7272
}
7373

74-
func runCopy(dockerCli *client.DockerCli, opts copyOptions) error {
74+
func runCopy(dockerCli *command.DockerCli, opts copyOptions) error {
7575
srcContainer, srcPath := splitCpArg(opts.source)
7676
dstContainer, dstPath := splitCpArg(opts.destination)
7777

@@ -103,7 +103,7 @@ func runCopy(dockerCli *client.DockerCli, opts copyOptions) error {
103103
}
104104
}
105105

106-
func statContainerPath(ctx context.Context, dockerCli *client.DockerCli, containerName, path string) (types.ContainerPathStat, error) {
106+
func statContainerPath(ctx context.Context, dockerCli *command.DockerCli, containerName, path string) (types.ContainerPathStat, error) {
107107
return dockerCli.Client().ContainerStatPath(ctx, containerName, path)
108108
}
109109

@@ -115,7 +115,7 @@ func resolveLocalPath(localPath string) (absPath string, err error) {
115115
return archive.PreserveTrailingDotOrSeparator(absPath, localPath), nil
116116
}
117117

118-
func copyFromContainer(ctx context.Context, dockerCli *client.DockerCli, srcContainer, srcPath, dstPath string, cpParam *cpConfig) (err error) {
118+
func copyFromContainer(ctx context.Context, dockerCli *command.DockerCli, srcContainer, srcPath, dstPath string, cpParam *cpConfig) (err error) {
119119
if dstPath != "-" {
120120
// Get an absolute destination path.
121121
dstPath, err = resolveLocalPath(dstPath)
@@ -176,7 +176,7 @@ func copyFromContainer(ctx context.Context, dockerCli *client.DockerCli, srcCont
176176
return archive.CopyTo(preArchive, srcInfo, dstPath)
177177
}
178178

179-
func copyToContainer(ctx context.Context, dockerCli *client.DockerCli, srcPath, dstContainer, dstPath string, cpParam *cpConfig) (err error) {
179+
func copyToContainer(ctx context.Context, dockerCli *command.DockerCli, srcPath, dstContainer, dstPath string, cpParam *cpConfig) (err error) {
180180
if srcPath != "-" {
181181
// Get an absolute source path.
182182
srcPath, err = resolveLocalPath(srcPath)

‎api/client/container/create.go ‎cli/command/container/create.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"golang.org/x/net/context"
99

10-
"github.com/docker/docker/api/client"
1110
"github.com/docker/docker/cli"
11+
"github.com/docker/docker/cli/command"
1212
"github.com/docker/docker/pkg/jsonmessage"
1313
// FIXME migrate to docker/distribution/reference
1414
"github.com/docker/docker/api/types"
@@ -27,7 +27,7 @@ type createOptions struct {
2727
}
2828

2929
// NewCreateCommand creates a new cobra.Command for `docker create`
30-
func NewCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
30+
func NewCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
3131
var opts createOptions
3232
var copts *runconfigopts.ContainerOptions
3333

@@ -53,12 +53,12 @@ func NewCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
5353
// with hostname
5454
flags.Bool("help", false, "Print usage")
5555

56-
client.AddTrustedFlags(flags, true)
56+
command.AddTrustedFlags(flags, true)
5757
copts = runconfigopts.AddFlags(flags)
5858
return cmd
5959
}
6060

61-
func runCreate(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts *createOptions, copts *runconfigopts.ContainerOptions) error {
61+
func runCreate(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts *createOptions, copts *runconfigopts.ContainerOptions) error {
6262
config, hostConfig, networkingConfig, err := runconfigopts.Parse(flags, copts)
6363
if err != nil {
6464
reportError(dockerCli.Err(), "create", err.Error(), true)
@@ -72,7 +72,7 @@ func runCreate(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts *createOp
7272
return nil
7373
}
7474

75-
func pullImage(ctx context.Context, dockerCli *client.DockerCli, image string, out io.Writer) error {
75+
func pullImage(ctx context.Context, dockerCli *command.DockerCli, image string, out io.Writer) error {
7676
ref, err := reference.ParseNamed(image)
7777
if err != nil {
7878
return err
@@ -85,7 +85,7 @@ func pullImage(ctx context.Context, dockerCli *client.DockerCli, image string, o
8585
}
8686

8787
authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index)
88-
encodedAuth, err := client.EncodeAuthToBase64(authConfig)
88+
encodedAuth, err := command.EncodeAuthToBase64(authConfig)
8989
if err != nil {
9090
return err
9191
}
@@ -147,7 +147,7 @@ func newCIDFile(path string) (*cidFile, error) {
147147
return &cidFile{path: path, file: f}, nil
148148
}
149149

150-
func createContainer(ctx context.Context, dockerCli *client.DockerCli, config *container.Config, hostConfig *container.HostConfig, networkingConfig *networktypes.NetworkingConfig, cidfile, name string) (*types.ContainerCreateResponse, error) {
150+
func createContainer(ctx context.Context, dockerCli *command.DockerCli, config *container.Config, hostConfig *container.HostConfig, networkingConfig *networktypes.NetworkingConfig, cidfile, name string) (*types.ContainerCreateResponse, error) {
151151
stderr := dockerCli.Err()
152152

153153
var containerIDFile *cidFile
@@ -167,7 +167,7 @@ func createContainer(ctx context.Context, dockerCli *client.DockerCli, config *c
167167
if ref != nil {
168168
ref = reference.WithDefaultTag(ref)
169169

170-
if ref, ok := ref.(reference.NamedTagged); ok && client.IsTrusted() {
170+
if ref, ok := ref.(reference.NamedTagged); ok && command.IsTrusted() {
171171
var err error
172172
trustedRef, err = dockerCli.TrustedReference(ctx, ref)
173173
if err != nil {

‎api/client/container/diff.go ‎cli/command/container/diff.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"golang.org/x/net/context"
77

8-
"github.com/docker/docker/api/client"
98
"github.com/docker/docker/cli"
9+
"github.com/docker/docker/cli/command"
1010
"github.com/docker/docker/pkg/archive"
1111
"github.com/spf13/cobra"
1212
)
@@ -16,7 +16,7 @@ type diffOptions struct {
1616
}
1717

1818
// NewDiffCommand creates a new cobra.Command for `docker diff`
19-
func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command {
19+
func NewDiffCommand(dockerCli *command.DockerCli) *cobra.Command {
2020
var opts diffOptions
2121

2222
return &cobra.Command{
@@ -30,7 +30,7 @@ func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command {
3030
}
3131
}
3232

33-
func runDiff(dockerCli *client.DockerCli, opts *diffOptions) error {
33+
func runDiff(dockerCli *command.DockerCli, opts *diffOptions) error {
3434
if opts.container == "" {
3535
return fmt.Errorf("Container name cannot be empty")
3636
}

‎api/client/container/exec.go ‎cli/command/container/exec.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"golang.org/x/net/context"
88

99
"github.com/Sirupsen/logrus"
10-
"github.com/docker/docker/api/client"
1110
"github.com/docker/docker/api/types"
1211
"github.com/docker/docker/cli"
12+
"github.com/docker/docker/cli/command"
1313
apiclient "github.com/docker/docker/client"
1414
"github.com/docker/docker/pkg/promise"
1515
"github.com/spf13/cobra"
@@ -25,7 +25,7 @@ type execOptions struct {
2525
}
2626

2727
// NewExecCommand creats a new cobra.Command for `docker exec`
28-
func NewExecCommand(dockerCli *client.DockerCli) *cobra.Command {
28+
func NewExecCommand(dockerCli *command.DockerCli) *cobra.Command {
2929
var opts execOptions
3030

3131
cmd := &cobra.Command{
@@ -52,7 +52,7 @@ func NewExecCommand(dockerCli *client.DockerCli) *cobra.Command {
5252
return cmd
5353
}
5454

55-
func runExec(dockerCli *client.DockerCli, opts *execOptions, container string, execCmd []string) error {
55+
func runExec(dockerCli *command.DockerCli, opts *execOptions, container string, execCmd []string) error {
5656
execConfig, err := parseExec(opts, container, execCmd)
5757
// just in case the ParseExec does not exit
5858
if container == "" || err != nil {

‎api/client/container/exec_test.go ‎cli/command/container/exec_test.go

File renamed without changes.

‎api/client/container/export.go ‎cli/command/container/export.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"golang.org/x/net/context"
88

9-
"github.com/docker/docker/api/client"
109
"github.com/docker/docker/cli"
10+
"github.com/docker/docker/cli/command"
1111
"github.com/spf13/cobra"
1212
)
1313

@@ -17,7 +17,7 @@ type exportOptions struct {
1717
}
1818

1919
// NewExportCommand creates a new `docker export` command
20-
func NewExportCommand(dockerCli *client.DockerCli) *cobra.Command {
20+
func NewExportCommand(dockerCli *command.DockerCli) *cobra.Command {
2121
var opts exportOptions
2222

2323
cmd := &cobra.Command{
@@ -37,7 +37,7 @@ func NewExportCommand(dockerCli *client.DockerCli) *cobra.Command {
3737
return cmd
3838
}
3939

40-
func runExport(dockerCli *client.DockerCli, opts exportOptions) error {
40+
func runExport(dockerCli *command.DockerCli, opts exportOptions) error {
4141
if opts.output == "" && dockerCli.Out().IsTerminal() {
4242
return errors.New("Cowardly refusing to save to a terminal. Use the -o flag or redirect.")
4343
}
@@ -55,5 +55,5 @@ func runExport(dockerCli *client.DockerCli, opts exportOptions) error {
5555
return err
5656
}
5757

58-
return client.CopyToFile(opts.output, responseBody)
58+
return command.CopyToFile(opts.output, responseBody)
5959
}

‎api/client/container/hijack.go ‎cli/command/container/hijack.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import (
66
"sync"
77

88
"github.com/Sirupsen/logrus"
9-
"github.com/docker/docker/api/client"
9+
"github.com/docker/docker/cli/command"
1010
"github.com/docker/docker/api/types"
1111
"github.com/docker/docker/pkg/stdcopy"
1212
"golang.org/x/net/context"
1313
)
1414

1515
type streams interface {
16-
In() *client.InStream
17-
Out() *client.OutStream
16+
In() *command.InStream
17+
Out() *command.OutStream
1818
}
1919

2020
// holdHijackedConnection handles copying input to and output from streams to the

‎api/client/container/kill.go ‎cli/command/container/kill.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"golang.org/x/net/context"
88

9-
"github.com/docker/docker/api/client"
109
"github.com/docker/docker/cli"
10+
"github.com/docker/docker/cli/command"
1111
"github.com/spf13/cobra"
1212
)
1313

@@ -18,7 +18,7 @@ type killOptions struct {
1818
}
1919

2020
// NewKillCommand creates a new cobra.Command for `docker kill`
21-
func NewKillCommand(dockerCli *client.DockerCli) *cobra.Command {
21+
func NewKillCommand(dockerCli *command.DockerCli) *cobra.Command {
2222
var opts killOptions
2323

2424
cmd := &cobra.Command{
@@ -36,7 +36,7 @@ func NewKillCommand(dockerCli *client.DockerCli) *cobra.Command {
3636
return cmd
3737
}
3838

39-
func runKill(dockerCli *client.DockerCli, opts *killOptions) error {
39+
func runKill(dockerCli *command.DockerCli, opts *killOptions) error {
4040
var errs []string
4141
ctx := context.Background()
4242
for _, name := range opts.containers {

0 commit comments

Comments
 (0)