storage: handle errors in batch objects delete action

cmd/storage_delete.go

@@ -1,7 +1,9 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -86,6 +88,18 @@ argument with "/":
 
 		deleted, err := storage.DeleteObjects(gContext, bucket, prefix, recursive)
 		if err != nil {
+			e := sos.NewBatchErrorList()
+			if errors.As(err, e) {
+				if verbose {
+					for _, o := range deleted {
+						fmt.Println(aws.ToString(o.Key))
+					}
+				}
+
+				for _, e := range e.List {
+					fmt.Fprintln(os.Stderr, e)
+				}
+			}
 			return fmt.Errorf("unable to delete objects: %w", err)
 		}
 

pkg/storage/sos/object.go

@@ -31,6 +31,28 @@ import (
 	"github.com/exoscale/cli/utils"
 )
 
+// BatchErrorList contains list of errors parsed from AWS SDK types.DeletedObject Error attribute.
+// Only Message attribute of each types.Error object is taken and converted to std Error.
+type BatchErrorList struct {
+	List []error
+}
+
+func NewBatchErrorList() *BatchErrorList {
+	return &BatchErrorList{
+		[]error{},
+	}
+}
+
+func (l BatchErrorList) Error() string {
+	return fmt.Sprintf("batch job returned %d errors", len(l.List))
+}
+
+func (l *BatchErrorList) AddErrors(errs []types.Error) {
+	for _, err := range errs {
+		l.List = append(l.List, fmt.Errorf("%s", err.Message))
+	}
+}
+
 func (c *Client) DeleteObjects(ctx context.Context, bucket, prefix string, recursive bool) ([]types.DeletedObject, error) {
 	deleteList := make([]types.ObjectIdentifier, 0)
 	err := c.ForEachObject(ctx, bucket, prefix, recursive, func(o *types.Object) error {
@@ -45,6 +67,7 @@ func (c *Client) DeleteObjects(ctx context.Context, bucket, prefix string, recur
 	// precaution we're batching deletes.
 	maxKeys := 1000
 	deleted := make([]types.DeletedObject, 0)
+	errs := NewBatchErrorList()
 
 	for i := 0; i < len(deleteList); i += maxKeys {
 		j := i + maxKeys
@@ -61,6 +84,11 @@ func (c *Client) DeleteObjects(ctx context.Context, bucket, prefix string, recur
 		}
 
 		deleted = append(deleted, res.Deleted...)
+		errs.AddErrors(res.Errors)
+	}
+
+	if len(errs.List) > 0 {
+		return deleted, errs
 	}
 
 	return deleted, nil