Pass operation name to awscrt.s3

boto · Jun 21, 2024 · 81e1de2 · 81e1de2
1 parent 407232b
commit 81e1de2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/s3transfer/crt.py b/s3transfer/crt.py
@@ -818,13 +818,22 @@ def _default_get_make_request_args(
         on_done_before_calls,
         on_done_after_calls,
     ):
+        crt_request_type = getattr(
+            S3RequestType, request_type.upper(), S3RequestType.DEFAULT
+        )
+
+        # For DEFAULT requests, CRT requires the official S3 operation name.
+        # So transform string like "delete_object" -> "DeleteObject".
+        operation_name = None
+        if crt_request_type == S3RequestType.DEFAULT:
+            operation_name = ''.join(x.title() for x in request_type.split('_'))
+
         make_request_args = {
             'request': self._request_serializer.serialize_http_request(
                 request_type, future
             ),
-            'type': getattr(
-                S3RequestType, request_type.upper(), S3RequestType.DEFAULT
-            ),
+            'type': crt_request_type,
+            'operation_name': operation_name,
             'on_done': self.get_crt_callback(
                 future, 'done', on_done_before_calls, on_done_after_calls
             ),

diff --git a/tests/functional/test_crt.py b/tests/functional/test_crt.py
@@ -515,6 +515,7 @@ def test_delete(self):
             {
                 'request': mock.ANY,
                 'type': awscrt.s3.S3RequestType.DEFAULT,
+                'operation_name': "DeleteObject",
                 'on_progress': mock.ANY,
                 'on_done': mock.ANY,
             },

diff --git a/tests/integration/test_crt.py b/tests/integration/test_crt.py
@@ -13,6 +13,9 @@
 import glob
 import io
 import os
+from uuid import uuid4
+
+from botocore.exceptions import ClientError
 
 from s3transfer.subscribers import BaseSubscriber
 from s3transfer.utils import OSUtils
@@ -404,6 +407,15 @@ def test_delete(self):
             future.result()
         self.assertTrue(self.object_not_exists('foo.txt'))
 
+    def test_delete_exception_no_such_bucket(self):
+        # delete() uses awscrt.s3.S3RequestType.DEFAULT under the hood.
+        # Test that CRT exceptions translate properly into the botocore exceptions.
+        transfer = self._create_s3_transfer()
+        with self.assertRaises(ClientError) as ctx:
+            future = transfer.delete(f"{self.bucket_name}-NONEXISTENT-{uuid4()}", "foo.txt")
+            future.result()
+        self.assertEqual(ctx.exception.__class__.__name__, 'NoSuchBucket')
+
     def test_many_files_download(self):
         transfer = self._create_s3_transfer()