Skip to content
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

fix: downloading no longer marks metadata fields as 'changed' #523

Merged
merged 2 commits into from
Jul 23, 2021
Merged

fix: downloading no longer marks metadata fields as 'changed' #523

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
817c304
fix: downloading no longer marks metadata fields as 'changed'
andrewsg Jul 23, 2021
ebad8cb
🦉 Updates from OwlBot
gcf-owl-bot[bot] Jul 23, 2021
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
22 changes: 15 additions & 7 deletions google/cloud/storage/blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,11 +875,19 @@ def _extract_headers_from_download(self, response):
:class requests.models.Response
:param response: The server response from downloading a non-chunked file
"""
self.content_encoding = response.headers.get("Content-Encoding", None)
self.content_type = response.headers.get("Content-Type", None)
self.cache_control = response.headers.get("Cache-Control", None)
self.storage_class = response.headers.get("X-Goog-Storage-Class", None)
self.content_language = response.headers.get("Content-Language", None)
self._properties["contentEncoding"] = response.headers.get(
"Content-Encoding", None
)
self._properties[_CONTENT_TYPE_FIELD] = response.headers.get(
"Content-Type", None
)
self._properties["cacheControl"] = response.headers.get("Cache-Control", None)
self._properties["storageClass"] = response.headers.get(
"X-Goog-Storage-Class", None
)
self._properties["contentLanguage"] = response.headers.get(
"Content-Language", None
)
self._properties["etag"] = response.headers.get("ETag", None)
self._properties["generation"] = response.headers.get("X-goog-generation", None)
self._properties["metageneration"] = response.headers.get(
Expand All @@ -896,8 +904,8 @@ def _extract_headers_from_download(self, response):
method, digest = match.groups()
digests[method] = digest

self.crc32c = digests.get("crc32c", None)
self.md5_hash = digests.get("md5", None)
self._properties["crc32c"] = digests.get("crc32c", None)
self._properties["md5Hash"] = digests.get("md5", None)

def _do_download(
self,
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/test_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,7 @@ def test__extract_headers_from_download_gzipped(self):
self.assertEqual(blob.etag, "kittens")
self.assertEqual(blob.generation, 42)
self.assertEqual(blob.metageneration, 4)
self.assertEqual(blob._changes, set())

def test__extract_headers_from_download_empty(self):
blob_name = "blob-name"
Expand Down Expand Up @@ -1120,6 +1121,7 @@ def test__extract_headers_from_download_empty(self):
self.assertEqual(blob.etag, "kittens")
self.assertEqual(blob.generation, 42)
self.assertEqual(blob.metageneration, 4)
self.assertEqual(blob._changes, set())

def test__extract_headers_from_download_w_hash_response_header_none(self):
blob_name = "blob-name"
Expand Down