Skip to content

Fix #139: clear existing (local) ACL when saving defaultObjectACL to server #193

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 #139: clear existing (local) ACL when saving defaultObjectACL to server #193

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
e19cf86
Fix #139: clear existing (local) ACL when saving defaultObjectACL to…
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
7 changes: 5 additions & 2 deletions gcloud/storage/bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,15 @@ def save_default_object_acl(self, acl=None):
and save that.
"""

acl = acl or self.default_object_acl
if acl is None:
acl = self.default_object_acl

if acl is None:
return self

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

def clear_default_object_acl(self):
"""Remove the Default Object ACL from this bucket."""
Expand Down
39 changes: 27 additions & 12 deletions gcloud/storage/test_bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,54 +628,69 @@ def test_save_default_object_acl_none_set_none_passed(self):
def test_save_default_object_acl_existing_set_none_passed(self):
NAME = 'name'
connection = _Connection({'foo': 'Foo', 'acl': []})
connection = _Connection({'foo': 'Foo', 'acl': []},
{'foo': 'Foo', 'acl': [],
'defaultObjectAcl': []},
)
metadata = {'defaultObjectAcl': []}
bucket = self._makeOne(connection, NAME, metadata)
bucket.reload_default_object_acl()
self.assertTrue(bucket.save_default_object_acl() is bucket)
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(len(kw), 2)
self.assertEqual(kw[0]['method'], 'PATCH')
self.assertEqual(kw[0]['path'], '/b/%s' % NAME)
self.assertEqual(kw[0]['data'], metadata)
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
self.assertEqual(kw[1]['method'], 'GET')
self.assertEqual(kw[1]['path'], '/b/%s' % NAME)
self.assertEqual(kw[1]['query_params'], {'projection': 'full'})

def test_save_default_object_acl_existing_set_new_passed(self):
NAME = 'name'
ROLE = 'role'
new_acl = [{'entity': 'allUsers', 'role': ROLE}]
connection = _Connection({'foo': 'Foo', 'acl': new_acl})
connection = _Connection({'foo': 'Foo', 'acl': new_acl},
{'foo': 'Foo', 'acl': new_acl,
'defaultObjectAcl': new_acl},
)
metadata = {'defaultObjectAcl': []}
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
#self.assertEqual(list(bucket.default_object_acl), new_acl)
self.assertEqual(list(bucket.default_object_acl), new_acl)
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(len(kw), 2)
self.assertEqual(kw[0]['method'], 'PATCH')
self.assertEqual(kw[0]['path'], '/b/%s' % NAME)
self.assertEqual(kw[0]['data'], {'defaultObjectAcl': new_acl})
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
self.assertEqual(kw[1]['method'], 'GET')
self.assertEqual(kw[1]['path'], '/b/%s' % NAME)
self.assertEqual(kw[1]['query_params'], {'projection': 'full'})

def test_clear_default_object_acl(self):
NAME = 'name'
ROLE = 'role'
old_acl = [{'entity': 'allUsers', 'role': ROLE}]
connection = _Connection({'foo': 'Foo', 'acl': []})
connection = _Connection({'foo': 'Foo', 'acl': []},
{'foo': 'Foo', 'acl': [],
'defaultObjectAcl': []},
)
metadata = {'defaultObjectAcl': old_acl}
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
#self.assertEqual(list(bucket.default_object_acl), [])
self.assertEqual(list(bucket.default_object_acl), [])
kw = connection._requested
self.assertEqual(len(kw), 1)
self.assertEqual(len(kw), 2)
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]['data'], {'defaultObjectAcl': []})
self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
self.assertEqual(kw[1]['method'], 'GET')
self.assertEqual(kw[1]['path'], '/b/%s' % NAME)
self.assertEqual(kw[1]['query_params'], {'projection': 'full'})

def test_make_public_defaults(self):
from gcloud.storage.acl import ACL
Expand Down