1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/command/service: use errors.Join

Browse Source 
Use stdlib multi-errors instead of creating our own

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2025-02-03 19:36:59 +01:00
parent f9e4335564
commit f1193effc0
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/command/service/remove.go
View File

@ -2,12 +2,11 @@ package service
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"strings"
"github.com/docker/cli/cli" "github.com/docker/cli/cli"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -32,17 +31,13 @@ func newRemoveCommand(dockerCli command.Cli) *cobra.Command {
func runRemove(ctx context.Context, dockerCLI command.Cli, serviceIDs []string) error { func runRemove(ctx context.Context, dockerCLI command.Cli, serviceIDs []string) error {
apiClient := dockerCLI.Client() apiClient := dockerCLI.Client()
var errs []string var errs []error
for _, id := range serviceIDs { for _, id := range serviceIDs {
err := apiClient.ServiceRemove(ctx, id) if err := apiClient.ServiceRemove(ctx, id); err != nil {
if err != nil { errs = append(errs, err)
errs = append(errs, err.Error())
continue continue
} }
_, _ = fmt.Fprintln(dockerCLI.Out(), id) _, _ = fmt.Fprintln(dockerCLI.Out(), id)
} }
if len(errs) > 0 { return errors.Join(errs...)
return errors.New(strings.Join(errs, "\n"))
}
return nil
} }