Updated s3Transfer manager

generating original version

Updated args list

updated transfer manager for upload

Author: Rakshil Modi

awscli/s3transfer/upload.py

@@ -515,7 +515,10 @@ class UploadSubmissionTask(SubmissionTask):
 
     PUT_OBJECT_BLOCKLIST = ["ChecksumType", "MpuObjectSize"]
 
-    CREATE_MULTIPART_BLOCKLIST = FULL_OBJECT_CHECKSUM_ARGS + ["MpuObjectSize", "IfNoneMatch"]
+    CREATE_MULTIPART_BLOCKLIST = FULL_OBJECT_CHECKSUM_ARGS + [
+        "MpuObjectSize",
+        "IfNoneMatch",
+    ]
 
     UPLOAD_PART_ARGS = [
         'ChecksumAlgorithm',
@@ -534,7 +537,7 @@ class UploadSubmissionTask(SubmissionTask):
         'ExpectedBucketOwner',
         'ChecksumType',
         'MpuObjectSize',
-        'IfNoneMatch',
+        "IfNoneMatch",
     ] + FULL_OBJECT_CHECKSUM_ARGS
 
     def _get_upload_input_manager_cls(self, transfer_future):

tests/functional/s3transfer/test_upload.py

@@ -368,7 +368,6 @@ def test_raise_exception_on_s3_object_lambda_resource(self):
             self.manager.upload(self.filename, s3_object_lambda_arn, self.key)
 
     def test_upload_with_no_overwrite_flag_when_object_exists(self):
-        """Test that upload fails when object exists at the destination"""
         self.extra_args['IfNoneMatch'] = '*'
         # Mocking a precondition Error
         self.stubber.add_client_error(
@@ -380,20 +379,21 @@ def test_upload_with_no_overwrite_flag_when_object_exists(self):
                 'Bucket': self.bucket,
                 'Key': self.key,
                 'IfNoneMatch': '*',
-                'ChecksumAlgorithm': DEFAULT_CHECKSUM_ALGORITHM
-            }
+                'ChecksumAlgorithm': DEFAULT_CHECKSUM_ALGORITHM,
+            },
         )
         with self.assertRaises(ClientError) as context:
             future = self.manager.upload(
                 self.filename, self.bucket, self.key, self.extra_args
             )
             future.result()
         # Verify the error is a PreconditionFailed error
-        self.assertEqual(context.exception.response['Error']['Code'], 'PreconditionFailed')
+        self.assertEqual(
+            context.exception.response['Error']['Code'], 'PreconditionFailed'
+        )
         self.stubber.assert_no_pending_responses()
 
     def test_upload_with_no_overwrite_flag_when_object_does_not_exists(self):
-        """Test that upload succeed when object does not exists at the destination"""
         self.extra_args['IfNoneMatch'] = '*'
         self.stubber.add_response(
             'put_object',
@@ -403,8 +403,8 @@ def test_upload_with_no_overwrite_flag_when_object_does_not_exists(self):
                 'Bucket': self.bucket,
                 'Key': self.key,
                 'IfNoneMatch': '*',
-                'ChecksumAlgorithm': DEFAULT_CHECKSUM_ALGORITHM
-            }
+                'ChecksumAlgorithm': DEFAULT_CHECKSUM_ALGORITHM,
+            },
         )
         future = self.manager.upload(
             self.filename, self.bucket, self.key, self.extra_args
@@ -895,7 +895,6 @@ def test_multipart_upload_with_default_checksum_when_required(self):
         self.assert_expected_client_calls_were_correct()
 
     def test_multipart_upload_with_no_overwrite_flag_when_object_exists(self):
-        """Test that multipart upload fails when object exists"""
         self.extra_args['IfNoneMatch'] = '*'
         # Add response for create_multipart_upload (no IfNoneMatch here)
         self.add_create_multipart_response_with_default_expected_params()
@@ -913,13 +912,25 @@ def test_multipart_upload_with_no_overwrite_flag_when_object_exists(self):
                 'UploadId': self.multipart_id,
                 'MultipartUpload': {
                     'Parts': [
-                        {'ETag': 'etag-1', 'PartNumber': 1, 'ChecksumCRC64NVME': 'sum1=='},
-                        {'ETag': 'etag-2', 'PartNumber': 2, 'ChecksumCRC64NVME': 'sum2=='},
-                        {'ETag': 'etag-3', 'PartNumber': 3, 'ChecksumCRC64NVME': 'sum3=='}
+                        {
+                            'ETag': 'etag-1',
+                            'PartNumber': 1,
+                            'ChecksumCRC64NVME': 'sum1==',
+                        },
+                        {
+                            'ETag': 'etag-2',
+                            'PartNumber': 2,
+                            'ChecksumCRC64NVME': 'sum2==',
+                        },
+                        {
+                            'ETag': 'etag-3',
+                            'PartNumber': 3,
+                            'ChecksumCRC64NVME': 'sum3==',
+                        },
                     ]
                 },
-                'IfNoneMatch': '*'
-            }
+                'IfNoneMatch': '*',
+            },
         )
         # Add response for abort_multipart_upload that should be called after the error
         self.stubber.add_response(
@@ -938,11 +949,14 @@ def test_multipart_upload_with_no_overwrite_flag_when_object_exists(self):
             )
             future.result()
         # Verify the error is a PreconditionFailed error
-        self.assertEqual(context.exception.response['Error']['Code'], 'PreconditionFailed')
+        self.assertEqual(
+            context.exception.response['Error']['Code'], 'PreconditionFailed'
+        )
         self.stubber.assert_no_pending_responses()
 
-    def test_multipart_upload_with_no_overwrite_flag_when_object_does_not_exist(self):
-        """Test that multipart upload succeeds when object doesn't exist"""
+    def test_multipart_upload_with_no_overwrite_flag_when_object_does_not_exist(
+        self,
+    ):
         self.extra_args['IfNoneMatch'] = '*'
         # Add response for create_multipart_upload (no IfNoneMatch here)
         self.add_create_multipart_response_with_default_expected_params()
@@ -958,13 +972,25 @@ def test_multipart_upload_with_no_overwrite_flag_when_object_does_not_exist(self
                 'UploadId': self.multipart_id,
                 'MultipartUpload': {
                     'Parts': [
-                        {'ETag': 'etag-1', 'PartNumber': 1, 'ChecksumCRC64NVME': 'sum1=='},
-                        {'ETag': 'etag-2', 'PartNumber': 2, 'ChecksumCRC64NVME': 'sum2=='},
-                        {'ETag': 'etag-3', 'PartNumber': 3, 'ChecksumCRC64NVME': 'sum3=='}
+                        {
+                            'ETag': 'etag-1',
+                            'PartNumber': 1,
+                            'ChecksumCRC64NVME': 'sum1==',
+                        },
+                        {
+                            'ETag': 'etag-2',
+                            'PartNumber': 2,
+                            'ChecksumCRC64NVME': 'sum2==',
+                        },
+                        {
+                            'ETag': 'etag-3',
+                            'PartNumber': 3,
+                            'ChecksumCRC64NVME': 'sum3==',
+                        },
                     ]
                 },
-                'IfNoneMatch': '*'
-            }
+                'IfNoneMatch': '*',
+            },
         )
         # Execute the upload
         future = self.manager.upload(