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

Jump to bottom

Implement predefined acl #4757

Merged

chemelnucfin merged 5 commits into googleapis:master from chemelnucfin:storage_predefined_acl

Feb 27, 2018

Contributor

chemelnucfin commented Jan 17, 2018

Closes #1660

chemelnucfin requested a review from lukesneeringer as a code owner

January 17, 2018 21:23

googlebot added the cla: yes label

chemelnucfin self-assigned this

chemelnucfin added type: feature request api: storage labels

chemelnucfin force-pushed the storage_predefined_acl branch 2 times, most recently from a3c3774 to 54bb0fc Compare

January 17, 2018 22:30

tseaver suggested changes

View reviewed changes

storage/google/cloud/storage/blob.py Outdated

                       if self.user_project is not None:
                           name_value_pairs.append(('userProject', self.user_project))
+                      if predefined_acl is not None:
+                          self._acl.save_predefined(predefined_acl)
+                          name_value_pairs.append(('predefinedAcl', predefined_acl))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

chemelnucfin force-pushed the storage_predefined_acl branch from 54bb0fc to 295eb03 Compare

January 26, 2018 05:29

Contributor Author

chemelnucfin commented Jan 26, 2018

@tseaver PTAL, thanks. I set the acl after the blob was created as you had suggested.

Contributor

tseaver commented Jan 26, 2018

@chemelnucfin Moving the save_predefined call after the actual upload still makes two API calls. The change I asked for was to avoid using save_predefined at all, and instead to get the appropriate query parameter added to the actual upload API request. This change will require factoring out the XML->JSON parameter name code (currently inside save_predefined), and tweaking _initiate_resumable_upload and _do_multipart_upload to inject the query parameter appropriately (like for userProject).

Contributor Author

chemelnucfin commented Jan 26, 2018

Sorry, I must have misunderstood you. I will take a look in a bit. Thanks.

chemelnucfin force-pushed the storage_predefined_acl branch 2 times, most recently from b970be1 to 1d0aae7 Compare

January 30, 2018 23:27

Contributor Author

chemelnucfin commented Feb 1, 2018

@tseaver PTAL at your convenience. Thanks.

tseaver suggested changes

View reviewed changes

storage/tests/unit/test_blob.py Outdated

@@ @@ -1009,9 +1013,11 @@ def _initiate_resumable_helper( @@
                       data = b'hello hallo halo hi-low'
                       stream = io.BytesIO(data)
                       content_type = u'text/plain'
+                      predefined_acl = 'private'

This comment was marked as spam.

Sign in to view

storage/tests/unit/test_blob.py Outdated

                       client = mock.Mock(_http=transport, spec=['_http'])
                       stream = io.BytesIO(data)
                       content_type = u'text/html'
+                      predefined_acl = 'private'

This comment was marked as spam.

Sign in to view

storage/tests/unit/test_blob.py Outdated

                       stream = mock.sentinel.stream
                       content_type = u'video/mp4'
                       size = 12345654321
+                      predefined_acl = 'private'

This comment was marked as spam.

Sign in to view

storage/tests/unit/test_blob.py Outdated


		blob = self._make_one('blob-name', bucket=None)

		blob._acl = mock.create_autospec(ACL)

This comment was marked as spam.

Sign in to view

chemelnucfin force-pushed the storage_predefined_acl branch from fb2b43b to f411292 Compare

February 4, 2018 10:19

tseaver suggested changes

View reviewed changes

storage/tests/unit/test_blob.py Outdated

                       client = mock.Mock(_http=transport, spec=['_http'])
                       stream = io.BytesIO(data)
                       content_type = u'text/html'
-                      predefined_acl = 'private'
                       response = blob._do_resumable_upload(
                           client, stream, content_type, size, num_retries, None)

This comment was marked as spam.

Sign in to view

chemelnucfin force-pushed the storage_predefined_acl branch from 25578fb to 00dfef0 Compare

February 7, 2018 20:15

Contributor Author

chemelnucfin commented Feb 13, 2018

@tseaver Hopefully this time is good. PTAL at your convenience.

chemelnucfin changed the title ~~Storage: Implement predefined acl~~ Implement predefined acl

tseaver suggested changes

View reviewed changes

Contributor

tseaver left a comment

In addition to the other changes requested, please add explicit unit tests for ACL.valiate_predefined_acl, including cases for None, a valid XML acl, a valid JSON acl, and an invalid acl.

storage/google/cloud/storage/blob.py

                           warnings.warn(_NUM_RETRIES_MESSAGE, DeprecationWarning)
                       _maybe_rewind(file_obj, rewind=rewind)
+                      predefined_acl = ACL.validate_predefined(predefined_acl)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/blob.py Outdated

@@ @@ -1109,7 +1145,7 @@ def create_resumable_upload_session( @@
                           # to the `ResumableUpload` constructor. The chunk size only
                           # matters when **sending** bytes to an upload.
                           upload, _ = self._initiate_resumable_upload(
-                              client, dummy_stream, content_type, size, None,
+                              client, dummy_stream, content_type, size, None, None,

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

chemelnucfin added 4 commits

February 22, 2018 15:06


          Storage: Implement predefined acl

a766b3d


          Review Changes

c9f0486


          Review Changes2

98f0cb7


          Review Changes3

8db085b

chemelnucfin force-pushed the storage_predefined_acl branch from 00dfef0 to 8db085b Compare

February 22, 2018 23:37

Contributor Author

chemelnucfin commented Feb 22, 2018

@tseaver added the unit test for validation.


          use keyword arguments for predefined_acl

3a90098

Contributor Author

chemelnucfin commented Feb 27, 2018

@tseaver I added the keyword arguments, PTAL and hopefully this is good!

tseaver approved these changes

View reviewed changes

chemelnucfin merged commit 34cedf3 into googleapis:master

chemelnucfin deleted the storage_predefined_acl branch

February 27, 2018 21:30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api: storage cla: yes type: feature request