Reverting back to boto3 resource level call in tasks

Author: naquib314

taiga2/tasks.py

@@ -130,13 +130,17 @@ def background_process_new_upload_session_file(
         )
 
         # We copy the file to 'convert/'
+        copy_source = {"Bucket": bucket_name, "Key": initial_s3_key}
         b = s3.Bucket(bucket_name)
         existing_obj = b.Object(initial_s3_key)
-        aws.s3_client.copy_object(
-            Bucket=bucket_name,
-            Key=converted_s3_key,
-            CopySource={"Bucket": bucket_name, "Key": initial_s3_key},
-        )
+        b.copy(copy_source, converted_s3_key)
+        # If using MiniStack locally and b.copy() fails (MiniStack omits ETag),
+        # comment out b.copy() above and uncomment the client-level call below:
+        # aws.s3_client.copy_object(
+        #     Bucket=bucket_name,
+        #     Key=converted_s3_key,
+        #     CopySource={"Bucket": bucket_name, "Key": initial_s3_key},
+        # )
         compressed_s3_object = s3.Object(bucket_name, compressed_s3_key)
         with tempfile.NamedTemporaryFile("w+b") as download_dest:
             with tempfile.NamedTemporaryFile("w+b") as compressed_dest:

taiga2/tests/conftest.py

@@ -70,7 +70,7 @@ def app(request, mock_s3, mock_sts, tmpdir):
     # Monkey patch S3
     g._s3_resource = mock_s3
 
-    g._s3_client = MockS3Client(mock_s3)
+    g._s3_client = MockS3Client()
 
     g._sts_client = mock_sts
 

taiga2/tests/mock_s3.py

@@ -101,21 +101,9 @@ def download_as_bytes(self):
 
 
 class MockS3Client:
-    def __init__(self, mock_s3=None):
-        self._mock_s3 = mock_s3
-
     def generate_presigned_url(self, ClientMethod, Params):
         return "https://mocks3/{}/{}?signed=Y".format(Params["Bucket"], Params["Key"])
 
-    def copy_object(self, Bucket, Key, CopySource, **kwargs):
-        if self._mock_s3 is None:
-            raise RuntimeError("MockS3Client needs a MockS3 reference to perform copy_object")
-        src_bucket = CopySource["Bucket"]
-        src_key = CopySource["Key"]
-        src_path = self._mock_s3.file_per_key[(src_bucket, src_key)]
-        with open(src_path, "rb") as f:
-            self._mock_s3.Bucket(Bucket).put_object(Key=Key, Body=f)
-
 
 def parse_presigned_url(url):
     g = re.match("https://mocks3/([^/]+)/([^?]+)\\?signed=Y", url)