log s3 batch deletes (#5204)

* log s3 batch deletes
project-koku · Jul 3, 2024 · 67af027 · 67af027
1 parent bdbbfee
commit 67af027
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/koku/masu/test/util/aws/test_common.py b/koku/masu/test/util/aws/test_common.py
@@ -491,7 +491,7 @@ def test_batch_delete_s3_objects(self, mock_resource):
         mock_bucket.delete_objects.assert_has_calls(
             [call(Delete={"Objects": expected_keys[:1000]}), call(Delete={"Objects": expected_keys[1000:]})]
         )
-        self.assertIn("removed files from s3 bucket", captured_logs.output[-1])
+        self.assertIn("removed batch files from s3 bucket", captured_logs.output[-1])
 
     def test_remove_s3_objects_not_matching_metadata(self):
         """Test remove_s3_objects_not_matching_metadata."""

diff --git a/koku/masu/util/aws/common.py b/koku/masu/util/aws/common.py
@@ -803,15 +803,15 @@ def delete_s3_objects(request_id, keys_to_delete, context) -> list[str]:
             batch_end = batch_start + batch_size
             object_keys_batch = keys_to_delete[batch_start:batch_end]
             s3_bucket.delete_objects(Delete={"Objects": object_keys_batch})
-        LOG.info(
-            log_json(
-                request_id,
-                msg="removed files from s3 bucket",
-                context=context,
-                bucket=settings.S3_BUCKET_NAME,
-                file_list=keys_to_delete,
+            LOG.info(
+                log_json(
+                    request_id,
+                    msg="removed batch files from s3 bucket",
+                    context=context,
+                    bucket=settings.S3_BUCKET_NAME,
+                    file_list=object_keys_batch,
+                )
             )
-        )
         return keys_to_delete
     except (EndpointConnectionError, ClientError) as err:
         LOG.warning(