Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29218 from yongtang/28884-secret-inspect-follow-up 

Move secret name or ID prefix resolving from client to daemon
This commit is contained in:
Alexander Morozov 2017-01-27 13:31:04 -08:00 committed by GitHub
parent 0e9401f84b 383ed6f121
commit 53edcd37a2
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/secret/inspect.go
View File

@ -33,13 +33,9 @@ func runSecretInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
client := dockerCli.Client() client := dockerCli.Client()
ctx := context.Background() ctx := context.Background()
ids, err := getCliRequestedSecretIDs(ctx, client, opts.names)
if err != nil {
return err
}
getRef := func(id string) (interface{}, []byte, error) { getRef := func(id string) (interface{}, []byte, error) {
return client.SecretInspectWithRaw(ctx, id) return client.SecretInspectWithRaw(ctx, id)
} }
return inspect.Inspect(dockerCli.Out(), ids, opts.format, getRef) return inspect.Inspect(dockerCli.Out(), opts.names, opts.format, getRef)
} }

11
command/secret/remove.go
View File

@ -33,20 +33,15 @@ func runSecretRemove(dockerCli *command.DockerCli, opts removeOptions) error {
client := dockerCli.Client() client := dockerCli.Client()
ctx := context.Background() ctx := context.Background()
ids, err := getCliRequestedSecretIDs(ctx, client, opts.names)
if err != nil {
return err
}
var errs []string var errs []string
for _, id := range ids { for _, name := range opts.names {
if err := client.SecretRemove(ctx, id); err != nil { if err := client.SecretRemove(ctx, name); err != nil {
errs = append(errs, err.Error()) errs = append(errs, err.Error())
continue continue
} }
fmt.Fprintln(dockerCli.Out(), id) fmt.Fprintln(dockerCli.Out(), name)
} }
if len(errs) > 0 { if len(errs) > 0 {