starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-27 17:56:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use Args in cobra.Command to validate args.

Browse Source 
Also re-use context.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fc5a4514fbe1b402d2a0bff170486ac3de4bf8cc
Component: engine
This commit is contained in:
Daniel Nephin
2016-05-31 15:43:16 -07:00
parent 354491fd5d
commit 93473dcef1
7 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/api/client/volume/cmd.go
+3 -7
View File
@@ -14,13 +14,9 @@ func NewVolumeCommand(dockerCli *client.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "volume",
Short: "Manage Docker volumes",
// TODO: remove once cobra is patched to handle this
RunE: func(cmd *cobra.Command, args []string) error {
fmt.Fprintf(dockerCli.Err(), "\n%s", cmd.UsageString())
if len(args) > 0 {
return cli.StatusError{StatusCode: 1}
}
return nil
Args: cli.NoArgs,
Run: func(cmd *cobra.Command, args []string) {
fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString())
},
}
cmd.AddCommand(
components/engine/api/client/volume/create.go
+1 -4
View File
@@ -28,11 +28,8 @@ func newCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "create",
Short: "Create a volume",
Args: cli.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
// TODO: remove once cobra is patched to handle this
if err := cli.AcceptsNoArgs(args, cmd); err != nil {
return err
}
return runCreate(dockerCli, opts)
},
}
components/engine/api/client/volume/inspect.go
+1 -3
View File
@@ -20,10 +20,8 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "inspect [OPTIONS] VOLUME [VOLUME...]",
Short: "Return low-level information on a volume",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if err := cli.MinRequiredArgs(args, 1, cmd); err != nil {
return err
}
opts.names = args
return runInspect(dockerCli, opts)
},
components/engine/api/client/volume/list.go
+1 -4
View File
@@ -34,11 +34,8 @@ func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
Use: "ls",
Aliases: []string{"list"},
Short: "List volumes",
Args: cli.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
// TODO: remove once cobra is patched to handle this
if err := cli.AcceptsNoArgs(args, cmd); err != nil {
return err
}
return runList(dockerCli, opts)
},
}
components/engine/api/client/volume/remove.go
+4 -5
View File
@@ -15,10 +15,8 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
Use: "rm VOLUME [VOLUME]...",
Aliases: []string{"remove"},
Short: "Remove a volume",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if err := cli.MinRequiredArgs(args, 1, cmd); err != nil {
return err
}
return runRemove(dockerCli, args)
},
}
@@ -26,10 +24,11 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
func runRemove(dockerCli *client.DockerCli, volumes []string) error {
client := dockerCli.Client()
var status = 0
ctx := context.Background()
status := 0
for _, name := range volumes {
if err := client.VolumeRemove(context.Background(), name); err != nil {
if err := client.VolumeRemove(ctx, name); err != nil {
fmt.Fprintf(dockerCli.Err(), "%s\n", err)
status = 1
continue