FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Separating _patch_properties and PATCH on Bucket. by dhermes · Pull Request #683 · googleapis/google-cloud-python · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
45 changes: 44 additions & 1 deletion gcloud/storage/bucket.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ def __init__(self, connection=None, name=None, properties=None):
name = properties.get('name')
super(Bucket, self).__init__(name=name, properties=properties)
self._connection = connection
self._changes = set()

def __repr__(self):
return '<Bucket: %s>' % self.name
Expand Down Expand Up @@ -511,6 +512,7 @@ def update_cors(self, entries):
:param entries: A sequence of mappings describing each CORS policy.
"""
self._patch_properties({'cors': entries})
self.patch()

def get_default_object_acl(self):
"""Get the current Default Object ACL rules.
Expand Down Expand Up @@ -568,6 +570,7 @@ def update_lifecycle(self, rules):
:param rules: A sequence of mappings describing each lifecycle rule.
"""
self._patch_properties({'lifecycle': {'rule': rules}})
self.patch()

location = _scalar_property('location')
"""Retrieve location configured for this bucket.
Expand Down Expand Up @@ -604,13 +607,15 @@ def enable_logging(self, bucket_name, object_prefix=''):
"""
info = {'logBucket': bucket_name, 'logObjectPrefix': object_prefix}
self._patch_properties({'logging': info})
self.patch()

def disable_logging(self):
"""Disable access logging for this bucket.

See: https://cloud.google.com/storage/docs/accesslogs#disabling
"""
self._patch_properties({'logging': None})
self.patch()

@property
def metageneration(self):
Expand Down Expand Up @@ -741,7 +746,8 @@ def configure_website(self, main_page_suffix=None, not_found_page=None):
'notFoundPage': not_found_page,
},
}
return self._patch_properties(data)
self._patch_properties(data)
return self.patch()

def disable_website(self):
"""Disable the website configuration for this bucket.
Expand Down Expand Up @@ -774,3 +780,40 @@ def make_public(self, recursive=False, future=False):
for blob in self:
blob.acl.all().grant_read()
blob.save_acl()

def _patch_properties(self, properties):
"""Update particular fields of this object's properties.

This method will only update the fields provided and will not
touch the other fields.

It **will not** reload the properties from the server as is done
in :meth:`_PropertyMixin._patch_properties`. The behavior is
local only and syncing occurs via :meth:`patch`.

:type properties: dict
:param properties: The dictionary of values to update.

:rtype: :class:`Bucket`
:returns: The current bucket.
"""
self._changes.update(properties.keys())
self._properties.update(properties)
return self

def patch(self):
"""Sends all changed properties in a PATCH request.

Updates the ``properties`` with the response from the backend.

:rtype: :class:`Bucket`
:returns: The current bucket.
"""
# Pass '?projection=full' here because 'PATCH' documented not
# to work properly w/ 'noAcl'.
update_properties = dict((key, self._properties[key])
for key in self._changes)
self._properties = self.connection.api_request(
method='PATCH', path=self.path, data=update_properties,
query_params={'projection': 'full'})
return self
2 changes: 2 additions & 0 deletions gcloud/storage/test_bucket.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,7 @@ def test_location_setter(self):
connection = _Connection({'location': 'AS'})
bucket = self._makeOne(connection, NAME)
bucket.location = 'AS'
bucket.patch()
self.assertEqual(bucket.location, 'AS')
kw = connection._requested
self.assertEqual(len(kw), 1)
Expand Down Expand Up @@ -911,6 +912,7 @@ def test_versioning_enabled_setter(self):
bucket = self._makeOne(connection, NAME, before)
self.assertFalse(bucket.versioning_enabled)
bucket.versioning_enabled = True
bucket.patch()
self.assertTrue(bucket.versioning_enabled)
kw = connection._requested
self.assertEqual(len(kw), 1)
Expand Down

Back | FazBrowse Home | New Git URL