Merge pull request #938 from kyleknap/multipart-mv

Delete large files for cross region ``mv``

CHANGELOG.rst

@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+Next Release (TBD)
+==================
+
+* bugfix:``aws s3 mv``: Delete multi-part objects when transferring objects
+  across regions using ``--source-region``
+  (`issue 938 <https://github.com/aws/aws-cli/pull/938>`__)
+
+
 1.5.1
 =====
 

awscli/customizations/s3/tasks.py

@@ -457,7 +457,7 @@ def __call__(self):
         LOGGER.debug("Waiting for download to finish.")
         self._context.wait_for_completion()
         bucket, key = find_bucket_key(self._filename.src)
-        params = {'endpoint': self._filename.endpoint,
+        params = {'endpoint': self._filename.source_endpoint,
                   'bucket': bucket, 'key': key}
         response_data, http = operate(
             self._filename.service, 'DeleteObject', params)

tests/integration/customizations/s3/test_plugin.py

@@ -689,6 +689,23 @@ def testMvRegion(self):
         self.assertFalse(
             self.key_exists(bucket_name=self.src_bucket, key_name='foo.txt'))
 
+    def testMvLargeFileRegion(self):
+        foo_txt = self.files.create_file('foo.txt', 'a' * 1024 * 1024 * 10)
+        p = aws('s3 cp %s s3://%s/foo.txt --region %s' %
+                (foo_txt, self.src_bucket, self.src_region))
+        self.assert_no_errors(p)
+
+        p2 = aws(
+            's3 mv s3://%s/foo.txt s3://%s/ --region %s --source-region %s ' %
+            (self.src_bucket, self.dest_bucket, self.dest_region,
+             self.src_region)
+        )
+        self.assert_no_errors(p2)
+        self.assertTrue(
+            self.key_exists(bucket_name=self.dest_bucket, key_name='foo.txt'))
+        self.assertFalse(
+            self.key_exists(bucket_name=self.src_bucket, key_name='foo.txt'))
+
 
 class TestWarnings(BaseS3CLICommand):
     def extra_setup(self):