Skip to content

Fix #138: clear existing (local) ACL when saving ACL to server. #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
silvolu merged 2 commits into from
Sep 30, 2014
Merged

Fix #138: clear existing (local) ACL when saving ACL to server. #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1823b0f
Fix issue # in test comment.
tseaver Sep 26, 2014
fb756b2
Fix #138: clear existing (local) ACL when saving ACL to server.
tseaver Sep 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gcloud/storage/bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,9 @@ def save_acl(self, acl=None):
if acl is None:
return self

return self.patch_metadata({'acl': list(acl)})
self.patch_metadata({'acl': list(acl)})
self.reload_acl()
return self

def clear_acl(self):
"""Remove all ACL rules from the bucket.
Expand Down
4 changes: 3 additions & 1 deletion gcloud/storage/key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,9 @@ def save_acl(self, acl=None):
if acl is None:
return self

return self.patch_metadata({'acl': list(acl)})
self.patch_metadata({'acl': list(acl)})
self.reload_acl()
return self

def clear_acl(self):
"""Remove all ACL rules from the key.
Expand Down
12 changes: 4 additions & 8 deletions gcloud/storage/test_bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,7 @@ def test_save_acl_existing_set_new_passed(self):
bucket = self._makeOne(connection, NAME, metadata)
bucket.reload_acl()
self.assertTrue(bucket.save_acl(new_acl) is bucket)
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
#self.assertEqual(list(bucket.acl), new_acl)
self.assertEqual(list(bucket.acl), new_acl)
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(kw[0]['method'], 'PATCH')
Expand All @@ -550,8 +549,7 @@ def test_clear_acl(self):
bucket = self._makeOne(connection, NAME, metadata)
bucket.reload_acl()
self.assertTrue(bucket.clear_acl() is bucket)
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
#self.assertEqual(list(bucket.acl), [])
self.assertEqual(list(bucket.acl), [])
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(kw[0]['method'], 'PATCH')
Expand Down Expand Up @@ -648,7 +646,7 @@ def test_save_default_object_acl_existing_set_new_passed(self):
bucket = self._makeOne(connection, NAME, metadata)
bucket.reload_default_object_acl()
self.assertTrue(bucket.save_default_object_acl(new_acl) is bucket)
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/139
#self.assertEqual(list(bucket.default_object_acl), new_acl)
kw = connection._requested
self.assertEqual(len(kw), 1)
Expand All @@ -666,14 +664,12 @@ def test_clear_default_object_acl(self):
bucket = self._makeOne(connection, NAME, metadata)
bucket.reload_default_object_acl()
self.assertTrue(bucket.clear_default_object_acl() is bucket)
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/139
#self.assertEqual(list(bucket.default_object_acl), [])
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(kw[0]['method'], 'PATCH')
self.assertEqual(kw[0]['path'], '/b/%s' % NAME)
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/139
#self.assertEqual(list(bucket.default_object_acl), [])
#self.assertEqual(kw[0]['data'], {'defaultObjectAcl': []})
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})

Expand Down
6 changes: 2 additions & 4 deletions gcloud/storage/test_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,7 @@ def test_save_acl_existing_set_new_passed(self):
key = self._makeOne(bucket, KEY, metadata)
key.reload_acl()
self.assertTrue(key.save_acl(new_acl) is key)
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
#self.assertEqual(list(bucket.acl), new_acl)
self.assertEqual(list(key.acl), new_acl)
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(kw[0]['method'], 'PATCH')
Expand All @@ -528,8 +527,7 @@ def test_clear_acl(self):
key = self._makeOne(bucket, KEY, metadata)
key.reload_acl()
self.assertTrue(key.clear_acl() is key)
# See: https://github.com/GoogleCloudPlatform/gcloud-python/issues/138
#self.assertEqual(list(key.acl), [])
self.assertEqual(list(key.acl), [])
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(kw[0]['method'], 'PATCH')
Expand Down