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

cli/command/manifest: 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:30:25 +01:00
parent 1fd9d0dd34
commit f8729c6da2
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cli/command/manifest/rm.go
View File

@ -2,12 +2,11 @@ package manifest
import ( import (
"context" "context"
"strings" "errors"
"github.com/docker/cli/cli" "github.com/docker/cli/cli"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
manifeststore "github.com/docker/cli/cli/manifest/store" manifeststore "github.com/docker/cli/cli/manifest/store"
"github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -25,28 +24,25 @@ func newRmManifestListCommand(dockerCLI command.Cli) *cobra.Command {
} }
func runRemove(ctx context.Context, store manifeststore.Store, targets []string) error { func runRemove(ctx context.Context, store manifeststore.Store, targets []string) error {
var errs []string var errs []error
for _, target := range targets { for _, target := range targets {
if ctx.Err() != nil { if ctx.Err() != nil {
return ctx.Err() return ctx.Err()
} }
targetRef, err := normalizeReference(target) targetRef, err := normalizeReference(target)
if err != nil { if err != nil {
errs = append(errs, err.Error()) errs = append(errs, err)
continue continue
} }
_, err = store.GetList(targetRef) _, err = store.GetList(targetRef)
if err != nil { if err != nil {
errs = append(errs, err.Error()) errs = append(errs, err)
continue continue
} }
err = store.Remove(targetRef) err = store.Remove(targetRef)
if err != nil { if err != nil {
errs = append(errs, err.Error()) errs = append(errs, err)
} }
} }
if len(errs) > 0 { return errors.Join(errs...)
return errors.New(strings.Join(errs, "\n"))
}
return nil
} }