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

Jump to bottom

Fixed Content-MD5 serialization and typing #16987

Merged
merged 2 commits into from
Mar 1, 2021
Merged

Fixed Content-MD5 serialization and typing #16987

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
b50e386
Fixed Content-MD5 serialization and typing
tasherif-msft Mar 1, 2021
1920b0b
fixed more typing
tasherif-msft Mar 1, 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
10 changes: 5 additions & 5 deletions sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def _upload_blob_options( # pylint:disable=too-many-statements
kwargs['blob_headers'] = BlobHTTPHeaders(
blob_cache_control=content_settings.cache_control,
blob_content_type=content_settings.content_type,
blob_content_md5=bytearray(content_settings.content_md5) if content_settings.content_md5 else None,
blob_content_md5=content_settings.content_md5,
blob_content_encoding=content_settings.content_encoding,
blob_content_language=content_settings.content_language,
blob_content_disposition=content_settings.content_disposition
Expand Down Expand Up @@ -1208,7 +1208,7 @@ def _set_http_headers_options(self, content_settings=None, **kwargs):
blob_headers = BlobHTTPHeaders(
blob_cache_control=content_settings.cache_control,
blob_content_type=content_settings.content_type,
blob_content_md5=bytearray(content_settings.content_md5) if content_settings.content_md5 else None,
blob_content_md5=content_settings.content_md5,
blob_content_encoding=content_settings.content_encoding,
blob_content_language=content_settings.content_language,
blob_content_disposition=content_settings.content_disposition
Expand Down Expand Up @@ -1376,7 +1376,7 @@ def _create_page_blob_options( # type: ignore
blob_headers = BlobHTTPHeaders(
blob_cache_control=content_settings.cache_control,
blob_content_type=content_settings.content_type,
blob_content_md5=bytearray(content_settings.content_md5) if content_settings.content_md5 else None,
blob_content_md5=content_settings.content_md5,
blob_content_encoding=content_settings.content_encoding,
blob_content_language=content_settings.content_language,
blob_content_disposition=content_settings.content_disposition
Expand Down Expand Up @@ -1517,7 +1517,7 @@ def _create_append_blob_options(self, content_settings=None, metadata=None, **kw
blob_headers = BlobHTTPHeaders(
blob_cache_control=content_settings.cache_control,
blob_content_type=content_settings.content_type,
blob_content_md5=bytearray(content_settings.content_md5) if content_settings.content_md5 else None,
blob_content_md5=content_settings.content_md5,
blob_content_encoding=content_settings.content_encoding,
blob_content_language=content_settings.content_language,
blob_content_disposition=content_settings.content_disposition
Expand Down Expand Up @@ -2350,7 +2350,7 @@ def _commit_block_list_options( # type: ignore
blob_headers = BlobHTTPHeaders(
blob_cache_control=content_settings.cache_control,
blob_content_type=content_settings.content_type,
blob_content_md5=bytearray(content_settings.content_md5) if content_settings.content_md5 else None,
blob_content_md5=content_settings.content_md5,
blob_content_encoding=content_settings.content_encoding,
blob_content_language=content_settings.content_language,
blob_content_disposition=content_settings.content_disposition
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blob/azure/storage/blob/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ class ContentSettings(DictMixin):
:param str cache_control:
If the cache_control has previously been set for
the blob, that value is stored.
:param str content_md5:
:param bytearray content_md5:
If the content_md5 has been set for the blob, this response
header is stored so that the client can check for message content
integrity.
Expand Down
315 changes: 315 additions & 0 deletions ...age/azure-storage-blob/tests/recordings/test_block_blob.test_upload_blob_content_md5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,315 @@
interactions:
- request:
body: null
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-blob/12.8.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0)
x-ms-date:
- Mon, 01 Mar 2021 04:18:10 GMT
x-ms-version:
- '2020-06-12'
method: PUT
uri: https://storagename.blob.core.windows.net/utcontainer92b711b8?restype=container
response:
body:
string: ''
headers:
content-length:
- '0'
date:
- Mon, 01 Mar 2021 04:18:10 GMT
etag:
- '"0x8D8DC69063B0887"'
last-modified:
- Mon, 01 Mar 2021 04:18:10 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-version:
- '2020-06-12'
status:
code: 201
message: Created
- request:
body: hello world
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '11'
Content-Type:
- application/octet-stream
User-Agent:
- azsdk-python-storage-blob/12.8.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0)
x-ms-blob-type:
- BlockBlob
x-ms-date:
- Mon, 01 Mar 2021 04:18:11 GMT
x-ms-encryption-algorithm:
- AES256
x-ms-version:
- '2020-06-12'
method: PUT
uri: https://storagename.blob.core.windows.net/utcontainer92b711b8/blob192b711b8
response:
body:
string: ''
headers:
content-length:
- '0'
content-md5:
- XrY7u+Ae7tCTyyK7j1rNww==
date:
- Mon, 01 Mar 2021 04:18:10 GMT
etag:
- '"0x8D8DC6906463DF5"'
last-modified:
- Mon, 01 Mar 2021 04:18:10 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-content-crc64:
- vo7q9sPVKY0=
x-ms-request-server-encrypted:
- 'true'
x-ms-version:
- '2020-06-12'
status:
code: 201
message: Created
- request:
body: null
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
User-Agent:
- azsdk-python-storage-blob/12.8.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0)
x-ms-date:
- Mon, 01 Mar 2021 04:18:11 GMT
x-ms-encryption-algorithm:
- AES256
x-ms-version:
- '2020-06-12'
method: HEAD
uri: https://storagename.blob.core.windows.net/utcontainer92b711b8/blob192b711b8
response:
body:
string: ''
headers:
accept-ranges:
- bytes
content-length:
- '11'
content-md5:
- XrY7u+Ae7tCTyyK7j1rNww==
content-type:
- application/octet-stream
date:
- Mon, 01 Mar 2021 04:18:10 GMT
etag:
- '"0x8D8DC6906463DF5"'
last-modified:
- Mon, 01 Mar 2021 04:18:10 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
vary:
- Origin
x-ms-access-tier:
- Hot
x-ms-access-tier-inferred:
- 'true'
x-ms-blob-type:
- BlockBlob
x-ms-creation-time:
- Mon, 01 Mar 2021 04:18:10 GMT
x-ms-lease-state:
- available
x-ms-lease-status:
- unlocked
x-ms-server-encrypted:
- 'true'
x-ms-version:
- '2020-06-12'
status:
code: 200
message: OK
- request:
body: hello world this wont work
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '26'
Content-Type:
- application/octet-stream
If-None-Match:
- '*'
User-Agent:
- azsdk-python-storage-blob/12.8.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0)
x-ms-blob-content-md5:
- XrY7u+Ae7tCTyyK7j1rNww==
x-ms-blob-type:
- BlockBlob
x-ms-date:
- Mon, 01 Mar 2021 04:18:11 GMT
x-ms-encryption-algorithm:
- AES256
x-ms-version:
- '2020-06-12'
method: PUT
uri: https://storagename.blob.core.windows.net/utcontainer92b711b8/blob292b711b8
response:
body:
string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>Md5Mismatch</Code><Message>The
MD5 value specified in the request did not match with the MD5 value calculated
by the server.\nRequestId:22874362-c01e-00be-4c51-0e3b8d000000\nTime:2021-03-01T04:18:10.9305633Z</Message><UserSpecifiedMd5>XrY7u+Ae7tCTyyK7j1rNww==</UserSpecifiedMd5><ServerCalculatedMd5>jZ0KWGQraqYHX42NEbH9Vg==</ServerCalculatedMd5></Error>"
headers:
content-length:
- '405'
content-type:
- application/xml
date:
- Mon, 01 Mar 2021 04:18:10 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-error-code:
- Md5Mismatch
x-ms-version:
- '2020-06-12'
status:
code: 400
message: The MD5 value specified in the request did not match with the MD5 value
calculated by the server.
- request:
body: hello world
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '11'
Content-Type:
- application/octet-stream
If-None-Match:
- '*'
User-Agent:
- azsdk-python-storage-blob/12.8.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0)
x-ms-blob-content-md5:
- XrY7u+Ae7tCTyyK7j1rNww==
x-ms-blob-type:
- BlockBlob
x-ms-date:
- Mon, 01 Mar 2021 04:18:11 GMT
x-ms-encryption-algorithm:
- AES256
x-ms-version:
- '2020-06-12'
method: PUT
uri: https://storagename.blob.core.windows.net/utcontainer92b711b8/blob292b711b8
response:
body:
string: ''
headers:
content-length:
- '0'
content-md5:
- XrY7u+Ae7tCTyyK7j1rNww==
date:
- Mon, 01 Mar 2021 04:18:10 GMT
etag:
- '"0x8D8DC690666ED45"'
last-modified:
- Mon, 01 Mar 2021 04:18:11 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
x-ms-content-crc64:
- vo7q9sPVKY0=
x-ms-request-server-encrypted:
- 'true'
x-ms-version:
- '2020-06-12'
status:
code: 201
message: Created
- request:
body: null
headers:
Accept:
- application/xml
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
User-Agent:
- azsdk-python-storage-blob/12.8.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0)
x-ms-date:
- Mon, 01 Mar 2021 04:18:11 GMT
x-ms-encryption-algorithm:
- AES256
x-ms-version:
- '2020-06-12'
method: HEAD
uri: https://storagename.blob.core.windows.net/utcontainer92b711b8/blob292b711b8
response:
body:
string: ''
headers:
accept-ranges:
- bytes
content-length:
- '11'
content-md5:
- XrY7u+Ae7tCTyyK7j1rNww==
content-type:
- application/octet-stream
date:
- Mon, 01 Mar 2021 04:18:11 GMT
etag:
- '"0x8D8DC690666ED45"'
last-modified:
- Mon, 01 Mar 2021 04:18:11 GMT
server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
vary:
- Origin
x-ms-access-tier:
- Hot
x-ms-access-tier-inferred:
- 'true'
x-ms-blob-type:
- BlockBlob
x-ms-creation-time:
- Mon, 01 Mar 2021 04:18:11 GMT
x-ms-lease-state:
- available
x-ms-lease-status:
- unlocked
x-ms-server-encrypted:
- 'true'
x-ms-version:
- '2020-06-12'
status:
code: 200
message: OK
version: 1
Loading