Merge pull request #28919 from allencloud/change-secret-remove-in-cli

change secret remove logic in cli
This commit is contained in:
Vincent Demeester 2016-11-29 15:08:24 +01:00 committed by GitHub
commit 9ab6d420b9
1 changed files with 9 additions and 1 deletions

View File

@ -2,6 +2,7 @@ package secret
import ( import (
"fmt" "fmt"
"strings"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
@ -36,13 +37,20 @@ func runSecretRemove(dockerCli *command.DockerCli, opts removeOptions) error {
return err return err
} }
var errs []string
for _, id := range ids { for _, id := range ids {
if err := client.SecretRemove(ctx, id); err != nil { if err := client.SecretRemove(ctx, id); err != nil {
fmt.Fprintf(dockerCli.Out(), "WARN: %s\n", err) errs = append(errs, err.Error())
continue
} }
fmt.Fprintln(dockerCli.Out(), id) fmt.Fprintln(dockerCli.Out(), id)
} }
if len(errs) > 0 {
return fmt.Errorf("%s", strings.Join(errs, "\n"))
}
return nil return nil
} }