diff --git a/cli/command/plugin/remove.go b/cli/command/plugin/remove.go index 2614cab3ac..36b0013105 100644 --- a/cli/command/plugin/remove.go +++ b/cli/command/plugin/remove.go @@ -2,6 +2,7 @@ package plugin import ( "context" + "errors" "fmt" "github.com/docker/cli/cli" @@ -36,17 +37,13 @@ func newRemoveCommand(dockerCli command.Cli) *cobra.Command { } func runRemove(ctx context.Context, dockerCli command.Cli, opts *rmOptions) error { - var errs cli.Errors + var errs error for _, name := range opts.plugins { if err := dockerCli.Client().PluginRemove(ctx, name, types.PluginRemoveOptions{Force: opts.force}); err != nil { - errs = append(errs, err) + errs = errors.Join(errs, err) continue } - fmt.Fprintln(dockerCli.Out(), name) + _, _ = fmt.Fprintln(dockerCli.Out(), name) } - // Do not simplify to `return errs` because even if errs == nil, it is not a nil-error interface value. - if errs != nil { - return errs - } - return nil + return errs } diff --git a/cli/error.go b/cli/error.go index 8fb2ab3671..8c4a5f952b 100644 --- a/cli/error.go +++ b/cli/error.go @@ -2,26 +2,8 @@ package cli import ( "strconv" - "strings" ) -// Errors is a list of errors. -// Useful in a loop if you don't want to return the error right away and you want to display after the loop, -// all the errors that happened during the loop. -type Errors []error - -func (errList Errors) Error() string { - if len(errList) < 1 { - return "" - } - - out := make([]string, len(errList)) - for i := range errList { - out[i] = errList[i].Error() - } - return strings.Join(out, ", ") -} - // StatusError reports an unsuccessful exit by a command. type StatusError struct { Status string