From 71fe8ff10be3feddf1008005ef29914f4f356dc6 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 19 Sep 2019 11:41:31 -0700 Subject: [PATCH] Update msrest and regenerate swagger. (#7308) * Update msrest and regenerate swagger. * override to get green CI. --- sdk/storage/azure-storage-blob/setup.py | 2 +- ...test_list_blobs_with_include_metadata.yaml | 339 ++++++++++++++-- ...test_list_blobs_with_include_multiple.yaml | 367 +++++++++++++++--- ...test_list_blobs_with_include_metadata.yaml | 284 ++++++++++++++ ...test_list_blobs_with_include_multiple.yaml | 288 ++++++++++++++ .../tests/test_container.py | 4 +- .../tests/test_container_async.py | 2 - .../storage/file/_generated/models/_models.py | 4 +- .../file/_generated/models/_models_py3.py | 4 +- sdk/storage/azure-storage-file/setup.py | 2 +- sdk/storage/azure-storage-queue/setup.py | 2 +- shared_requirements.txt | 3 + 12 files changed, 1208 insertions(+), 93 deletions(-) diff --git a/sdk/storage/azure-storage-blob/setup.py b/sdk/storage/azure-storage-blob/setup.py index d52a93498b7c..63becf5ff97b 100644 --- a/sdk/storage/azure-storage-blob/setup.py +++ b/sdk/storage/azure-storage-blob/setup.py @@ -92,7 +92,7 @@ ]), install_requires=[ "azure-core<2.0.0,>=1.0.0b4", - "msrest>=0.5.0", + "msrest>=0.6.10", "cryptography>=2.1.4" ], extras_require={ diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_metadata.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_metadata.yaml index 7e88923c11a5..4dddb1209431 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_metadata.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_metadata.yaml @@ -214,18 +214,17 @@ interactions: uri: https://remotestoragename.blob.core.windows.net/container3851155b?include=metadata&restype=container&comp=list response: body: - string: "\uFEFFblob1Fri,\ - \ 14 Jun 2019 17:42:40 GMTFri, 14 Jun 2019\ - \ 17:42:40 GMT0x8D6F0EFB2930C8F11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri,\ - \ 14 Jun 2019 17:42:40 GMTFri, 14 Jun 2019\ - \ 17:42:40 GMT0x8D6F0EFB2A5D4A311application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + string: "\uFEFFblob1Fri, + 14 Jun 2019 17:42:40 GMTFri, 14 Jun 2019 17:42:40 + GMT0x8D6F0EFB2930C8F11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri, + 14 Jun 2019 17:42:40 GMTFri, 14 Jun 2019 17:42:40 + GMT0x8D6F0EFB2A5D4A311application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" headers: Content-Type: - application/xml @@ -459,18 +458,17 @@ interactions: uri: https://storagename.blob.core.windows.net/container3851155b?include=metadata&restype=container&comp=list response: body: - string: "\uFEFFblob1Fri,\ - \ 14 Jun 2019 18:49:15 GMTFri, 14 Jun 2019\ - \ 18:49:15 GMT0x8D6F0F90013B60B11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri,\ - \ 14 Jun 2019 18:49:15 GMTFri, 14 Jun 2019\ - \ 18:49:15 GMT0x8D6F0F9002768A911application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + string: "\uFEFFblob1Fri, + 14 Jun 2019 18:49:15 GMTFri, 14 Jun 2019 18:49:15 + GMT0x8D6F0F90013B60B11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri, + 14 Jun 2019 18:49:15 GMTFri, 14 Jun 2019 18:49:15 + GMT0x8D6F0F9002768A911application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" headers: Content-Type: - application/xml @@ -704,18 +702,17 @@ interactions: uri: https://storagename.blob.core.windows.net/container3851155b?include=metadata&restype=container&comp=list response: body: - string: "\uFEFFblob1Fri,\ - \ 14 Jun 2019 19:25:07 GMTFri, 14 Jun 2019\ - \ 19:25:07 GMT0x8D6F0FE027E045E11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri,\ - \ 14 Jun 2019 19:25:07 GMTFri, 14 Jun 2019\ - \ 19:25:07 GMT0x8D6F0FE02907E4811application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + string: "\uFEFFblob1Fri, + 14 Jun 2019 19:25:07 GMTFri, 14 Jun 2019 19:25:07 + GMT0x8D6F0FE027E045E11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri, + 14 Jun 2019 19:25:07 GMTFri, 14 Jun 2019 19:25:07 + GMT0x8D6F0FE02907E4811application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" headers: Content-Type: - application/xml @@ -734,4 +731,274 @@ interactions: status: code: 200 message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '0' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 9570d574-d8ba-11e9-b1fb-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:49 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container3851155b?restype=container + response: + body: + string: '' + headers: + Content-Length: + - '0' + Date: + - Mon, 16 Sep 2019 19:45:49 GMT + ETag: + - '"0x8D73ADE79D6BF9D"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:49 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 9570d574-d8ba-11e9-b1fb-2816a845e8c6 + x-ms-request-id: + - cf373ba3-401e-0085-40c7-6c33d5000000 + x-ms-version: + - '2019-02-02' + status: + code: 201 + message: Created +- request: + body: hello world + headers: + Accept: + - '*/*' + 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.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 95afe390-d8ba-11e9-a24a-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:49 GMT + x-ms-meta-name: + - bob + x-ms-meta-number: + - '1' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container3851155b/blob1 + response: + body: + string: '' + headers: + Content-Length: + - '0' + Content-MD5: + - XrY7u+Ae7tCTyyK7j1rNww== + Date: + - Mon, 16 Sep 2019 19:45:49 GMT + ETag: + - '"0x8D73ADE79E6C21D"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:49 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 95afe390-d8ba-11e9-a24a-2816a845e8c6 + x-ms-content-crc64: + - vo7q9sPVKY0= + x-ms-request-id: + - cf373bb9-401e-0085-53c7-6c33d5000000 + x-ms-request-server-encrypted: + - 'true' + x-ms-version: + - '2019-02-02' + status: + code: 201 + message: Created +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '0' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 95bcab98-d8ba-11e9-8b63-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:49 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container3851155b/blob1?comp=snapshot + response: + body: + string: '' + headers: + Content-Length: + - '0' + Date: + - Mon, 16 Sep 2019 19:45:49 GMT + ETag: + - '"0x8D73ADE79E6C21D"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:49 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 95bcab98-d8ba-11e9-8b63-2816a845e8c6 + x-ms-request-id: + - cf373bc7-401e-0085-61c7-6c33d5000000 + x-ms-request-server-encrypted: + - 'false' + x-ms-snapshot: + - '2019-09-16T19:45:49.9452018Z' + x-ms-version: + - '2019-02-02' + status: + code: 201 + message: Created +- request: + body: hello world + headers: + Accept: + - '*/*' + 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.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 95dbd006-d8ba-11e9-8038-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:50 GMT + x-ms-meta-name: + - car + x-ms-meta-number: + - '2' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container3851155b/blob2 + response: + body: + string: '' + headers: + Content-Length: + - '0' + Content-MD5: + - XrY7u+Ae7tCTyyK7j1rNww== + Date: + - Mon, 16 Sep 2019 19:45:49 GMT + ETag: + - '"0x8D73ADE7A130A63"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:50 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 95dbd006-d8ba-11e9-8038-2816a845e8c6 + x-ms-content-crc64: + - vo7q9sPVKY0= + x-ms-request-id: + - cf373c10-401e-0085-24c7-6c33d5000000 + x-ms-request-server-encrypted: + - 'true' + x-ms-version: + - '2019-02-02' + 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.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 95e93b30-d8ba-11e9-a30a-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:50 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/container3851155b?include=metadata&restype=container&comp=list + response: + body: + string: "\uFEFFblob1Mon, + 16 Sep 2019 19:45:49 GMTMon, 16 Sep 2019 19:45:49 + GMT0x8D73ADE79E6C21D11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Mon, + 16 Sep 2019 19:45:50 GMTMon, 16 Sep 2019 19:45:50 + GMT0x8D73ADE7A130A6311application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + headers: + Content-Type: + - application/xml + Date: + - Mon, 16 Sep 2019 19:45:50 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + Transfer-Encoding: + - chunked + Vary: + - Origin + x-ms-client-request-id: + - 95e93b30-d8ba-11e9-a30a-2816a845e8c6 + x-ms-request-id: + - cf373c33-401e-0085-45c7-6c33d5000000 + x-ms-version: + - '2019-02-02' + status: + code: 200 + message: OK version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_multiple.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_multiple.yaml index 2338c2cd8734..aed98279be9f 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_multiple.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_list_blobs_with_include_multiple.yaml @@ -214,22 +214,21 @@ interactions: uri: https://remotestoragename.blob.core.windows.net/container39251586?include=snapshots%2Cmetadata&restype=container&comp=list response: body: - string: "\uFEFFblob12019-06-14T17:42:41.1421008ZFri,\ - \ 14 Jun 2019 17:42:41 GMTFri, 14 Jun 2019\ - \ 17:42:41 GMT0x8D6F0EFB3056B0011application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobtrue1bobblob1Fri,\ - \ 14 Jun 2019 17:42:41 GMTFri, 14 Jun 2019\ - \ 17:42:41 GMT0x8D6F0EFB3056B0011application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri,\ - \ 14 Jun 2019 17:42:41 GMTFri, 14 Jun 2019\ - \ 17:42:41 GMT0x8D6F0EFB3185A2B11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + string: "\uFEFFblob12019-06-14T17:42:41.1421008ZFri, + 14 Jun 2019 17:42:41 GMTFri, 14 Jun 2019 17:42:41 + GMT0x8D6F0EFB3056B0011application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobtrue1bobblob1Fri, + 14 Jun 2019 17:42:41 GMTFri, 14 Jun 2019 17:42:41 + GMT0x8D6F0EFB3056B0011application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri, + 14 Jun 2019 17:42:41 GMTFri, 14 Jun 2019 17:42:41 + GMT0x8D6F0EFB3185A2B11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" headers: Content-Type: - application/xml @@ -463,22 +462,21 @@ interactions: uri: https://storagename.blob.core.windows.net/container39251586?include=snapshots%2Cmetadata&restype=container&comp=list response: body: - string: "\uFEFFblob12019-06-14T18:49:16.7655186ZFri,\ - \ 14 Jun 2019 18:49:16 GMTFri, 14 Jun 2019\ - \ 18:49:16 GMT0x8D6F0F9009903AB11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobtrue1bobblob1Fri,\ - \ 14 Jun 2019 18:49:16 GMTFri, 14 Jun 2019\ - \ 18:49:16 GMT0x8D6F0F9009903AB11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri,\ - \ 14 Jun 2019 18:49:16 GMTFri, 14 Jun 2019\ - \ 18:49:16 GMT0x8D6F0F900AC8F3211application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + string: "\uFEFFblob12019-06-14T18:49:16.7655186ZFri, + 14 Jun 2019 18:49:16 GMTFri, 14 Jun 2019 18:49:16 + GMT0x8D6F0F9009903AB11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobtrue1bobblob1Fri, + 14 Jun 2019 18:49:16 GMTFri, 14 Jun 2019 18:49:16 + GMT0x8D6F0F9009903AB11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri, + 14 Jun 2019 18:49:16 GMTFri, 14 Jun 2019 18:49:16 + GMT0x8D6F0F900AC8F3211application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" headers: Content-Type: - application/xml @@ -712,22 +710,21 @@ interactions: uri: https://storagename.blob.core.windows.net/container39251586?include=snapshots%2Cmetadata&restype=container&comp=list response: body: - string: "\uFEFFblob12019-06-14T19:25:08.4293869ZFri,\ - \ 14 Jun 2019 19:25:08 GMTFri, 14 Jun 2019\ - \ 19:25:08 GMT0x8D6F0FE03172BB311application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobtrue1bobblob1Fri,\ - \ 14 Jun 2019 19:25:08 GMTFri, 14 Jun 2019\ - \ 19:25:08 GMT0x8D6F0FE03172BB311application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri,\ - \ 14 Jun 2019 19:25:08 GMTFri, 14 Jun 2019\ - \ 19:25:08 GMT0x8D6F0FE032B539B11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + string: "\uFEFFblob12019-06-14T19:25:08.4293869ZFri, + 14 Jun 2019 19:25:08 GMTFri, 14 Jun 2019 19:25:08 + GMT0x8D6F0FE03172BB311application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobtrue1bobblob1Fri, + 14 Jun 2019 19:25:08 GMTFri, 14 Jun 2019 19:25:08 + GMT0x8D6F0FE03172BB311application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Fri, + 14 Jun 2019 19:25:08 GMTFri, 14 Jun 2019 19:25:08 + GMT0x8D6F0FE032B539B11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" headers: Content-Type: - application/xml @@ -746,4 +743,278 @@ interactions: status: code: 200 message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '0' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 8d80b87a-d8ba-11e9-95b0-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:36 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container39251586?restype=container + response: + body: + string: '' + headers: + Content-Length: + - '0' + Date: + - Mon, 16 Sep 2019 19:45:36 GMT + ETag: + - '"0x8D73ADE71E22981"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:36 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 8d80b87a-d8ba-11e9-95b0-2816a845e8c6 + x-ms-request-id: + - 36552554-701e-002c-2ec7-6ce63d000000 + x-ms-version: + - '2019-02-02' + status: + code: 201 + message: Created +- request: + body: hello world + headers: + Accept: + - '*/*' + 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.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 8dbe9006-d8ba-11e9-a1bb-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:36 GMT + x-ms-meta-name: + - bob + x-ms-meta-number: + - '1' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container39251586/blob1 + response: + body: + string: '' + headers: + Content-Length: + - '0' + Content-MD5: + - XrY7u+Ae7tCTyyK7j1rNww== + Date: + - Mon, 16 Sep 2019 19:45:36 GMT + ETag: + - '"0x8D73ADE71F5E61E"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:36 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 8dbe9006-d8ba-11e9-a1bb-2816a845e8c6 + x-ms-content-crc64: + - vo7q9sPVKY0= + x-ms-request-id: + - 36552599-701e-002c-6dc7-6ce63d000000 + x-ms-request-server-encrypted: + - 'true' + x-ms-version: + - '2019-02-02' + status: + code: 201 + message: Created +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '0' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 8dcc2142-d8ba-11e9-aba0-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:36 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container39251586/blob1?comp=snapshot + response: + body: + string: '' + headers: + Content-Length: + - '0' + Date: + - Mon, 16 Sep 2019 19:45:36 GMT + ETag: + - '"0x8D73ADE71F5E61E"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:36 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 8dcc2142-d8ba-11e9-aba0-2816a845e8c6 + x-ms-request-id: + - 365525b4-701e-002c-06c7-6ce63d000000 + x-ms-request-server-encrypted: + - 'false' + x-ms-snapshot: + - '2019-09-16T19:45:36.6196529Z' + x-ms-version: + - '2019-02-02' + status: + code: 201 + message: Created +- request: + body: hello world + headers: + Accept: + - '*/*' + 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.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 8ddcfaa8-d8ba-11e9-80af-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:36 GMT + x-ms-meta-name: + - car + x-ms-meta-number: + - '2' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/container39251586/blob2 + response: + body: + string: '' + headers: + Content-Length: + - '0' + Content-MD5: + - XrY7u+Ae7tCTyyK7j1rNww== + Date: + - Mon, 16 Sep 2019 19:45:36 GMT + ETag: + - '"0x8D73ADE72133780"' + Last-Modified: + - Mon, 16 Sep 2019 19:45:36 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: + - 8ddcfaa8-d8ba-11e9-80af-2816a845e8c6 + x-ms-content-crc64: + - vo7q9sPVKY0= + x-ms-request-id: + - 365525d1-701e-002c-22c7-6ce63d000000 + x-ms-request-server-encrypted: + - 'true' + x-ms-version: + - '2019-02-02' + 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.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 8de92180-d8ba-11e9-93e6-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:36 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/container39251586?include=snapshots%2Cmetadata&restype=container&comp=list + response: + body: + string: "\uFEFFblob12019-09-16T19:45:36.6196529ZMon, + 16 Sep 2019 19:45:36 GMTMon, 16 Sep 2019 19:45:36 + GMT0x8D73ADE71F5E61E11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottruetrue1bobblob1Mon, + 16 Sep 2019 19:45:36 GMTMon, 16 Sep 2019 19:45:36 + GMT0x8D73ADE71F5E61E11application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Mon, + 16 Sep 2019 19:45:36 GMTMon, 16 Sep 2019 19:45:36 + GMT0x8D73ADE7213378011application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + headers: + Content-Type: + - application/xml + Date: + - Mon, 16 Sep 2019 19:45:36 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + Transfer-Encoding: + - chunked + Vary: + - Origin + x-ms-client-request-id: + - 8de92180-d8ba-11e9-93e6-2816a845e8c6 + x-ms-request-id: + - 36552601-701e-002c-4fc7-6ce63d000000 + x-ms-version: + - '2019-02-02' + status: + code: 200 + message: OK version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_metadata.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_metadata.yaml index 3f54579c1300..0f8b2b86bbdf 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_metadata.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_metadata.yaml @@ -275,4 +275,288 @@ interactions: - /containerc2c617d8 - include=metadata&restype=container&comp=list - '' +- request: + body: null + headers: + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 7a1ff05e-d8ba-11e9-9121-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:03 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc2c617d8?restype=container + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE5E653684"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 7a1ff05e-d8ba-11e9-9121-2816a845e8c6 + x-ms-request-id: c1763d69-c01e-001c-28c7-6cbc17000000 + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc2c617d8 + - restype=container + - '' +- request: + body: hello world + headers: + Content-Length: + - '11' + Content-Type: + - application/octet-stream + If-None-Match: + - '*' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 7a3fc174-d8ba-11e9-bd85-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:03 GMT + x-ms-meta-name: + - bob + x-ms-meta-number: + - '1' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc2c617d8/blob1 + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Content-Md5 + : XrY7u+Ae7tCTyyK7j1rNww== + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE5E706C38"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 7a3fc174-d8ba-11e9-bd85-2816a845e8c6 + x-ms-content-crc64: vo7q9sPVKY0= + x-ms-request-id: c1763d7a-c01e-001c-37c7-6cbc17000000 + x-ms-request-server-encrypted: 'true' + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc2c617d8/blob1 + - '' + - '' +- request: + body: null + headers: + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 7a465180-d8ba-11e9-9f70-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:03 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc2c617d8/blob1?comp=snapshot + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE5E706C38"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 7a465180-d8ba-11e9-9f70-2816a845e8c6 + x-ms-request-id: c1763d85-c01e-001c-42c7-6cbc17000000 + x-ms-request-server-encrypted: 'false' + x-ms-snapshot: '2019-09-16T19:45:03.8231600Z' + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc2c617d8/blob1 + - comp=snapshot + - '' +- request: + body: hello world + headers: + Content-Length: + - '11' + Content-Type: + - application/octet-stream + If-None-Match: + - '*' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 7a513ed0-d8ba-11e9-a0e2-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:03 GMT + x-ms-meta-name: + - car + x-ms-meta-number: + - '2' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc2c617d8/blob2 + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Content-Md5 + : XrY7u+Ae7tCTyyK7j1rNww== + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE5E81D486"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 7a513ed0-d8ba-11e9-a0e2-2816a845e8c6 + x-ms-content-crc64: vo7q9sPVKY0= + x-ms-request-id: c1763d99-c01e-001c-56c7-6cbc17000000 + x-ms-request-server-encrypted: 'true' + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc2c617d8/blob2 + - '' + - '' +- request: + body: null + headers: + Accept: + - application/xml + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 7a57e72e-d8ba-11e9-8dc8-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:03 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/containerc2c617d8?include=metadata&restype=container&comp=list + response: + body: + string: "\uFEFFblob1Mon, + 16 Sep 2019 19:45:03 GMTMon, 16 Sep 2019 19:45:03 + GMT0x8D73ADE5E706C3811application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Mon, + 16 Sep 2019 19:45:03 GMTMon, 16 Sep 2019 19:45:03 + GMT0x8D73ADE5E81D48611application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Type + : application/xml + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:03 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + ? !!python/object/new:multidict._istr.istr + - Transfer-Encoding + : chunked + ? !!python/object/new:multidict._istr.istr + - Vary + : Origin + x-ms-client-request-id: 7a57e72e-d8ba-11e9-8dc8-2816a845e8c6 + x-ms-request-id: c1763da4-c01e-001c-60c7-6cbc17000000 + x-ms-version: '2019-02-02' + status: + code: 200 + message: OK + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc2c617d8 + - include=metadata&restype=container&comp=list + - '' version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_multiple.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_multiple.yaml index c77fa9dc0226..f59e50012e71 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_multiple.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_list_blobs_with_include_multiple.yaml @@ -279,4 +279,292 @@ interactions: - /containerc39a1803 - include=snapshots,metadata&restype=container&comp=list - '' +- request: + body: null + headers: + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 87e273f4-d8ba-11e9-8a99-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:26 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc39a1803?restype=container + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE6C26B4BB"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 87e273f4-d8ba-11e9-8a99-2816a845e8c6 + x-ms-request-id: 7ef2a18c-e01e-00ee-6fc7-6c6e83000000 + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc39a1803 + - restype=container + - '' +- request: + body: hello world + headers: + Content-Length: + - '11' + Content-Type: + - application/octet-stream + If-None-Match: + - '*' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 87ff0702-d8ba-11e9-9c28-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:26 GMT + x-ms-meta-name: + - bob + x-ms-meta-number: + - '1' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc39a1803/blob1 + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Content-Md5 + : XrY7u+Ae7tCTyyK7j1rNww== + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE6C2FCA06"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 87ff0702-d8ba-11e9-9c28-2816a845e8c6 + x-ms-content-crc64: vo7q9sPVKY0= + x-ms-request-id: 7ef2a1b4-e01e-00ee-0fc7-6c6e83000000 + x-ms-request-server-encrypted: 'true' + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc39a1803/blob1 + - '' + - '' +- request: + body: null + headers: + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 88059f6c-d8ba-11e9-8d04-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:26 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc39a1803/blob1?comp=snapshot + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE6C2FCA06"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 88059f6c-d8ba-11e9-8d04-2816a845e8c6 + x-ms-request-id: 7ef2a1c5-e01e-00ee-1fc7-6c6e83000000 + x-ms-request-server-encrypted: 'false' + x-ms-snapshot: '2019-09-16T19:45:26.8876806Z' + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc39a1803/blob1 + - comp=snapshot + - '' +- request: + body: hello world + headers: + Content-Length: + - '11' + Content-Type: + - application/octet-stream + If-None-Match: + - '*' + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + x-ms-blob-type: + - BlockBlob + x-ms-client-request-id: + - 880efcd2-d8ba-11e9-aa94-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:26 GMT + x-ms-meta-name: + - car + x-ms-meta-number: + - '2' + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/containerc39a1803/blob2 + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Content-Md5 + : XrY7u+Ae7tCTyyK7j1rNww== + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Etag + : '"0x8D73ADE6C3F5D42"' + ? !!python/object/new:multidict._istr.istr + - Last-Modified + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-client-request-id: 880efcd2-d8ba-11e9-aa94-2816a845e8c6 + x-ms-content-crc64: vo7q9sPVKY0= + x-ms-request-id: 7ef2a1e0-e01e-00ee-36c7-6c6e83000000 + x-ms-request-server-encrypted: 'true' + x-ms-version: '2019-02-02' + status: + code: 201 + message: Created + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc39a1803/blob2 + - '' + - '' +- request: + body: null + headers: + Accept: + - application/xml + User-Agent: + - azsdk-python-storage-blob/12.0.0b3 Python/3.7.3 (Windows-10-10.0.17763-SP0) + content-type: + - application/xml; charset=utf-8 + x-ms-client-request-id: + - 88153662-d8ba-11e9-a776-2816a845e8c6 + x-ms-date: + - Mon, 16 Sep 2019 19:45:27 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/containerc39a1803?include=snapshots,metadata&restype=container&comp=list + response: + body: + string: "\uFEFFblob12019-09-16T19:45:26.8876806ZMon, + 16 Sep 2019 19:45:26 GMTMon, 16 Sep 2019 19:45:26 + GMT0x8D73ADE6C2FCA0611application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottruetrue1bobblob1Mon, + 16 Sep 2019 19:45:26 GMTMon, 16 Sep 2019 19:45:26 + GMT0x8D73ADE6C2FCA0611application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue1bobblob2Mon, + 16 Sep 2019 19:45:26 GMTMon, 16 Sep 2019 19:45:26 + GMT0x8D73ADE6C3F5D4211application/octet-streamXrY7u+Ae7tCTyyK7j1rNww==BlockBlobHottrueunlockedavailabletrue2car" + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Type + : application/xml + ? !!python/object/new:multidict._istr.istr + - Date + : Mon, 16 Sep 2019 19:45:26 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + ? !!python/object/new:multidict._istr.istr + - Transfer-Encoding + : chunked + ? !!python/object/new:multidict._istr.istr + - Vary + : Origin + x-ms-client-request-id: 88153662-d8ba-11e9-a776-2816a845e8c6 + x-ms-request-id: 7ef2a1f2-e01e-00ee-47c7-6c6e83000000 + x-ms-version: '2019-02-02' + status: + code: 200 + message: OK + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - /containerc39a1803 + - include=snapshots,metadata&restype=container&comp=list + - '' version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/test_container.py b/sdk/storage/azure-storage-blob/tests/test_container.py index d04a74e8b3bf..1e02d20e4b4a 100644 --- a/sdk/storage/azure-storage-blob/tests/test_container.py +++ b/sdk/storage/azure-storage-blob/tests/test_container.py @@ -862,7 +862,7 @@ def test_list_blobs_with_include_snapshots(self): @record def test_list_blobs_with_include_metadata(self): # Arrange - pytest.skip("Waiting on metadata XML fix in msrest") + container = self._create_container() data = b'hello world' blob1 = container.get_blob_client('blob1') @@ -990,7 +990,7 @@ def recursive_walk(prefix): @record def test_list_blobs_with_include_multiple(self): # Arrange - pytest.skip("Waiting on metadata XML fix in msrest") + container = self._create_container() data = b'hello world' blob1 = container.get_blob_client('blob1') diff --git a/sdk/storage/azure-storage-blob/tests/test_container_async.py b/sdk/storage/azure-storage-blob/tests/test_container_async.py index c42b9ff9fd7e..212cec72043a 100644 --- a/sdk/storage/azure-storage-blob/tests/test_container_async.py +++ b/sdk/storage/azure-storage-blob/tests/test_container_async.py @@ -1069,7 +1069,6 @@ def test_list_blobs_with_include_snapshots(self): async def _test_list_blobs_with_include_metadata(self): # Arrange - pytest.skip("Waiting on metadata XML fix in msrest") container = await self._create_container() data = b'hello world' blob1 = container.get_blob_client('blob1') @@ -1236,7 +1235,6 @@ def test_walk_blobs_with_delimiter(self): async def _test_list_blobs_with_include_multiple(self): # Arrange - pytest.skip("Waiting on metadata XML fix in msrest") container = await self._create_container() data = b'hello world' blob1 = container.get_blob_client('blob1') diff --git a/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models.py b/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models.py index 84fb9c3b0379..7e8f4f76a747 100644 --- a/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models.py +++ b/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models.py @@ -609,7 +609,9 @@ class SharePermission(Model): } _attribute_map = { - 'permission': {'key': 'permission', 'type': 'str'}, + 'permission': {'key': 'permission', 'type': 'str', 'xml': {'name': 'permission'}}, + } + _xml_map = { } def __init__(self, **kwargs): diff --git a/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models_py3.py b/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models_py3.py index 47fc93f0aa98..2424a64c6fda 100644 --- a/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models_py3.py +++ b/sdk/storage/azure-storage-file/azure/storage/file/_generated/models/_models_py3.py @@ -609,7 +609,9 @@ class SharePermission(Model): } _attribute_map = { - 'permission': {'key': 'permission', 'type': 'str'}, + 'permission': {'key': 'permission', 'type': 'str', 'xml': {'name': 'permission'}}, + } + _xml_map = { } def __init__(self, *, permission: str, **kwargs) -> None: diff --git a/sdk/storage/azure-storage-file/setup.py b/sdk/storage/azure-storage-file/setup.py index 65535f0b2ac1..24ce7e90317c 100644 --- a/sdk/storage/azure-storage-file/setup.py +++ b/sdk/storage/azure-storage-file/setup.py @@ -80,7 +80,7 @@ ]), install_requires=[ "azure-core<2.0.0,>=1.0.0b4", - "msrest>=0.5.0", + "msrest>=0.6.10", "cryptography>=2.1.4" ], extras_require={ diff --git a/sdk/storage/azure-storage-queue/setup.py b/sdk/storage/azure-storage-queue/setup.py index 047817c01ca0..0a71c9ad7af8 100644 --- a/sdk/storage/azure-storage-queue/setup.py +++ b/sdk/storage/azure-storage-queue/setup.py @@ -80,7 +80,7 @@ ]), install_requires=[ "azure-core<2.0.0,>=1.0.0b4", - "msrest>=0.5.0", + "msrest>=0.6.10", "cryptography>=2.1.4" ], extras_require={ diff --git a/shared_requirements.txt b/shared_requirements.txt index 601385e1a452..dee2ae3397bd 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -107,6 +107,9 @@ six>=1.6 #override azure-storage-queue azure-core<2.0.0,>=1.0.0b4 #override azure-storage-file azure-core<2.0.0,>=1.0.0b4 #override azure-eventhub azure-core<2.0.0,>=1.0.0b4 +#override azure-storage-blob msrest>=0.6.10 +#override azure-storage-queue msrest>=0.6.10 +#override azure-storage-file msrest>=0.6.10 #override azure-cosmos azure-core<2.0.0,>=1.0.0b3 #override azure-eventhub-checkpointstoreblob-aio azure-storage-blob<=12.0.0b4,>=12.0.0b2 #override azure-eventhub-checkpointstoreblob-aio aiohttp<4.0,>=3.0 \ No newline at end of file