refactor(storage): deprecate preserve_acl arg in copy_blob() method

IlyaFaer · IlyaFaer · commit edd01374ec95 · 2020-04-13T12:32:21.000+03:00
diff --git a/google/cloud/storage/bucket.py b/google/cloud/storage/bucket.py
@@ -1244,7 +1244,7 @@ def copy_blob(
         destination_bucket,
         new_name=None,
         client=None,
-        preserve_acl=True,
+        preserve_acl=None,
         source_generation=None,
         timeout=_DEFAULT_TIMEOUT,
     ):
@@ -1268,8 +1268,8 @@ def copy_blob(
                        to the ``client`` stored on the current bucket.
 
         :type preserve_acl: bool
-        :param preserve_acl: (Optional) Copies ACL from old blob to new blob.
-                             Default: True.
+        :param preserve_acl: DEPRECATED. (Optional) Copies ACL from old blob to
+                             new blob. Default: True.
 
         :type source_generation: long
         :param source_generation: (Optional) The generation of the blob to be
@@ -1307,8 +1307,13 @@ def copy_blob(
             timeout=timeout,
         )
 
-        if not preserve_acl:
-            new_blob.acl.save(acl={}, client=client, timeout=timeout)
+        if preserve_acl is not None:
+            warnings.warn(
+                "preserve_acl arg is deprecated and will be removed in future."
+                "Do a subsequent ACL update instead.",
+                PendingDeprecationWarning,
+                stacklevel=1,
+            )
 
         new_blob._set_properties(copy_result)
         return new_blob
diff --git a/tests/unit/test_bucket.py b/tests/unit/test_bucket.py
@@ -1144,29 +1144,31 @@ def test_copy_blobs_preserve_acl(self):
         dest = self._make_one(client=client, name=DEST)
         blob = self._make_blob(SOURCE, BLOB_NAME)
 
-        new_blob = source.copy_blob(
-            blob, dest, NEW_NAME, client=client, preserve_acl=False
-        )
+        with mock.patch("warnings.warn") as warn:
+            new_blob = source.copy_blob(
+                blob, dest, NEW_NAME, client=client, preserve_acl=False
+            )
+            warn.assert_called_once_with(
+                "preserve_acl arg is deprecated and will be removed in future."
+                "Do a subsequent ACL update instead.",
+                PendingDeprecationWarning,
+                stacklevel=1,
+            )
 
         self.assertIs(new_blob.bucket, dest)
         self.assertEqual(new_blob.name, NEW_NAME)
         self.assertIsInstance(new_blob.acl, ObjectACL)
 
-        kw1, kw2 = connection._requested
         COPY_PATH = "/b/{}/o/{}/copyTo/b/{}/o/{}".format(
             SOURCE, BLOB_NAME, DEST, NEW_NAME
         )
-        NEW_BLOB_PATH = "/b/{}/o/{}".format(DEST, NEW_NAME)
 
-        self.assertEqual(kw1["method"], "POST")
-        self.assertEqual(kw1["path"], COPY_PATH)
-        self.assertEqual(kw1["query_params"], {})
-        self.assertEqual(kw1["timeout"], self._get_default_timeout())
-
-        self.assertEqual(kw2["method"], "PATCH")
-        self.assertEqual(kw2["path"], NEW_BLOB_PATH)
-        self.assertEqual(kw2["query_params"], {"projection": "full"})
-        self.assertEqual(kw2["timeout"], self._get_default_timeout())
+        self.assertEqual(connection._requested[0]["method"], "POST")
+        self.assertEqual(connection._requested[0]["path"], COPY_PATH)
+        self.assertEqual(connection._requested[0]["query_params"], {})
+        self.assertEqual(
+            connection._requested[0]["timeout"], self._get_default_timeout()
+        )
 
     def test_copy_blobs_w_name_and_user_project(self):
         SOURCE = "source"
