Merge pull request #698 from stmos/devel

Google Storage Backend: settings ACLs when file is uploaded
jschneier · May 13, 2019 · a07ab2c · a07ab2c
2 parents 3047db7 + d9a0c47
commit a07ab2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/storages/backends/gcloud.py b/storages/backends/gcloud.py
@@ -174,10 +174,14 @@ def _save(self, name, content):
         encoded_name = self._encode_name(name)
         file = GoogleCloudFile(encoded_name, 'rw', self)
         file.blob.cache_control = self.cache_control
-        file.blob.upload_from_file(content, rewind=True, size=content.size,
-                                   content_type=file.mime_type)
         if self.default_acl:
-            file.blob.acl.save_predefined(self.default_acl)
+            file.blob.upload_from_file(
+                content, rewind=True, size=content.size,
+                content_type=file.mime_type, predefined_acl=self.default_acl)
+        else:
+            file.blob.upload_from_file(
+                content, rewind=True, size=content.size,
+                content_type=file.mime_type)
         return cleaned_name
 
     def delete(self, name):

diff --git a/tests/test_gcloud.py b/tests/test_gcloud.py
@@ -131,8 +131,8 @@ def test_save_with_default_acl(self):
 
         self.storage._client.get_bucket.assert_called_with(self.bucket_name)
         self.storage._bucket.get_blob().upload_from_file.assert_called_with(
-            content, rewind=True, size=len(data), content_type=mimetypes.guess_type(filename)[0])
-        self.storage._bucket.get_blob().acl.save_predefined.assert_called_with('publicRead')
+            content, rewind=True, size=len(data), content_type=mimetypes.guess_type(filename)[0],
+            predefined_acl='publicRead')
 
     def test_delete(self):
         self.storage.delete(self.filename)