Storage: Track deleted labels; make Bucket.patch() send them. #3737

lukesneeringer · 2017-08-07T16:08:46Z

Uses #3715 as a base.

This PR adds tracking for deleted labels on the Bucket object, and causes the appropriate data to be sent when Bucket.patch is called.

Fixes #3711.

googlebot · 2017-08-07T16:08:50Z

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

lukesneeringer · 2017-08-07T16:09:18Z

Grumble grumble grumble @googlebot.

tseaver · 2017-08-07T16:46:27Z

#3715 merged, so you can rebase to appease googlebot.

Turns out some properties (i.e., 'labels', see googleapis#3711) behave differently under 'patch semantics'[1], which makes 'update' useful. [1] https://cloud.google.com/storage/docs/json_api/v1/how-tos/performance#patch

lukesneeringer · 2017-08-07T17:55:49Z

Done, just need a review (and to fix CI).

storage/google/cloud/storage/bucket.py

+                       ``client`` stored on the current object.
+        """
+        answer = super(Bucket, self).update(client=client)
+        self._label_removals.clear()


storage/tests/unit/test_bucket.py

+        _, _, kwargs = client._connection.api_request.mock_calls[0]
+        self.assertEqual(len(kwargs['data']['labels']), 2)
+        self.assertEqual(kwargs['data']['labels']['color'], 'red')
+        self.assertEqual(kwargs['data']['labels']['flavor'], 'cherry')


lukesneeringer · 2017-08-07T20:37:34Z

Thanks for catching that @tseaver. Updates made.

storage/google/cloud/storage/_helpers.py

        # If the values are reset, the changes must as well.
        self._changes = set()
+        if hasattr(self, '_label_removals'):
+            self._label_removals.clear()


lukesneeringer · 2017-08-10T17:40:17Z

@tseaver @jonparrott Can someone give this a final signoff so I can merge it? :-)

…apis#3737)

…les#3737)

lukesneeringer added the api: storage Issues related to the Cloud Storage API. label Aug 7, 2017

lukesneeringer self-assigned this Aug 7, 2017

lukesneeringer requested review from theacodes and tseaver August 7, 2017 16:08

googlebot added the cla: no This human has *not* signed the Contributor License Agreement. label Aug 7, 2017

lukesneeringer added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Aug 7, 2017

googlebot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Aug 7, 2017

tseaver and others added 3 commits August 7, 2017 10:04

Add 'update' API wrapper for buckets/blobs.

2eda894

Turns out some properties (i.e., 'labels', see googleapis#3711) behave differently under 'patch semantics'[1], which makes 'update' useful. [1] https://cloud.google.com/storage/docs/json_api/v1/how-tos/performance#patch

Correctly track label removals on Bucket.patch()

2e29e20

Have the labels system text exercise .patch

aec63b5

lukesneeringer force-pushed the issue-3711 branch from be2c87e to aec63b5 Compare August 7, 2017 17:05

lukesneeringer added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Aug 7, 2017

Rebase merge goof fix.

a17be21

googlebot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Aug 7, 2017

lukesneeringer added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Aug 7, 2017

tseaver reviewed Aug 7, 2017

View reviewed changes

Fix another merge/rebase goof.

d623e21

googlebot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Aug 7, 2017

Refactor based on @tseaver feedback.

4fc8002

tseaver reviewed Aug 8, 2017

View reviewed changes

storage/google/cloud/storage/_helpers.py Outdated

# If the values are reset, the changes must as well.

self._changes = set()

if hasattr(self, '_label_removals'):

self._label_removals.clear()

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Override _set_properties on Bucket.

413da52

lukesneeringer added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Aug 10, 2017

theacodes approved these changes Aug 10, 2017

View reviewed changes

lukesneeringer merged commit 64d1728 into googleapis:master Aug 10, 2017

lukesneeringer deleted the issue-3711 branch August 10, 2017 18:38

dhermes mentioned this pull request Aug 14, 2017

Update storage to 1.3.2. #3812

Closed

landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 21, 2017

Storage: Track deleted labels; make Bucket.patch() send them. (google…

a7236a9

…apis#3737)

landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 22, 2017

Storage: Track deleted labels; make Bucket.patch() send them. (google…

b2927df

…apis#3737)

landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 22, 2017

Storage: Track deleted labels; make Bucket.patch() send them. (google…

740418a

…apis#3737)

lukesneeringer mentioned this pull request Aug 24, 2017

Bump storage to 1.4.0 #3869

Merged

parthea pushed a commit that referenced this pull request Oct 21, 2023

chore: some lint fixes [(#3737)](GoogleCloudPlatform/python-docs-samp…

e8cd9f8

…les#3737)

Storage: Track deleted labels; make Bucket.patch() send them. #3737

Storage: Track deleted labels; make Bucket.patch() send them. #3737

Uh oh!

Conversation

lukesneeringer commented Aug 7, 2017

Uh oh!

googlebot commented Aug 7, 2017

Uh oh!

lukesneeringer commented Aug 7, 2017

Uh oh!

tseaver commented Aug 7, 2017

Uh oh!

lukesneeringer commented Aug 7, 2017

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

lukesneeringer commented Aug 7, 2017

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

lukesneeringer commented Aug 10, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants