Skip to content

Commit 14712f9

Browse files
dnephindnephin
committed
Remove old cli framework.
Also consolidate the leftover packages under cli. Remove pkg/mflag. Make manpage generation work with new cobra layout. Remove remaining mflag and fix tests after rebase with master. Signed-off-by: Daniel Nephin <[email protected]>
1 parent 31bf9ca commit 14712f9

22 files changed

Lines changed: 116 additions & 2279 deletions

File tree

‎api/client/command/commands.go‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package command
2+
3+
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"
16+
"github.com/spf13/cobra"
17+
)
18+
19+
// AddCommands adds all the commands from api/client to the root command
20+
func AddCommands(cmd *cobra.Command, dockerCli *client.DockerCli) {
21+
cmd.AddCommand(
22+
node.NewNodeCommand(dockerCli),
23+
service.NewServiceCommand(dockerCli),
24+
stack.NewStackCommand(dockerCli),
25+
stack.NewTopLevelDeployCommand(dockerCli),
26+
swarm.NewSwarmCommand(dockerCli),
27+
container.NewAttachCommand(dockerCli),
28+
container.NewCommitCommand(dockerCli),
29+
container.NewCopyCommand(dockerCli),
30+
container.NewCreateCommand(dockerCli),
31+
container.NewDiffCommand(dockerCli),
32+
container.NewExecCommand(dockerCli),
33+
container.NewExportCommand(dockerCli),
34+
container.NewKillCommand(dockerCli),
35+
container.NewLogsCommand(dockerCli),
36+
container.NewPauseCommand(dockerCli),
37+
container.NewPortCommand(dockerCli),
38+
container.NewPsCommand(dockerCli),
39+
container.NewRenameCommand(dockerCli),
40+
container.NewRestartCommand(dockerCli),
41+
container.NewRmCommand(dockerCli),
42+
container.NewRunCommand(dockerCli),
43+
container.NewStartCommand(dockerCli),
44+
container.NewStatsCommand(dockerCli),
45+
container.NewStopCommand(dockerCli),
46+
container.NewTopCommand(dockerCli),
47+
container.NewUnpauseCommand(dockerCli),
48+
container.NewUpdateCommand(dockerCli),
49+
container.NewWaitCommand(dockerCli),
50+
image.NewBuildCommand(dockerCli),
51+
image.NewHistoryCommand(dockerCli),
52+
image.NewImagesCommand(dockerCli),
53+
image.NewLoadCommand(dockerCli),
54+
image.NewRemoveCommand(dockerCli),
55+
image.NewSaveCommand(dockerCli),
56+
image.NewPullCommand(dockerCli),
57+
image.NewPushCommand(dockerCli),
58+
image.NewSearchCommand(dockerCli),
59+
image.NewImportCommand(dockerCli),
60+
image.NewTagCommand(dockerCli),
61+
network.NewNetworkCommand(dockerCli),
62+
system.NewEventsCommand(dockerCli),
63+
system.NewInspectCommand(dockerCli),
64+
registry.NewLoginCommand(dockerCli),
65+
registry.NewLogoutCommand(dockerCli),
66+
system.NewVersionCommand(dockerCli),
67+
volume.NewVolumeCommand(dockerCli),
68+
system.NewInfoCommand(dockerCli),
69+
)
70+
plugin.NewPluginCommand(cmd, dockerCli)
71+
}

‎api/client/commands.go‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎api/client/container/run.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/Sirupsen/logrus"
1515
"github.com/docker/docker/api/client"
1616
"github.com/docker/docker/cli"
17-
"github.com/docker/docker/cli/cobraadaptor"
1817
opttypes "github.com/docker/docker/opts"
1918
"github.com/docker/docker/pkg/promise"
2019
"github.com/docker/docker/pkg/signal"
@@ -70,7 +69,7 @@ func NewRunCommand(dockerCli *client.DockerCli) *cobra.Command {
7069

7170
func flagErrorFunc(cmd *cobra.Command, err error) error {
7271
return cli.StatusError{
73-
Status: cobraadaptor.FlagErrorFunc(cmd, err).Error(),
72+
Status: cli.FlagErrorFunc(cmd, err).Error(),
7473
StatusCode: 125,
7574
}
7675
}

‎cli/cli.go‎

Lines changed: 0 additions & 191 deletions
This file was deleted.

cli/cobraadaptor/adaptor.go renamed to cli/cobra.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cobraadaptor
1+
package cli
22

33
import (
44
"fmt"
@@ -17,12 +17,6 @@ func SetupRootCommand(rootCmd *cobra.Command) {
1717
rootCmd.PersistentFlags().MarkShorthandDeprecated("help", "please use --help")
1818
}
1919

20-
// GetRootCommand returns the root command. Required to generate the man pages
21-
// and reference docs from a script outside this package.
22-
func (c CobraAdaptor) GetRootCommand() *cobra.Command {
23-
return c.rootCmd
24-
}
25-
2620
// FlagErrorFunc prints an error messages which matches the format of the
2721
// docker/docker/cli error messages
2822
func FlagErrorFunc(cmd *cobra.Command, err error) error {

‎cli/error.go‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package cli
22

3-
import "strings"
3+
import (
4+
"fmt"
5+
"strings"
6+
)
47

58
// Errors is a list of errors.
69
// Useful in a loop if you don't want to return the error right away and you want to display after the loop,
@@ -18,3 +21,13 @@ func (errList Errors) Error() string {
1821
}
1922
return strings.Join(out, ", ")
2023
}
24+
25+
// StatusError reports an unsuccessful exit by a command.
26+
type StatusError struct {
27+
Status string
28+
StatusCode int
29+
}
30+
31+
func (e StatusError) Error() string {
32+
return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)
33+
}

‎cli/usage.go‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)