Skip to content

Pass 'user_project' if set for blob downloads w/ 'mediaLink' set - #3500

Merged
tseaver merged 2 commits into
googleapis:masterfrom
tseaver:3474-storage-requester_pays-blob-media_link
Jun 26, 2017
Merged

Pass 'user_project' if set for blob downloads w/ 'mediaLink' set#3500
tseaver merged 2 commits into
googleapis:masterfrom
tseaver:3474-storage-requester_pays-blob-media_link

Conversation

@tseaver

@tseavertseaver commented Jun 13, 2017

Copy link
Copy Markdown
Contributor

Fixes an oversight in #3495: server-set mediaLink triggers a separate branch when computing download URL.

Toward #3474.

@tseavertseaver added api: storage Issues related to the Cloud Storage API. type: feature request ‘Nice-to-have’ improvement, new feature or different behavior or design. labels Jun 13, 2017
@googlebotgooglebot added the cla: yes This human has signed the Contributor License Agreement. label Jun 13, 2017
@tseavertseaver mentioned this pull request Jun 13, 2017
Closed
@tseavertseaver changed the title Pass 'user_project' if set for blob downloas w/ 'mediaLink' setPass 'user_project' if set for blob downloads w/ 'mediaLink' setJun 13, 2017
dhermes
dhermes reviewed Jun 13, 2017
View reviewed changes
Comment threadstorage/google/cloud/storage/blob.py Outdated
if self.media_link is None:
download_url = _DOWNLOAD_URL_TEMPLATE.format(path=self.path)
base_url = _DOWNLOAD_URL_TEMPLATE.format(path=self.path)
scheme, netloc, path, query, frag = urlsplit(base_url)

This comment was marked as spam.

Sign in to view

Comment threadstorage/google/cloud/storage/blob.py Outdated
query.append(('generation', '{:d}'.format(self.generation)))
else:
return self.media_link
scheme, netloc, path, query, frag = urlsplit(self.media_link)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Comment threadstorage/google/cloud/storage/blob.py Outdated
query = parse_qsl(query)

if self.user_project is not None:
query.append(('userProject', self.user_project))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Comment threadstorage/google/cloud/storage/blob.py Outdated
scheme, netloc, path, query, frag = urlsplit(base_url)
query = parse_qsl(query)
# Only add `generation' for synthesized URLs: 'mediaLink' from
# server presumably already encodes it.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Comment threadstorage/tests/unit/test_blob.py
def test__get_download_url_with_media_link(self):
blob_name = 'something.txt'
bucket = mock.Mock(spec=[])
bucket = _Bucket(name='IRRELEVANT')

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@tseavertseaver mentioned this pull request Jun 19, 2017
Closed
@tseaver

tseaver commented Jun 19, 2017

Copy link
Copy Markdown
ContributorAuthor

@lukesneeringer, @dhermes OK to merge?

@tseaver
tseaver merged commit dbdc6a6 into googleapis:masterJun 26, 2017
@tseaver
tseaver deleted the 3474-storage-requester_pays-blob-media_link branch July 31, 2017 16:42
landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 21, 2017
@tseaver@landrito
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (goo…
13ded9a
…gleapis#3500)
landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 22, 2017
@tseaver@landrito
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (goo…
f433a48
…gleapis#3500)
landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 22, 2017
@tseaver@landrito
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (goo…
cfece9d
…gleapis#3500)
tseaver added a commit that referenced this pull request Sep 22, 2017
@tseaver
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (#3500)
17ffc6f
tseaver added a commit that referenced this pull request Oct 2, 2017
@tseaver
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (#3500)
1d37ee6
tseaver added a commit that referenced this pull request Oct 5, 2017
@tseaver
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (#3500)
27f0d1b
tseaver added a commit that referenced this pull request Oct 10, 2017
@tseaver
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (#3500)
d371373
tseaver added a commit that referenced this pull request Oct 10, 2017
@tseaver
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (#3500)
5c62c05
parthea pushed a commit that referenced this pull request Mar 9, 2026
@tseaver
Pass 'user_project' if set for blob downloads w/ 'mediaLink' set (#3500)
409e3b2
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lukesneeringerlukesneeringerAwaiting requested review from lukesneeringer
1 more reviewer
@dhermesdhermesdhermes left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

api: storageIssues related to the Cloud Storage API.cla: yesThis human has signed the Contributor License Agreement.type: feature request‘Nice-to-have’ improvement, new feature or different behavior or design.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tseaver@lukesneeringer@dhermes@googlebot