Modifying S3 Handler

Author: Rakshil Modi

awscli/customizations/s3/s3handler.py

@@ -57,6 +57,7 @@
     relative_path,
     split_s3_bucket_key,
 )
+from awscli.customizations.utils import uni_print
 from awscli.s3transfer.constants import MAX_BATCH_SIZE
 
 LOGGER = logging.getLogger(__name__)
@@ -832,11 +833,10 @@ def _submit_transfer_request_for_batch(self, batches):
                 future = self._transfer_manager.batch_delete(
                     bucket=bucket, objects=objects, extra_args=extra_args
                 )
-                future.result()
-
-                # Report success
-                for fileinfo in fileinfos_in_batch:
-                    self._report_success(fileinfo)
+                response = future.result()
+                self._handle_batch_delete_response(
+                    response, fileinfos_in_batch
+                )
 
             except Exception as e:
                 for fileinfo in fileinfos_in_batch:
@@ -865,3 +865,23 @@ def _format_src_dest(self, fileinfo):
         if hasattr(fileinfo, 'version_id') and fileinfo.version_id:
             src = f"{src} (version {fileinfo.version_id})"
         return src, None
+
+    def _report_error(self, fileinfo, error_message):
+        src, _ = self._format_src_dest(fileinfo)
+        uni_print(f"delete failed: {src} - {error_message}\n")
+
+    def _handle_batch_delete_response(self, response, fileinfos_in_batch):
+        error_objects = {}
+        for error in response.get('Errors', []):
+            key = error['Key']
+            version_id = error.get('VersionId', None)
+            error_objects[(key, version_id)] = error['Message']
+
+        for fileinfo in fileinfos_in_batch:
+            _, key = split_s3_bucket_key(fileinfo.src)
+            if (key, fileinfo.version_id) in error_objects:
+                self._report_error(
+                    fileinfo, error_objects[(key, fileinfo.version_id)]
+                )
+            else:
+                self._report_success(fileinfo)