优化结构

internal/integration/storage/aws_storage.go

@@ -106,8 +106,13 @@ func (s *awsStorage) Compose(ctx context.Context, names []string, destination st
 	return composeFiles(ctx, s, names, destination)
 }
 func (s *awsStorage) DeletePrefix(ctx context.Context, prefix string) error {
+	prefix, err := normalizeDeletePrefix(prefix)
+	if err != nil {
+		return err
+	}
+	cursor := ""
 	for {
-		items, _, more, err := s.List(ctx, prefix, "", 1000)
+		items, next, more, err := s.List(ctx, prefix, cursor, 1000)
 		if err != nil {
 			return err
 		}
@@ -116,9 +121,13 @@ func (s *awsStorage) DeletePrefix(ctx context.Context, prefix string) error {
 				return err
 			}
 		}
-		if !more || len(items) == 0 {
+		if !more {
 			return nil
 		}
+		cursor, err = advanceDeletePrefixCursor(cursor, next, more)
+		if err != nil {
+			return err
+		}
 	}
 }
 func (s *awsStorage) List(ctx context.Context, prefix, cursor string, limit int) ([]*system.StoredFile, string, bool, error) {