diff --git a/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts b/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts index f466e38cdbff..383ff8525a4a 100644 --- a/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts +++ b/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts @@ -2,26 +2,27 @@ import { ClientSecretCredential } from "@azure/identity"; import { getKeyvaultName } from "./utils.common"; import { CertificateClient } from "../../src"; import { uniqueString } from "./recorderUtils"; -import { env, record, setReplaceableVariables, setReplacements } from "@azure/test-utils-recorder"; +import { env, record, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; import TestClient from "./testClient"; export async function authenticate(that: any): Promise { - setReplaceableVariables({ - AZURE_CLIENT_ID: "azure_client_id", - AZURE_CLIENT_SECRET: "azure_client_secret", - AZURE_TENANT_ID: "azure_tenant_id", - KEYVAULT_NAME: "keyvault_name" - }); - const suffix = uniqueString(); - setReplacements([ - (recording: any): any => - recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`), - (recording: any): any => - suffix === "" ? recording : recording.replace(new RegExp(suffix, "g"), "") - ]); - - const recorder = record(that); + const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "azure_tenant_id", + KEYVAULT_NAME: "keyvault_name" + }, + replaceInRecordings: [ + (recording: any): any => + recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`), + (recording: any): any => + suffix === "" ? recording : recording.replace(new RegExp(suffix, "g"), "") + ], + queryParametersToSkip: [] + }; + const recorder = record(that, recorderEnvSetup); const credential = await new ClientSecretCredential( env.AZURE_TENANT_ID, env.AZURE_CLIENT_ID, diff --git a/sdk/keyvault/keyvault-keys/test/utils/testAuthentication.ts b/sdk/keyvault/keyvault-keys/test/utils/testAuthentication.ts index 3f8b8ad14e78..8344b902d74b 100644 --- a/sdk/keyvault/keyvault-keys/test/utils/testAuthentication.ts +++ b/sdk/keyvault/keyvault-keys/test/utils/testAuthentication.ts @@ -1,27 +1,28 @@ import { ClientSecretCredential } from "@azure/identity"; import { getKeyvaultName } from "./utils.common"; import { KeyClient } from "../../src"; -import { env, record, setReplaceableVariables, setReplacements } from "@azure/test-utils-recorder"; +import { env, record, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; import { uniqueString } from "./recorderUtils"; import TestClient from "./testClient"; export async function authenticate(that: any): Promise { - setReplaceableVariables({ - AZURE_CLIENT_ID: "azure_client_id", - AZURE_CLIENT_SECRET: "azure_client_secret", - AZURE_TENANT_ID: "azure_tenant_id", - KEYVAULT_NAME: "keyvault_name" - }); - const keySuffix = uniqueString(); - setReplacements([ - (recording: any): any => - recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`), - (recording: any): any => - keySuffix === "" ? recording : recording.replace(new RegExp(keySuffix, "g"), "") - ]); - - const recorder = record(that); + const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "azure_tenant_id", + KEYVAULT_NAME: "keyvault_name" + }, + replaceInRecordings: [ + (recording: any): any => + recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`), + (recording: any): any => + keySuffix === "" ? recording : recording.replace(new RegExp(keySuffix, "g"), "") + ], + queryParametersToSkip: [] + }; + const recorder = record(that, recorderEnvSetup); const credential = await new ClientSecretCredential( env.AZURE_TENANT_ID, env.AZURE_CLIENT_ID, diff --git a/sdk/keyvault/keyvault-secrets/test/utils/testAuthentication.ts b/sdk/keyvault/keyvault-secrets/test/utils/testAuthentication.ts index e10dbc91295c..b5205ba1ae0b 100644 --- a/sdk/keyvault/keyvault-secrets/test/utils/testAuthentication.ts +++ b/sdk/keyvault/keyvault-secrets/test/utils/testAuthentication.ts @@ -1,27 +1,28 @@ import { ClientSecretCredential } from "@azure/identity"; import { getKeyvaultName } from "./utils.common"; import { SecretClient } from "../../src"; -import { env, record, setReplaceableVariables, setReplacements } from "@azure/test-utils-recorder"; +import { env, record, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; import { uniqueString } from "./recorderUtils"; import TestClient from "./testClient"; export async function authenticate(that: any): Promise { - setReplaceableVariables({ - AZURE_CLIENT_ID: "azure_client_id", - AZURE_CLIENT_SECRET: "azure_client_secret", - AZURE_TENANT_ID: "azure_tenant_id", - KEYVAULT_NAME: "keyvault_name" - }); - const secretSuffix = uniqueString(); - setReplacements([ - (recording: any): any => - recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`), - (recording: any): any => - secretSuffix === "" ? recording : recording.replace(new RegExp(secretSuffix, "g"), "") - ]); - - const recorder = record(that); + const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "azure_tenant_id", + KEYVAULT_NAME: "keyvault_name" + }, + replaceInRecordings: [ + (recording: any): any => + recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`), + (recording: any): any => + secretSuffix === "" ? recording : recording.replace(new RegExp(secretSuffix, "g"), "") + ], + queryParametersToSkip: [] + }; + const recorder = record(that, recorderEnvSetup); const credential = await new ClientSecretCredential( env.AZURE_TENANT_ID, env.AZURE_CLIENT_ID, diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic.json index 66df49c3c654..5ac0180f1917 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89157003464837006294", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570842509818", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:28 GMT", + "etag": "\"0x8D7A3AA861235E8\"", + "last-modified": "Tue, 28 Jan 2020 04:28:28 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "e04c1195-d673-47ef-8bb8-d96b515a36dc", + "x-ms-request-id": "2bd8b03c-401e-0017-7193-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570842509818/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018570859108609", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BE8A99D0\"", - "x-ms-request-id": "21600056-201e-0080-1840-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "bb32abcb-b67d-4fac-a9c0-1afb7a91882f", + "date": "Tue, 28 Jan 2020 04:28:28 GMT", + "etag": "\"0x8D7A3AA862BE66C\"", + "last-modified": "Tue, 28 Jan 2020 04:28:28 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "81d64e34-45f0-4e9a-9eee-3987fd5ace12", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8b069-401e-0017-1a93-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89157003464837006294", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570842509818/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018570859108609", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:28 GMT", + "etag": "\"0x8D7A3AA862BE66C\"", + "last-modified": "Tue, 28 Jan 2020 04:28:28 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "4228305f-07c9-489d-b81d-4831be9e7c1e", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "414e47f3-047d-4377-827d-1f9509712061", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:28 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BE8A99D0\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "2160009c-201e-0080-5740-7993dc000000" + "x-ms-request-id": "2bd8b09a-401e-0017-4b93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570842509818", "query": { - "comp": "list", - "prefix": "عربي/عربى157003464837006294", - "restype": "container" + "prefix": "عربي/عربى158018570859108609", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "عربي/عربى157003464837006294عربي/عربى157003464837006294Wed, 02 Oct 2019 16:44:08 GMTWed, 02 Oct 2019 16:44:08 GMT0x8D74757BE8A99D01application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "عربي/عربى158018570859108609عربي/عربى158018570859108609Tue, 28 Jan 2020 04:28:28 GMTTue, 28 Jan 2020 04:28:28 GMT0x8D7A3AA862BE66C1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:28 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "216000c8-201e-0080-0140-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "c23a4e9e-3346-473d-99ea-91712e737bef" + "x-ms-client-request-id": "d88ac7dc-738e-4212-9bc0-2a65230ad1c2", + "x-ms-request-id": "2bd8b0ce-401e-0017-7b93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570842509818", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:29 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "f8937a39-e130-4c6a-9b8a-08806c8ac8a7", + "x-ms-request-id": "2bd8b0fa-401e-0017-2593-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "عربي/عربى": "عربي/عربى157003464837006294" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570842509818", + "عربي/عربى": "عربي/عربى158018570859108609" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.json index 29d97bc35f0b..4778c6f15efe 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89157003464857309222", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570927706662", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:29 GMT", + "etag": "\"0x8D7A3AA8694C3DF\"", + "last-modified": "Tue, 28 Jan 2020 04:28:29 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "75a15865-3071-4f72-83e3-89044d588286", + "x-ms-request-id": "2bd8b12b-401e-0017-5093-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570927706662/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89158018570944805900", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BEA9258F\"", - "x-ms-request-id": "216000f2-201e-0080-2540-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "e851c444-5ca0-43ee-bb69-2e093d9c42b6", + "date": "Tue, 28 Jan 2020 04:28:29 GMT", + "etag": "\"0x8D7A3AA86AEE968\"", + "last-modified": "Tue, 28 Jan 2020 04:28:29 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "e274d1cb-a34c-4440-948b-32df7591902f", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8b163-401e-0017-0193-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89157003464857309222", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570927706662/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89158018570944805900", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:29 GMT", + "etag": "\"0x8D7A3AA86AEE968\"", + "last-modified": "Tue, 28 Jan 2020 04:28:29 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "0aa7aba1-3902-4a1a-9d8f-3bca0513b0ca", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "78ba1709-3698-41d1-bba1-78de095837e6", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:29 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BEA9258F\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "21600130-201e-0080-5d40-7993dc000000" + "x-ms-request-id": "2bd8b199-401e-0017-3093-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570927706662", "query": { - "comp": "list", - "prefix": "عربي/عربى157003464857309222", - "restype": "container" + "prefix": "عربي/عربى158018570944805900", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "عربي/عربى157003464857309222عربي/عربى157003464857309222Wed, 02 Oct 2019 16:44:08 GMTWed, 02 Oct 2019 16:44:08 GMT0x8D74757BEA9258F1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "عربي/عربى158018570944805900عربي/عربى158018570944805900Tue, 28 Jan 2020 04:28:29 GMTTue, 28 Jan 2020 04:28:29 GMT0x8D7A3AA86AEE9681application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:29 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "21600151-201e-0080-7940-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "e7bd40d0-6b80-4097-97e0-235829e5f5f9" + "x-ms-client-request-id": "a48b50e0-ac75-413c-a38f-f51938f53f72", + "x-ms-request-id": "2bd8b1c4-401e-0017-5793-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570927706662", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:30 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "3aff9942-a72b-467a-bfe2-6cfb66a3081a", + "x-ms-request-id": "2bd8b200-401e-0017-0d93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "عربي/عربى": "عربي/عربى157003464857309222" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570927706662", + "عربي/عربى": "عربي/عربى158018570944805900" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.json index e1e607a15480..a0ee9bd10e8a 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589157003464816300381", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570756501376", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:27 GMT", + "etag": "\"0x8D7A3AA85901D30\"", + "last-modified": "Tue, 28 Jan 2020 04:28:27 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "e3b49f8a-fb4f-481b-9ca3-c119eba16b84", + "x-ms-request-id": "2bd8af58-401e-0017-1b93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570756501376/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589158018570774406691", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BE6AAE2F\"", - "x-ms-request-id": "215fffce-201e-0080-2340-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "6c071000-2cfa-405f-ac68-0ed8c9f05ad4", + "date": "Tue, 28 Jan 2020 04:28:27 GMT", + "etag": "\"0x8D7A3AA85AC1851\"", + "last-modified": "Tue, 28 Jan 2020 04:28:27 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "bf8fd356-2234-421f-8557-55406d797f10", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8af81-401e-0017-4093-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589157003464816300381", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570756501376/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589158018570774406691", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:27 GMT", + "etag": "\"0x8D7A3AA85AC1851\"", + "last-modified": "Tue, 28 Jan 2020 04:28:27 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "0264c8da-dcb7-47ef-b334-e1003c17f3cf", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "ad1c1822-b1b6-4d70-9b4f-cf743defd245", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:27 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BE6AAE2F\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffffa-201e-0080-4840-7993dc000000" + "x-ms-request-id": "2bd8afb0-401e-0017-6e93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570756501376", "query": { - "comp": "list", - "prefix": "%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89157003464816300381", - "restype": "container" + "prefix": "%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018570774406691", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89157003464816300381%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89157003464816300381Wed, 02 Oct 2019 16:44:07 GMTWed, 02 Oct 2019 16:44:07 GMT0x8D74757BE6AAE2F1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018570774406691%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018570774406691Tue, 28 Jan 2020 04:28:27 GMTTue, 28 Jan 2020 04:28:27 GMT0x8D7A3AA85AC18511application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:28 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "21600026-201e-0080-6e40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "a6f55b84-8ec0-4fdb-b154-3f6a6833a355" + "x-ms-client-request-id": "cf2d4fe1-a59d-477d-925c-8e398d37c2c2", + "x-ms-request-id": "2bd8aff3-401e-0017-2b93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570756501376", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:28 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "0dc49944-6d79-4609-a43e-83260a1d3c56", + "x-ms-request-id": "2bd8b018-401e-0017-4d93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "عربي/عربى": "عربي/عربى157003464816300381" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570756501376", + "عربي/عربى": "عربي/عربى158018570774406691" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters.json index b8dfaa15bd0b..9d75176ba81c 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27157003464714708502", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570326800067", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:23 GMT", + "etag": "\"0x8D7A3AA82FFAD38\"", + "last-modified": "Tue, 28 Jan 2020 04:28:23 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "1f84a971-f700-4ea4-8726-48ed03043c44", + "x-ms-request-id": "2bd8a9cb-401e-0017-7993-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570326800067/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27158018570343700073", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BDCF5AC3\"", - "x-ms-request-id": "215ffcea-201e-0080-2240-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "64825f12-a140-4971-8bea-5c2739329bc4", + "date": "Tue, 28 Jan 2020 04:28:23 GMT", + "etag": "\"0x8D7A3AA831A97A5\"", + "last-modified": "Tue, 28 Jan 2020 04:28:23 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "0697a179-a59b-4b10-8540-2c61c2295fe4", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a9fb-401e-0017-2693-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27157003464714708502", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570326800067/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27158018570343700073", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:23 GMT", + "etag": "\"0x8D7A3AA831A97A5\"", + "last-modified": "Tue, 28 Jan 2020 04:28:23 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "6e305369-8e15-46e1-ba3d-8e0e6c432fcb", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "0e0ea3c9-0493-42cc-b335-008db2fe9d5f", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:23 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BDCF5AC3\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffd1e-201e-0080-4c40-7993dc000000" + "x-ms-request-id": "2bd8aa36-401e-0017-5d93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570326800067", "query": { - "comp": "list", - "prefix": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'157003464714708502", - "restype": "container" + "prefix": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018570343700073", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'157003464714708502汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'157003464714708502Wed, 02 Oct 2019 16:44:06 GMTWed, 02 Oct 2019 16:44:06 GMT0x8D74757BDCF5AC31application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018570343700073汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018570343700073Tue, 28 Jan 2020 04:28:23 GMTTue, 28 Jan 2020 04:28:23 GMT0x8D7A3AA831A97A51application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:23 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffd46-201e-0080-6d40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "ec4025f6-d9d0-417c-bec4-274f475a409b" + "x-ms-client-request-id": "4d9f1246-b3fe-4a55-9960-6ec3f429f336", + "x-ms-request-id": "2bd8aa75-401e-0017-1593-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570326800067", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:24 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "8c22284c-c10b-4a8d-aa99-657604b85538", + "x-ms-request-id": "2bd8aaba-401e-0017-5893-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'157003464714708502" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570326800067", + "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'158018570343700073" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.json index dd6d8c633ad7..d3e732c8a5dd 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27157003464734503528", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570414509004", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:24 GMT", + "etag": "\"0x8D7A3AA8385BE43\"", + "last-modified": "Tue, 28 Jan 2020 04:28:24 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "0937d057-dfbc-4bdc-996c-bdc3b79ed917", + "x-ms-request-id": "2bd8ab03-401e-0017-1893-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570414509004/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27158018570431606347", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BDED7139\"", - "x-ms-request-id": "215ffd6d-201e-0080-0e40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "0f0945b3-1b6c-47c3-bd21-a34d93016be6", + "date": "Tue, 28 Jan 2020 04:28:24 GMT", + "etag": "\"0x8D7A3AA83A0F696\"", + "last-modified": "Tue, 28 Jan 2020 04:28:24 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "95aaad92-9ef3-4048-ae84-4168d55b93ac", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8ab3d-401e-0017-4c93-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27157003464734503528", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570414509004/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27158018570431606347", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:24 GMT", + "etag": "\"0x8D7A3AA83A0F696\"", + "last-modified": "Tue, 28 Jan 2020 04:28:24 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "cd5ceddd-c5e7-43b2-ab57-eb7360479621", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "41b603f0-3209-483e-980d-8d11e36083b6", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:24 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BDED7139\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffdc8-201e-0080-5f40-7993dc000000" + "x-ms-request-id": "2bd8ab6b-401e-0017-7493-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570414509004", "query": { - "comp": "list", - "prefix": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'157003464734503528", - "restype": "container" + "prefix": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018570431606347", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'157003464734503528汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'157003464734503528Wed, 02 Oct 2019 16:44:07 GMTWed, 02 Oct 2019 16:44:07 GMT0x8D74757BDED71391application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018570431606347汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018570431606347Tue, 28 Jan 2020 04:28:24 GMTTue, 28 Jan 2020 04:28:24 GMT0x8D7A3AA83A0F6961application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:24 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffdf2-201e-0080-0640-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "81483205-06e9-4986-b4de-29c045ac2e83" + "x-ms-client-request-id": "c7d6c5e5-7381-45de-af64-2a2b2218f0bb", + "x-ms-request-id": "2bd8abac-401e-0017-3293-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570414509004", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:24 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "92d9e5ac-a02b-473c-92d4-8dd453019cf4", + "x-ms-request-id": "2bd8abdf-401e-0017-6193-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'157003464734503528" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570414509004", + "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'": "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'158018570431606347" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese.json index 4c6cda312d18..fcd348d8588a 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94157003464900404721", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571097709674", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:31 GMT", + "etag": "\"0x8D7A3AA8797E389\"", + "last-modified": "Tue, 28 Jan 2020 04:28:31 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "79a51ff7-8a10-4dbe-a73a-e9b4fd43385c", + "x-ms-request-id": "2bd8b351-401e-0017-5093-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571097709674/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018571114601805", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BEEAD208\"", - "x-ms-request-id": "21600214-201e-0080-2240-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "a95a49cb-2ec6-4777-b986-b38cbb6c6bf9", + "date": "Tue, 28 Jan 2020 04:28:31 GMT", + "etag": "\"0x8D7A3AA87B1E1C2\"", + "last-modified": "Tue, 28 Jan 2020 04:28:31 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "c36b49db-eeef-4369-9dff-0dab15288d7b", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8b393-401e-0017-0c93-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94157003464900404721", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571097709674/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018571114601805", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:31 GMT", + "etag": "\"0x8D7A3AA87B1E1C2\"", + "last-modified": "Tue, 28 Jan 2020 04:28:31 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "31b0aca2-8bf6-46b0-908d-65339a0b6f8d", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "8f9a427c-615a-4cb2-ae4d-feb24b8cebeb", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:31 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BEEAD208\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "21600244-201e-0080-4d40-7993dc000000" + "x-ms-request-id": "2bd8b3d1-401e-0017-4793-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571097709674", "query": { - "comp": "list", - "prefix": "にっぽんご/にほんご157003464900404721", - "restype": "container" + "prefix": "にっぽんご/にほんご158018571114601805", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "にっぽんご/にほんご157003464900404721にっぽんご/にほんご157003464900404721Wed, 02 Oct 2019 16:44:08 GMTWed, 02 Oct 2019 16:44:08 GMT0x8D74757BEEAD2081application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "にっぽんご/にほんご158018571114601805にっぽんご/にほんご158018571114601805Tue, 28 Jan 2020 04:28:31 GMTTue, 28 Jan 2020 04:28:31 GMT0x8D7A3AA87B1E1C21application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:31 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "2160026d-201e-0080-7340-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "6806e93b-1814-468b-9d2f-3a095a32710c" + "x-ms-client-request-id": "d51d13a2-f3a1-4010-98b2-d0ebe2315960", + "x-ms-request-id": "2bd8b404-401e-0017-7793-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571097709674", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:31 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "b4291379-b158-417b-bd83-9cadbf85ee22", + "x-ms-request-id": "2bd8b445-401e-0017-3593-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "にっぽんご/にほんご": "にっぽんご/にほんご157003464900404721" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018571097709674", + "にっぽんご/にほんご": "にっぽんご/にほんご158018571114601805" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.json index 48a12d1d4b45..9906cd366e88 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94157003464920700530", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571181804589", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:31 GMT", + "etag": "\"0x8D7A3AA88189C70\"", + "last-modified": "Tue, 28 Jan 2020 04:28:31 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "c3f63505-4b61-4257-992c-5a6ff47753a6", + "x-ms-request-id": "2bd8b48a-401e-0017-7693-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571181804589/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018571200106802", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BF0BA83C\"", - "x-ms-request-id": "21600296-201e-0080-1b40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "6d95c55c-504e-49e7-ba3a-fc6ffebce17b", + "date": "Tue, 28 Jan 2020 04:28:32 GMT", + "etag": "\"0x8D7A3AA88346F9E\"", + "last-modified": "Tue, 28 Jan 2020 04:28:32 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "d006db95-fd9d-468a-a152-260af68103ed", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8b4c9-401e-0017-3193-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94157003464920700530", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571181804589/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018571200106802", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:32 GMT", + "etag": "\"0x8D7A3AA88346F9E\"", + "last-modified": "Tue, 28 Jan 2020 04:28:32 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "4344e1ff-be82-42b1-9797-5eae136ea654", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "b3267a1d-cdef-45b5-ab13-b1a9b3067789", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:32 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BF0BA83C\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "216002d4-201e-0080-5140-7993dc000000" + "x-ms-request-id": "2bd8b507-401e-0017-6893-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571181804589", "query": { - "comp": "list", - "prefix": "にっぽんご/にほんご157003464920700530", - "restype": "container" + "prefix": "にっぽんご/にほんご158018571200106802", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "にっぽんご/にほんご157003464920700530にっぽんご/にほんご157003464920700530Wed, 02 Oct 2019 16:44:08 GMTWed, 02 Oct 2019 16:44:08 GMT0x8D74757BF0BA83C1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "にっぽんご/にほんご158018571200106802にっぽんご/にほんご158018571200106802Tue, 28 Jan 2020 04:28:32 GMTTue, 28 Jan 2020 04:28:32 GMT0x8D7A3AA88346F9E1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:32 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "216002ff-201e-0080-7540-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "a793ef0f-1c2f-412b-9688-a9815ff1156e" + "x-ms-client-request-id": "49c76fa1-9082-49cf-9ec8-276c0b2f4254", + "x-ms-request-id": "2bd8b54c-401e-0017-2893-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571181804589", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:32 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "8a62e180-6350-4be9-a9b0-3363393dccc6", + "x-ms-request-id": "2bd8b58b-401e-0017-6393-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "にっぽんご/にほんご": "にっぽんご/にほんご157003464920700530" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018571181804589", + "にっぽんご/にほんご": "にっぽんご/にほんご158018571200106802" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.json index 1a106d6ed294..ee0c9e1ae267 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594157003464880002517", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571013105153", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:30 GMT", + "etag": "\"0x8D7A3AA871703A8\"", + "last-modified": "Tue, 28 Jan 2020 04:28:30 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "58e5ee3f-fb47-4ac2-b738-bee226354d37", + "x-ms-request-id": "2bd8b251-401e-0017-5b93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571013105153/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594158018571030109953", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BECBD0F6\"", - "x-ms-request-id": "2160018a-201e-0080-2d40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "31269c1d-2cdb-4cd1-9774-793a235050dc", + "date": "Tue, 28 Jan 2020 04:28:30 GMT", + "etag": "\"0x8D7A3AA8730DACE\"", + "last-modified": "Tue, 28 Jan 2020 04:28:30 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "ab63a7e0-d2cb-43af-be91-5d0bbc94545a", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8b28c-401e-0017-1393-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594157003464880002517", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571013105153/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594158018571030109953", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:30 GMT", + "etag": "\"0x8D7A3AA8730DACE\"", + "last-modified": "Tue, 28 Jan 2020 04:28:30 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "4cd95bb9-1082-4301-9eee-4982f53c0853", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "3a15f024-8d40-418b-b503-271f296769d4", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:30 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:08 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:08 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BECBD0F6\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "216001b6-201e-0080-5240-7993dc000000" + "x-ms-request-id": "2bd8b2b7-401e-0017-3e93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571013105153", "query": { - "comp": "list", - "prefix": "%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94157003464880002517", - "restype": "container" + "prefix": "%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018571030109953", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94157003464880002517%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94157003464880002517Wed, 02 Oct 2019 16:44:08 GMTWed, 02 Oct 2019 16:44:08 GMT0x8D74757BECBD0F61application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018571030109953%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018571030109953Tue, 28 Jan 2020 04:28:30 GMTTue, 28 Jan 2020 04:28:30 GMT0x8D7A3AA8730DACE1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:08 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:30 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "216001e3-201e-0080-7940-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "d6361b73-439a-49ff-baef-0097ab9a930b" + "x-ms-client-request-id": "96c5f7c7-49af-4150-af76-7cf85cf40d34", + "x-ms-request-id": "2bd8b2e3-401e-0017-6993-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018571013105153", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:30 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "21d77e69-f923-4110-b443-785f023880dc", + "x-ms-request-id": "2bd8b309-401e-0017-0e93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "にっぽんご/にほんご": "にっぽんご/にほんご157003464880002517" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018571013105153", + "にっぽんご/にほんご": "にっぽんご/にほんご158018571030109953" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian.json index 2dffc48de818..342a0b0709b8 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA157003464776900323", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570586108338", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:25 GMT", + "etag": "\"0x8D7A3AA848B7685\"", + "last-modified": "Tue, 28 Jan 2020 04:28:25 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "00a1ac2a-093a-48e4-bd84-cdd8dd838e19", + "x-ms-request-id": "2bd8ad31-401e-0017-1693-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570586108338/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018570603309079", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BE2E0BFA\"", - "x-ms-request-id": "215ffeb9-201e-0080-2e40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "d9b83dbd-476f-48bb-bc52-f819d9a5ef81", + "date": "Tue, 28 Jan 2020 04:28:26 GMT", + "etag": "\"0x8D7A3AA84A5C3E8\"", + "last-modified": "Tue, 28 Jan 2020 04:28:26 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "cea79d30-d25e-4091-b220-643e10a1aae2", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8ad86-401e-0017-6693-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA157003464776900323", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570586108338/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018570603309079", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:26 GMT", + "etag": "\"0x8D7A3AA84A5C3E8\"", + "last-modified": "Tue, 28 Jan 2020 04:28:26 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "fbd6bbda-932c-4d30-96f7-530afb0f4261", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "77524dbd-7eca-4b22-abd0-8c3d523b6402", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:26 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BE2E0BFA\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffee5-201e-0080-5440-7993dc000000" + "x-ms-request-id": "2bd8adac-401e-0017-0a93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570586108338", "query": { - "comp": "list", - "prefix": "ру́сский язы́к157003464776900323", - "restype": "container" + "prefix": "ру́сский язы́к158018570603309079", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "ру́сский язы́к157003464776900323ру́сский язы́к157003464776900323Wed, 02 Oct 2019 16:44:07 GMTWed, 02 Oct 2019 16:44:07 GMT0x8D74757BE2E0BFA1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "ру́сский язы́к158018570603309079ру́сский язы́к158018570603309079Tue, 28 Jan 2020 04:28:26 GMTTue, 28 Jan 2020 04:28:26 GMT0x8D7A3AA84A5C3E81application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:26 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215fff21-201e-0080-0840-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "a48c5a20-e04e-4237-9bee-82ba2056582b" + "x-ms-client-request-id": "c96ed131-9068-4129-8b54-7b7e023165e3", + "x-ms-request-id": "2bd8ade1-401e-0017-3b93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570586108338", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:26 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "74e3c844-8996-4175-91c0-908a1882c8f2", + "x-ms-request-id": "2bd8ae13-401e-0017-6b93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "ру́сский язы́к": "ру́сский язы́к157003464776900323" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570586108338", + "ру́сский язы́к": "ру́сский язы́к158018570603309079" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.json index d40f7575c3c0..008c72fba427 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA157003464796308045", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570670502737", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:26 GMT", + "etag": "\"0x8D7A3AA850C7D9E\"", + "last-modified": "Tue, 28 Jan 2020 04:28:26 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "35a8ac55-edcb-4349-afd3-d39baf0b2a3c", + "x-ms-request-id": "2bd8ae3a-401e-0017-0e93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570670502737/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018570687804439", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BE4BD442\"", - "x-ms-request-id": "215fff51-201e-0080-3540-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "f2a9b69b-b333-4fac-80f4-b31711bdec8a", + "date": "Tue, 28 Jan 2020 04:28:26 GMT", + "etag": "\"0x8D7A3AA8526F1E0\"", + "last-modified": "Tue, 28 Jan 2020 04:28:26 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "6391a94b-c61b-4e0c-8fcf-56059e12a1c1", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8ae69-401e-0017-3a93-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA157003464796308045", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570670502737/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018570687804439", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:27 GMT", + "etag": "\"0x8D7A3AA8526F1E0\"", + "last-modified": "Tue, 28 Jan 2020 04:28:26 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "3343ca6d-bbcc-420e-b042-c5012dcf98ec", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "9ca15adb-f905-4e51-a269-e043e465c5f6", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:26 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BE4BD442\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215fff83-201e-0080-6140-7993dc000000" + "x-ms-request-id": "2bd8ae9e-401e-0017-6e93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570670502737", "query": { - "comp": "list", - "prefix": "ру́сский язы́к157003464796308045", - "restype": "container" + "prefix": "ру́сский язы́к158018570687804439", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "ру́сский язы́к157003464796308045ру́сский язы́к157003464796308045Wed, 02 Oct 2019 16:44:07 GMTWed, 02 Oct 2019 16:44:07 GMT0x8D74757BE4BD4421application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "ру́сский язы́к158018570687804439ру́сский язы́к158018570687804439Tue, 28 Jan 2020 04:28:26 GMTTue, 28 Jan 2020 04:28:26 GMT0x8D7A3AA8526F1E01application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:27 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215fff9f-201e-0080-7b40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "59eab9fd-a4b2-4d88-a615-00e9ae4a2d5c" + "x-ms-client-request-id": "7254dec6-5537-4b76-adda-e9f174e04b09", + "x-ms-request-id": "2bd8aeeb-401e-0017-3493-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570670502737", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:27 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "a5d0af58-2112-4150-bec7-86180da74d91", + "x-ms-request-id": "2bd8af2a-401e-0017-6f93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "ру́сский язы́к": "ру́сский язы́к157003464796308045" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570670502737", + "ру́сский язы́к": "ру́сский язы́к158018570687804439" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.json index 489b9ac08b79..c93ed7b460c8 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA157003464756600912", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570501300490", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:25 GMT", + "etag": "\"0x8D7A3AA840B32F2\"", + "last-modified": "Tue, 28 Jan 2020 04:28:25 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "3006b178-8bc9-4158-86b0-8c18a1d50197", + "x-ms-request-id": "2bd8ac28-401e-0017-2093-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570501300490/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA158018570519008380", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BE0F3208\"", - "x-ms-request-id": "215ffe2d-201e-0080-3440-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "efd270ea-0305-402e-b535-ff6c5e4122f2", + "date": "Tue, 28 Jan 2020 04:28:25 GMT", + "etag": "\"0x8D7A3AA8424E420\"", + "last-modified": "Tue, 28 Jan 2020 04:28:25 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "a26afa21-27e3-469c-b12f-f6f4e3716d4e", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8ac51-401e-0017-4793-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA157003464756600912", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570501300490/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA158018570519008380", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:25 GMT", + "etag": "\"0x8D7A3AA8424E420\"", + "last-modified": "Tue, 28 Jan 2020 04:28:25 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "e104db3f-8716-4661-9557-db6bc1e33493", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "7653f3d5-481f-4100-9a09-dec348b95ee7", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:25 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:07 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:07 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BE0F3208\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffe64-201e-0080-5e40-7993dc000000" + "x-ms-request-id": "2bd8ac91-401e-0017-0293-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570501300490", "query": { - "comp": "list", - "prefix": "%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA157003464756600912", - "restype": "container" + "prefix": "%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018570519008380", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA157003464756600912%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA157003464756600912Wed, 02 Oct 2019 16:44:07 GMTWed, 02 Oct 2019 16:44:07 GMT0x8D74757BE0F32081application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018570519008380%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018570519008380Tue, 28 Jan 2020 04:28:25 GMTTue, 28 Jan 2020 04:28:25 GMT0x8D7A3AA8424E4201application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:07 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:25 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffe92-201e-0080-0a40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "c745b70f-2fd5-43ba-bdb3-57909a0a386e" + "x-ms-client-request-id": "c786330e-f757-4d11-ad81-88b7844bd9f7", + "x-ms-request-id": "2bd8acd9-401e-0017-4593-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570501300490", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:25 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "4275c7db-df32-4ddf-a82c-b7aef28a4f8b", + "x-ms-request-id": "2bd8ad02-401e-0017-6a93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "ру́сский язы́к": "ру́сский язы́к157003464756600912" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570501300490", + "ру́сский язы́к": "ру́сский язы́к158018570519008380" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.json index a98874daae21..aade35cf9093 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97157003464669707330", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570157704787", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:21 GMT", + "etag": "\"0x8D7A3AA81FD7810\"", + "last-modified": "Tue, 28 Jan 2020 04:28:21 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "aff7d1c9-9889-4812-9b31-d2366f810438", + "x-ms-request-id": "2bd8a75b-401e-0017-5693-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570157704787/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97158018570174805777", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BD8AA059\"", - "x-ms-request-id": "215ffbb1-201e-0080-1340-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "bf795bbd-0c63-4cfc-bf83-7115d2929557", + "date": "Tue, 28 Jan 2020 04:28:21 GMT", + "etag": "\"0x8D7A3AA8217C649\"", + "last-modified": "Tue, 28 Jan 2020 04:28:21 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "5367485d-23d3-4014-bde1-00675261c784", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a7a5-401e-0017-1493-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97157003464669707330", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570157704787/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97158018570174805777", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:21 GMT", + "etag": "\"0x8D7A3AA8217C649\"", + "last-modified": "Tue, 28 Jan 2020 04:28:21 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "9e19b777-53ce-436b-bf7e-fb4f712eed7f", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "a320a3fb-6921-443a-a02b-e51b1fb7940a", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:21 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BD8AA059\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffc00-201e-0080-5340-7993dc000000" + "x-ms-request-id": "2bd8a7df-401e-0017-4a93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570157704787", "query": { - "comp": "list", - "prefix": "////Upper/blob/empty /another 汉字157003464669707330", - "restype": "container" + "prefix": "////Upper/blob/empty /another 汉字158018570174805777", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "////Upper/blob/empty /another 汉字157003464669707330////Upper/blob/empty /another 汉字157003464669707330Wed, 02 Oct 2019 16:44:06 GMTWed, 02 Oct 2019 16:44:06 GMT0x8D74757BD8AA0591application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "////Upper/blob/empty /another 汉字158018570174805777////Upper/blob/empty /another 汉字158018570174805777Tue, 28 Jan 2020 04:28:21 GMTTue, 28 Jan 2020 04:28:21 GMT0x8D7A3AA8217C6491application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:22 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffc2a-201e-0080-7b40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "5d1fccb2-a9b5-461f-a446-165a9eb131e7" + "x-ms-client-request-id": "f3b90f16-ff93-43ab-94c5-a77e0ef8cda0", + "x-ms-request-id": "2bd8a818-401e-0017-7893-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570157704787", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:22 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "b5921fc5-a5ea-488e-aac1-19d76c2e02a8", + "x-ms-request-id": "2bd8a841-401e-0017-1f93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "////Upper/blob/empty /another 汉字": "////Upper/blob/empty /another 汉字157003464669707330" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570157704787", + "////Upper/blob/empty /another 汉字": "////Upper/blob/empty /another 汉字158018570174805777" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.json index 650ffe8a0ee8..8c0775c48202 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97157003464691909249", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570241609422", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:22 GMT", + "etag": "\"0x8D7A3AA827D9492\"", + "last-modified": "Tue, 28 Jan 2020 04:28:22 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "8db064eb-25b0-4347-be10-fbb633f7881d", + "x-ms-request-id": "2bd8a879-401e-0017-5293-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570241609422/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97158018570258509645", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BDACD672\"", - "x-ms-request-id": "215ffc54-201e-0080-1f40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "64f63233-7169-4c96-8a28-ca045ee810f9", + "date": "Tue, 28 Jan 2020 04:28:22 GMT", + "etag": "\"0x8D7A3AA8297E2C7\"", + "last-modified": "Tue, 28 Jan 2020 04:28:22 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "93f4c8a8-b347-4a65-89ea-c9927303a4bb", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a8b9-401e-0017-0393-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97157003464691909249", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570241609422/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97158018570258509645", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:22 GMT", + "etag": "\"0x8D7A3AA8297E2C7\"", + "last-modified": "Tue, 28 Jan 2020 04:28:22 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "1bc4fbad-06ee-46e4-b7c3-261080595151", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "5e15af0b-a40a-4996-8958-80badc7f140d", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:22 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BDACD672\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffc8f-201e-0080-5040-7993dc000000" + "x-ms-request-id": "2bd8a8fb-401e-0017-3993-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570241609422", "query": { - "comp": "list", - "prefix": "////Upper/blob/empty /another 汉字157003464691909249", - "restype": "container" + "prefix": "////Upper/blob/empty /another 汉字158018570258509645", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "////Upper/blob/empty /another 汉字157003464691909249////Upper/blob/empty /another 汉字157003464691909249Wed, 02 Oct 2019 16:44:06 GMTWed, 02 Oct 2019 16:44:06 GMT0x8D74757BDACD6721application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "////Upper/blob/empty /another 汉字158018570258509645////Upper/blob/empty /another 汉字158018570258509645Tue, 28 Jan 2020 04:28:22 GMTTue, 28 Jan 2020 04:28:22 GMT0x8D7A3AA8297E2C71application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:22 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffcbd-201e-0080-7940-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "8a64f4e4-6d12-4300-9731-7c82fe72e5b6" + "x-ms-client-request-id": "09285de0-3a6f-4fba-8ff7-23b4669a7010", + "x-ms-request-id": "2bd8a949-401e-0017-0393-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570241609422", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:23 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "25a4306c-ed57-4d1c-af18-e12a6fd93beb", + "x-ms-request-id": "2bd8a994-401e-0017-4693-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "////Upper/blob/empty /another 汉字": "////Upper/blob/empty /another 汉字157003464691909249" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570241609422", + "////Upper/blob/empty /another 汉字": "////Upper/blob/empty /another 汉字158018570258509645" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.json index 867ebca5b753..f850229a6fd8 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother157003464628804972", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569986501506", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:19 GMT", + "etag": "\"0x8D7A3AA80F8830B\"", + "last-modified": "Tue, 28 Jan 2020 04:28:19 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "45ae6fac-86c5-446a-9a7b-39755431cdae", + "x-ms-request-id": "2bd8a4c5-401e-0017-2993-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569986501506/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother158018570003803411", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BD4C9E43\"", - "x-ms-request-id": "215ffac9-201e-0080-4840-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "8401f390-fc4e-42c5-bd18-849e38ff5210", + "date": "Tue, 28 Jan 2020 04:28:20 GMT", + "etag": "\"0x8D7A3AA8113200E\"", + "last-modified": "Tue, 28 Jan 2020 04:28:20 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "b73c88ab-5f6e-4371-9769-08c9f89ffa2b", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a513-401e-0017-7093-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother157003464628804972", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569986501506/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother158018570003803411", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:20 GMT", + "etag": "\"0x8D7A3AA8113200E\"", + "last-modified": "Tue, 28 Jan 2020 04:28:20 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "83eab746-0bf4-40b3-8f34-eb085e0cd399", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "89f3d489-d280-4922-8622-08b2404e762e", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:20 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BD4C9E43\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffaf2-201e-0080-6d40-7993dc000000" + "x-ms-request-id": "2bd8a541-401e-0017-1c93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569986501506", "query": { - "comp": "list", - "prefix": "////Upper/blob/empty /another157003464628804972", - "restype": "container" + "prefix": "////Upper/blob/empty /another158018570003803411", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "////Upper/blob/empty /another157003464628804972////Upper/blob/empty /another157003464628804972Wed, 02 Oct 2019 16:44:05 GMTWed, 02 Oct 2019 16:44:05 GMT0x8D74757BD4C9E431application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "////Upper/blob/empty /another158018570003803411////Upper/blob/empty /another158018570003803411Tue, 28 Jan 2020 04:28:20 GMTTue, 28 Jan 2020 04:28:20 GMT0x8D7A3AA8113200E1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:20 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffb29-201e-0080-1c40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "bc21b9fc-50c5-4e95-98c2-9f25993804ba" + "x-ms-client-request-id": "e0d05742-85d9-41dd-b958-f0a7fbfdf5bf", + "x-ms-request-id": "2bd8a58b-401e-0017-4f93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569986501506", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:20 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "3e841f16-9f3e-4a85-9a45-7861cc937b9d", + "x-ms-request-id": "2bd8a5d5-401e-0017-0793-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "////Upper/blob/empty /another": "////Upper/blob/empty /another157003464628804972" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018569986501506", + "////Upper/blob/empty /another": "////Upper/blob/empty /another158018570003803411" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.json index 149a6bc4548c..ca9d2b754bc3 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/////Upper/blob/empty%20/another157003464649405039", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570072104170", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:20 GMT", + "etag": "\"0x8D7A3AA817B112E\"", + "last-modified": "Tue, 28 Jan 2020 04:28:20 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "326e443c-f5ba-470b-80a2-8762b4eb8ba3", + "x-ms-request-id": "2bd8a610-401e-0017-3993-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570072104170/////Upper/blob/empty%20/another158018570089203901", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BD6BC663\"", - "x-ms-request-id": "215ffb48-201e-0080-3940-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "aca99d20-cbf3-4cc7-9487-9d8ee4143dec", + "date": "Tue, 28 Jan 2020 04:28:20 GMT", + "etag": "\"0x8D7A3AA81955F9D\"", + "last-modified": "Tue, 28 Jan 2020 04:28:21 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "e9663102-ea18-4d16-90c5-b0963c887258", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a646-401e-0017-6793-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/////Upper/blob/empty%20/another157003464649405039", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570072104170/////Upper/blob/empty%20/another158018570089203901", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:21 GMT", + "etag": "\"0x8D7A3AA81955F9D\"", + "last-modified": "Tue, 28 Jan 2020 04:28:21 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "45813b2e-8fa0-4408-9837-429482744ad6", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "93b7c8b9-d459-4c29-aa6d-faef72150b77", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:21 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:06 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:06 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BD6BC663\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffb6c-201e-0080-5740-7993dc000000" + "x-ms-request-id": "2bd8a69c-401e-0017-2f93-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570072104170", "query": { - "comp": "list", - "prefix": "////Upper/blob/empty /another157003464649405039", - "restype": "container" + "prefix": "////Upper/blob/empty /another158018570089203901", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "////Upper/blob/empty /another157003464649405039////Upper/blob/empty /another157003464649405039Wed, 02 Oct 2019 16:44:06 GMTWed, 02 Oct 2019 16:44:06 GMT0x8D74757BD6BC6631application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "////Upper/blob/empty /another158018570089203901////Upper/blob/empty /another158018570089203901Tue, 28 Jan 2020 04:28:21 GMTTue, 28 Jan 2020 04:28:21 GMT0x8D7A3AA81955F9D1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:06 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:21 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffb87-201e-0080-7040-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "9e90a7f3-db13-41aa-bf71-2f497fcee764" + "x-ms-client-request-id": "efe04c80-2fce-4ed3-8004-c55ae400fc73", + "x-ms-request-id": "2bd8a6da-401e-0017-6493-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018570072104170", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:21 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "45077c87-c7ac-48b1-9300-c24315ea7d6d", + "x-ms-request-id": "2bd8a71a-401e-0017-1c93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "////Upper/blob/empty /another": "////Upper/blob/empty /another157003464649405039" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018570072104170", + "////Upper/blob/empty /another": "////Upper/blob/empty /another158018570089203901" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.json index 0044e7c09f4c..be422a5f6a1c 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother157003464588702313", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569815206823", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:18 GMT", + "etag": "\"0x8D7A3AA7FF33F99\"", + "last-modified": "Tue, 28 Jan 2020 04:28:18 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "ef0ca5bc-c881-4cb6-981e-f139c6f7d203", + "x-ms-request-id": "2bd8a27e-401e-0017-0293-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569815206823/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother158018569832304159", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BD0F388D\"", - "x-ms-request-id": "215ff9e1-201e-0080-0240-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "a9cf4685-154e-4ef0-a152-d0df0b2af3ca", + "date": "Tue, 28 Jan 2020 04:28:18 GMT", + "etag": "\"0x8D7A3AA800D8F50\"", + "last-modified": "Tue, 28 Jan 2020 04:28:18 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "aaa13270-52e6-46c1-8469-94c5ef900b0d", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a2c2-401e-0017-4393-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother157003464588702313", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569815206823/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother158018569832304159", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:18 GMT", + "etag": "\"0x8D7A3AA800D8F50\"", + "last-modified": "Tue, 28 Jan 2020 04:28:18 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "48a1e97a-c018-4e4c-9e54-3e7c2eeffb91", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "390ada83-5eb8-4efc-8f3a-4a96b4ccdebc", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:18 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BD0F388D\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffa07-201e-0080-2540-7993dc000000" + "x-ms-request-id": "2bd8a2fb-401e-0017-7993-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569815206823", "query": { - "comp": "list", - "prefix": "////blob/empty /another157003464588702313", - "restype": "container" + "prefix": "////blob/empty /another158018569832304159", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "////blob/empty /another157003464588702313////blob/empty /another157003464588702313Wed, 02 Oct 2019 16:44:05 GMTWed, 02 Oct 2019 16:44:05 GMT0x8D74757BD0F388D1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "////blob/empty /another158018569832304159////blob/empty /another158018569832304159Tue, 28 Jan 2020 04:28:18 GMTTue, 28 Jan 2020 04:28:18 GMT0x8D7A3AA800D8F501application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:18 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffa2e-201e-0080-4340-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "c77246cc-ce40-46dd-9313-c3ee1026f4b7" + "x-ms-client-request-id": "a8d85064-0486-42ab-9ff6-f9ee0fcdb168", + "x-ms-request-id": "2bd8a330-401e-0017-2b93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569815206823", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:18 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "98f2d66a-b122-471e-8470-e73c14371719", + "x-ms-request-id": "2bd8a36a-401e-0017-6393-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "////blob/empty /another": "////blob/empty /another157003464588702313" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018569815206823", + "////blob/empty /another": "////blob/empty /another158018569832304159" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.json index 222f9117c0bf..126e8ba5b4c5 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.json @@ -2,77 +2,118 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/////blob/empty%20/another157003464608608498", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569900804250", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:19 GMT", + "etag": "\"0x8D7A3AA8075CDD3\"", + "last-modified": "Tue, 28 Jan 2020 04:28:19 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "16be7ea1-1ff6-438e-81bf-a4b4c1b9f9fa", + "x-ms-request-id": "2bd8a3ba-401e-0017-3193-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569900804250/////blob/empty%20/another158018569917705644", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BD2D761A\"", - "x-ms-request-id": "215ffa59-201e-0080-6740-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "31ea52dd-599f-4aea-987e-06f4e59f72b7", + "date": "Tue, 28 Jan 2020 04:28:19 GMT", + "etag": "\"0x8D7A3AA808FF5FD\"", + "last-modified": "Tue, 28 Jan 2020 04:28:19 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "61c636d4-fcf6-426f-9137-c44389b24305", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a3f0-401e-0017-6193-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/////blob/empty%20/another157003464608608498", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569900804250/////blob/empty%20/another158018569917705644", "query": {}, "requestBody": null, "status": 200, "response": "", "responseHeaders": { - "x-ms-blob-type": "BlockBlob", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "accept-ranges": "bytes", + "content-length": "1", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "x-ms-tag-count": "0", - "x-ms-server-encrypted": "true", + "content-type": "application/octet-stream", + "date": "Tue, 28 Jan 2020 04:28:19 GMT", + "etag": "\"0x8D7A3AA808FF5FD\"", + "last-modified": "Tue, 28 Jan 2020 04:28:19 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Cool", - "x-ms-client-request-id": "6b99ae65-5107-40bf-9bb7-f2b2890bba97", - "content-length": "1", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "218c7b5a-793f-409e-b653-f90356a22562", + "x-ms-creation-time": "Tue, 28 Jan 2020 04:28:19 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-creation-time": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "etag": "\"0x8D74757BD2D761A\"", - "content-type": "application/octet-stream", - "x-ms-access-tier-inferred": "true", - "x-ms-version": "2019-02-02", - "accept-ranges": "bytes", - "x-ms-request-id": "215ffa7f-201e-0080-0940-7993dc000000" + "x-ms-request-id": "2bd8a432-401e-0017-2193-d5a69f000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569900804250", "query": { - "comp": "list", - "prefix": "////blob/empty /another157003464608608498", - "restype": "container" + "prefix": "////blob/empty /another158018569917705644", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "////blob/empty /another157003464608608498////blob/empty /another157003464608608498Wed, 02 Oct 2019 16:44:05 GMTWed, 02 Oct 2019 16:44:05 GMT0x8D74757BD2D761A1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "////blob/empty /another158018569917705644////blob/empty /another158018569917705644Tue, 28 Jan 2020 04:28:19 GMTTue, 28 Jan 2020 04:28:19 GMT0x8D7A3AA808FF5FD1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:19 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ffaa2-201e-0080-2940-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "8118715e-e62b-49ce-898b-87b385d8eda0" + "x-ms-client-request-id": "ebc0b60b-d89f-48aa-8f1c-4fc089089742", + "x-ms-request-id": "2bd8a464-401e-0017-5193-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569900804250", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:19 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "8160c9a7-80b8-4af9-aedd-988e0eef2c64", + "x-ms-request-id": "2bd8a494-401e-0017-7d93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "////blob/empty /another": "////blob/empty /another157003464608608498" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018569900804250", + "////blob/empty /another": "////blob/empty /another158018569917705644" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.json index 3df45dd42ed4..3b0ec10bd637 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.json @@ -2,48 +2,90 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/blob%20empty157003464553003454", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569636301259", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:16 GMT", + "etag": "\"0x8D7A3AA7F18E475\"", + "last-modified": "Tue, 28 Jan 2020 04:28:16 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "d7e9eb10-8ca2-4515-84dd-d7f06bc199b4", + "x-ms-request-id": "2bd8a02c-401e-0017-5693-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569636301259/blob%20empty158018569690509650", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BCE07C57\"", - "x-ms-request-id": "215ff8db-201e-0080-1b40-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "6d6da917-3c48-4f35-a927-7e7dae1f2f19", + "date": "Tue, 28 Jan 2020 04:28:16 GMT", + "etag": "\"0x8D7A3AA7F3690C7\"", + "last-modified": "Tue, 28 Jan 2020 04:28:17 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "258a79c2-8d3b-4de1-8fda-3dd9d9f47303", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a08a-401e-0017-2e93-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569636301259", "query": { - "comp": "list", - "prefix": "blob empty157003464553003454", - "restype": "container" + "prefix": "blob empty158018569690509650", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "blob empty157003464553003454blob empty157003464553003454Wed, 02 Oct 2019 16:44:05 GMTWed, 02 Oct 2019 16:44:05 GMT0x8D74757BCE07C571application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "blob empty158018569690509650blob empty158018569690509650Tue, 28 Jan 2020 04:28:17 GMTTue, 28 Jan 2020 04:28:17 GMT0x8D7A3AA7F3690C71application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:17 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ff945-201e-0080-7740-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "39d4d849-894f-4f3b-a4a1-96e7efbe320a" + "x-ms-client-request-id": "f1a454a9-444b-48ec-bc3a-01a189379532", + "x-ms-request-id": "2bd8a0e1-401e-0017-0293-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569636301259", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:17 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "067d0f51-62cc-42a6-a588-3f42ab7133e8", + "x-ms-request-id": "2bd8a12a-401e-0017-4a93-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "blob empty": "blob empty157003464553003454" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018569636301259", + "blob empty": "blob empty158018569690509650" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.json b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.json index e6087d20f2ab..a095304fc25d 100644 --- a/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.json +++ b/sdk/storage/storage-blob/recordings/browsers/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.json @@ -2,48 +2,90 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968/blob%20empty157003464571901168", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569745506016", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:17 GMT", + "etag": "\"0x8D7A3AA7F8A0A76\"", + "last-modified": "Tue, 28 Jan 2020 04:28:17 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "1e4e662d-f900-4316-9738-676c3a6802b8", + "x-ms-request-id": "2bd8a170-401e-0017-0e93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569745506016/blob%20empty158018569763305855", "query": {}, "requestBody": "A", "status": 201, "response": "", "responseHeaders": { - "x-ms-content-crc64": "PiO3pTJ67n0=", - "date": "Wed, 02 Oct 2019 16:44:05 GMT", - "last-modified": "Wed, 02 Oct 2019 16:44:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "content-length": "0", "content-md5": "f8VicOenD6gaWTW3Lqy+KQ==", - "etag": "\"0x8D74757BCF58FF7\"", - "x-ms-request-id": "215ff977-201e-0080-2540-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "a3d69324-85b1-4eec-92c0-39efb63d3bfb", + "date": "Tue, 28 Jan 2020 04:28:17 GMT", + "etag": "\"0x8D7A3AA7FA45A81\"", + "last-modified": "Tue, 28 Jan 2020 04:28:17 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "4f0fd728-a730-4b7c-a358-e5d1a8865189", + "x-ms-content-crc64": "PiO3pTJ67n0=", + "x-ms-request-id": "2bd8a1ae-401e-0017-4693-d5a69f000000", "x-ms-request-server-encrypted": "true", - "content-length": "0" + "x-ms-version": "2019-02-02" } }, { "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash157003464545607968", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569745506016", "query": { - "comp": "list", - "prefix": "blob empty157003464571901168", - "restype": "container" + "prefix": "blob empty158018569763305855", + "restype": "container", + "comp": "list" }, "requestBody": null, "status": 200, - "response": "blob empty157003464571901168blob empty157003464571901168Wed, 02 Oct 2019 16:44:05 GMTWed, 02 Oct 2019 16:44:05 GMT0x8D74757BCF58FF71application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", + "response": "blob empty158018569763305855blob empty158018569763305855Tue, 28 Jan 2020 04:28:17 GMTTue, 28 Jan 2020 04:28:17 GMT0x8D7A3AA7FA45A811application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", "responseHeaders": { - "date": "Wed, 02 Oct 2019 16:44:05 GMT", + "content-type": "application/xml", + "date": "Tue, 28 Jan 2020 04:28:17 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "content-type": "application/xml", - "x-ms-request-id": "215ff9ae-201e-0080-5840-7993dc000000", - "x-ms-version": "2019-02-02", - "x-ms-client-request-id": "d14befa6-5b12-4b67-aa67-86c97a153169" + "x-ms-client-request-id": "0abf7efe-5ddd-4ed0-a0b4-8e51f32f11b6", + "x-ms-request-id": "2bd8a1e8-401e-0017-7e93-d5a69f000000", + "x-ms-version": "2019-02-02" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/1container-with-dash158018569745506016", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 28 Jan 2020 04:28:18 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "7aa5f187-9fb9-44c5-adb4-cc81891d8704", + "x-ms-request-id": "2bd8a235-401e-0017-4493-d5a69f000000", + "x-ms-version": "2019-02-02" } } ], "uniqueTestInfo": { - "blob empty": "blob empty157003464571901168" + "uniqueName": { + "1container-with-dash": "1container-with-dash158018569745506016", + "blob empty": "blob empty158018569763305855" + }, + "newDate": {} } } \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic.js index 9d72827c1c25..5c25f87fbce1 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"عربي/عربى":"عربي/عربى156816858602302669"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018565218806901","عربي/عربى":"عربي/عربى158018565252204590"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89156816858602302669', "A") + .put('/1container-with-dash158018565218806901') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:32 GMT', + 'ETag', + '"0x8D7A3AA64A6F4F4"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '6a5463b7-601e-0066-4793-d5d4a6000000', + 'x-ms-client-request-id', + '4cfbd779-6adf-41da-b1f8-9a78f621081e', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:32 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018565218806901/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018565252204590', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:06 GMT', + 'Tue, 28 Jan 2020 04:27:32 GMT', 'ETag', - '"0x8D7365EFB17006F"', + '"0x8D7A3AA64DBE93C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '5b6426a9-801e-0001-3447-686701000000', + '2bd86841-401e-0017-4a93-d5a69f000000', 'x-ms-client-request-id', - '0d17cd2f-b53b-4781-81d3-7fd29023ceff', + 'fc00d5b5-1dcd-41cd-b0b0-30988532e829', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:06 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:31 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89156816858602302669') + .head('/1container-with-dash158018565218806901/%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018565252204590') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:06 GMT', + 'Tue, 28 Jan 2020 04:27:32 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EFB17006F"', + '"0x8D7A3AA64DBE93C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'ea8eb681-701e-003d-2247-68d3da000000', + '2bd86867-401e-0017-6b93-d5a69f000000', 'x-ms-client-request-id', - 'b31b9bae-ad61-4e76-9524-c1722aa4d7eb', + '283e6f24-17b4-4640-8074-e239cccf2974', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:06 GMT', + 'Tue, 28 Jan 2020 04:27:32 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:06 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:31 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018565218806901') .query(true) - .reply(200, "عربي/عربى156816858602302669عربي/عربى156816858602302669Wed, 11 Sep 2019 02:23:06 GMTWed, 11 Sep 2019 02:23:06 GMT0x8D7365EFB17006F1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "عربي/عربى158018565252204590عربي/عربى158018565252204590Tue, 28 Jan 2020 04:27:32 GMTTue, 28 Jan 2020 04:27:32 GMT0x8D7A3AA64DBE93C1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'f7bdf49a-301e-005c-5c47-689705000000', + '6a5464a8-601e-0066-2a93-d5d4a6000000', 'x-ms-client-request-id', - '1333e24d-4acb-437e-ba4d-458faa493025', + '994d0e78-67c2-42b7-ab1c-765d26f14438', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:06 GMT' ]); + 'Tue, 28 Jan 2020 04:27:32 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018565218806901') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '6a5464d8-601e-0066-5893-d5d4a6000000', + 'x-ms-client-request-id', + 'eafc386d-c73b-48b2-b604-d358c744a2be', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:32 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.js index bd7ccca99e95..c5929aa01079 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"عربي/عربى":"عربي/عربى156816858726403264"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018565312804928","عربي/عربى":"عربي/عربى158018565346807372"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89156816858726403264', "A") + .put('/1container-with-dash158018565312804928') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:33 GMT', + 'ETag', + '"0x8D7A3AA653732CC"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '710ed503-e01e-0038-1993-d527a5000000', + 'x-ms-client-request-id', + 'ecf8a373-c708-4274-8b57-6ddf5a0f2884', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:32 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018565312804928/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89158018565346807372', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:07 GMT', + 'Tue, 28 Jan 2020 04:27:33 GMT', 'ETag', - '"0x8D7365EFBD36D88"', + '"0x8D7A3AA656B71D3"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'fbed4675-701e-001f-5447-68bdec000000', + 'dfd62418-901e-0051-1c93-d57809000000', 'x-ms-client-request-id', - '4775c770-42b2-417b-af1c-8d2d4f97c198', + '458a016d-1c69-4392-869f-d509e6ca4cc1', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:06 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:33 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89156816858726403264') + .head('/1container-with-dash158018565312804928/%D8%B9%D8%B1%D8%A8%D9%8A/%D8%B9%D8%B1%D8%A8%D9%89158018565346807372') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:07 GMT', + 'Tue, 28 Jan 2020 04:27:33 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EFBD36D88"', + '"0x8D7A3AA656B71D3"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'fd55a8e3-801e-0045-2047-68bb6d000000', + 'dfd6242b-901e-0051-2d93-d57809000000', 'x-ms-client-request-id', - 'a068ca8a-3e4f-4497-9385-0b206e4dde5f', + 'aa03419c-846c-4fbf-bb57-9906a3ac6c58', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:07 GMT', + 'Tue, 28 Jan 2020 04:27:33 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:07 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:33 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018565312804928') .query(true) - .reply(200, "عربي/عربى156816858726403264عربي/عربى156816858726403264Wed, 11 Sep 2019 02:23:07 GMTWed, 11 Sep 2019 02:23:07 GMT0x8D7365EFBD36D881application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "عربي/عربى158018565346807372عربي/عربى158018565346807372Tue, 28 Jan 2020 04:27:33 GMTTue, 28 Jan 2020 04:27:33 GMT0x8D7A3AA656B71D31application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'd05a8b2f-801e-004e-4447-68a319000000', + '710ed58f-e01e-0038-1693-d527a5000000', 'x-ms-client-request-id', - '6f12cdfb-32f5-4db5-9a48-1d0298ba4a94', + '52dd2dab-3311-45e8-8696-fc1f7d3c7b2a', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:07 GMT' ]); + 'Tue, 28 Jan 2020 04:27:33 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018565312804928') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '710ed5af-e01e-0038-3693-d527a5000000', + 'x-ms-client-request-id', + '58b3dc04-1c1e-4e24-9ab3-915ed885fe10', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:33 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.js index 3d2927fce069..b885014ec27a 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_arabic_uri_encoded.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"عربي/عربى":"عربي/عربى156816858479605351"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018565124304472","عربي/عربى":"عربي/عربى158018565158900123"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589156816858479605351', "A") + .put('/1container-with-dash158018565124304472') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:31 GMT', + 'ETag', + '"0x8D7A3AA641816A8"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '7d9f8739-001e-0010-1193-d5501a000000', + 'x-ms-client-request-id', + 'cc049155-b70a-491f-8560-21efa2d57daa', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:30 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018565124304472/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589158018565158900123', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:05 GMT', + 'Tue, 28 Jan 2020 04:27:31 GMT', 'ETag', - '"0x8D7365EFA5B7DD7"', + '"0x8D7A3AA644D727C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a458237f-f01e-0041-6247-684eef000000', + '94ea47b0-101e-0069-7993-d53950000000', 'x-ms-client-request-id', - '0012a7fe-06f1-4e47-916f-daf633c1236c', + '06e133b3-e15a-4a65-b09d-8b16f71b1a4d', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:04 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:31 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589156816858479605351') + .head('/1container-with-dash158018565124304472/%25D8%25B9%25D8%25B1%25D8%25A8%25D9%258A%252F%25D8%25B9%25D8%25B1%25D8%25A8%25D9%2589158018565158900123') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:05 GMT', + 'Tue, 28 Jan 2020 04:27:31 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EFA5B7DD7"', + '"0x8D7A3AA644D727C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '5145015f-301e-0031-0247-683d2b000000', + '94ea47c8-101e-0069-0e93-d53950000000', 'x-ms-client-request-id', - '2f1a60b5-88d8-42b4-8e0e-2f5f67878e45', + 'e2a50850-4143-465c-b354-d8518848ba88', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:05 GMT', + 'Tue, 28 Jan 2020 04:27:31 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:04 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:31 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018565124304472') .query(true) - .reply(200, "%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89156816858479605351%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89156816858479605351Wed, 11 Sep 2019 02:23:05 GMTWed, 11 Sep 2019 02:23:05 GMT0x8D7365EFA5B7DD71application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018565158900123%D8%B9%D8%B1%D8%A8%D9%8A%2F%D8%B9%D8%B1%D8%A8%D9%89158018565158900123Tue, 28 Jan 2020 04:27:31 GMTTue, 28 Jan 2020 04:27:31 GMT0x8D7A3AA644D727C1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '331daab0-c01e-000d-7047-6889f0000000', + '7d9f87a9-001e-0010-7a93-d5501a000000', 'x-ms-client-request-id', - '13b04c79-7e6f-4a1a-8940-7797ddd624d9', + 'bb9dab6b-dc45-4beb-9ce6-f5102d08c22b', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:05 GMT' ]); + 'Tue, 28 Jan 2020 04:27:31 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018565124304472') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '7d9f87d5-001e-0010-2293-d5501a000000', + 'x-ms-client-request-id', + '2123bbf0-9e38-419d-b3c2-9a661bbf8157', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:31 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters.js index a09f63227243..3ae24981d19a 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'":"汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'156816857868200831"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564632608442","汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'":"汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'158018564668502064"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27156816857868200831', "A") + .put('/1container-with-dash158018564632608442') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:26 GMT', + 'ETag', + '"0x8D7A3AA612BD731"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'f3c46228-b01e-002b-2193-d51244000000', + 'x-ms-client-request-id', + 'f17a2f3d-1c45-4d22-90eb-3e9d5b07640d', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:26 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564632608442/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27158018564668502064', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:59 GMT', + 'Tue, 28 Jan 2020 04:27:26 GMT', 'ETag', - '"0x8D7365EF6B6104D"', + '"0x8D7A3AA6161176D"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'fd1f3397-101e-000f-0c47-688b0a000000', + 'e5a7b250-c01e-0060-3f93-d523de000000', 'x-ms-client-request-id', - '602a57b0-8d5a-4e61-8ef8-c65fdc27c72c', + 'be189347-d457-4b7d-9215-e8da0574cc1c', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:58 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:26 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27156816857868200831') + .head('/1container-with-dash158018564632608442/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C%2F%27158018564668502064') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:59 GMT', + 'Tue, 28 Jan 2020 04:27:26 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF6B6104D"', + '"0x8D7A3AA6161176D"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'ab8a426f-c01e-0060-6f47-6823de000000', + 'e5a7b27f-c01e-0060-6c93-d523de000000', 'x-ms-client-request-id', - 'c3a45e5a-a7fe-47f0-9fbc-416a5f3e8dc6', + 'ff304cc0-f173-4164-8352-8491c60e704c', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:22:59 GMT', + 'Tue, 28 Jan 2020 04:27:26 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:58 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:26 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564632608442') .query(true) - .reply(200, "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'156816857868200831汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'156816857868200831Wed, 11 Sep 2019 02:22:59 GMTWed, 11 Sep 2019 02:22:59 GMT0x8D7365EF6B6104D1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018564668502064汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018564668502064Tue, 28 Jan 2020 04:27:26 GMTTue, 28 Jan 2020 04:27:26 GMT0x8D7A3AA6161176D1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a465edd1-001e-001b-0647-68486e000000', + 'f3c462bf-b01e-002b-2d93-d51244000000', 'x-ms-client-request-id', - '218a12c0-9145-46bd-ba45-c99c6323e932', + 'a2ac09db-73c9-4dc3-902d-375a7cd347cc', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:59 GMT' ]); + 'Tue, 28 Jan 2020 04:27:26 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564632608442') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'f3c462e2-b01e-002b-5093-d51244000000', + 'x-ms-client-request-id', + '4875039e-6eca-4a50-8049-a328a8f6c9e9', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:26 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.js index a9f5aa42db86..2cd4020d9870 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_characters_in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'":"汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'156816857989205803"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564730401913","汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'":"汉字. special ~!@#$%^&*()_+`1234567890-={}|[]\\:\";'<>?,/'158018564765001227"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27156816857989205803', "A") + .put('/1container-with-dash158018564730401913') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:27 GMT', + 'ETag', + '"0x8D7A3AA61BF3AF3"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '7d9f8329-001e-0010-4c93-d5501a000000', + 'x-ms-client-request-id', + 'ad88752d-f97d-4e29-bd2f-531bd561f45e', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:26 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564730401913/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27158018564765001227', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:00 GMT', + 'Tue, 28 Jan 2020 04:27:27 GMT', 'ETag', - '"0x8D7365EF76F2170"', + '"0x8D7A3AA61F50D6C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'b36d9cd6-801e-0023-5847-680937000000', + '891e4cc0-701e-0014-3693-d5a598000000', 'x-ms-client-request-id', - 'b4212527-3893-4b9b-a610-2cfd65fa8431', + 'c8677a3e-d8ab-453f-8422-ea24e05b44f2', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:59 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:27 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27156816857989205803') + .head('/1container-with-dash158018564730401913/%E6%B1%89%E5%AD%97.%20special%20~!%40%23%24%25%5E%26*()_%2B%601234567890-%3D%7B%7D%7C%5B%5D%5C%3A%22%3B%27%3C%3E%3F%2C/%27158018564765001227') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:00 GMT', + 'Tue, 28 Jan 2020 04:27:27 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF76F2170"', + '"0x8D7A3AA61F50D6C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a4581bca-f01e-0041-5847-684eef000000', + '891e4cda-701e-0014-4e93-d5a598000000', 'x-ms-client-request-id', - '41d8c5cb-8b93-495d-a0b7-e3f034d8a6c2', + 'fcb85f47-004c-408f-a6d2-deb2be2306f7', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:00 GMT', + 'Tue, 28 Jan 2020 04:27:27 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:59 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:27 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564730401913') .query(true) - .reply(200, "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'156816857989205803汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'156816857989205803Wed, 11 Sep 2019 02:23:00 GMTWed, 11 Sep 2019 02:23:00 GMT0x8D7365EF76F21701application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018564765001227汉字. special ~!@#$%^&*()_+`1234567890-={}|[]/:\";'<>?,/'158018564765001227Tue, 28 Jan 2020 04:27:27 GMTTue, 28 Jan 2020 04:27:27 GMT0x8D7A3AA61F50D6C1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '1ab5931d-a01e-003f-0447-68d120000000', + '7d9f83c8-001e-0010-5b93-d5501a000000', 'x-ms-client-request-id', - '96c264c5-c6d5-4c4a-86c1-17e647ace1bc', + 'de1bedcd-305e-49ac-b364-699ca1da1f8d', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:00 GMT' ]); + 'Tue, 28 Jan 2020 04:27:27 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564730401913') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '7d9f83dc-001e-0010-6f93-d5501a000000', + 'x-ms-client-request-id', + '54803434-ede4-4a93-b669-8cb9611085b3', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:27 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese.js index 0aabdca726be..e6bf022cb587 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"にっぽんご/にほんご":"にっぽんご/にほんご156816858971107499"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018565505707754","にっぽんご/にほんご":"にっぽんご/にほんご158018565540201753"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94156816858971107499', "A") + .put('/1container-with-dash158018565505707754') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:35 GMT', + 'ETag', + '"0x8D7A3AA665E0398"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'b910a3e5-b01e-0046-0793-d5b86a000000', + 'x-ms-client-request-id', + 'd29b0538-3daf-4177-ae33-f7df78071acb', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:35 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018565505707754/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018565540201753', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:10 GMT', + 'Tue, 28 Jan 2020 04:27:35 GMT', 'ETag', - '"0x8D7365EFD49612A"', + '"0x8D7A3AA66927338"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '96e3baa7-201e-0061-0447-682223000000', + '710ed757-e01e-0038-2a93-d527a5000000', 'x-ms-client-request-id', - '9dea370c-a5cc-4dc7-bcba-d1a4a6b9c765', + 'b852dd65-fc33-43c5-bcee-0ff1cf9d6da3', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:09 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:34 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94156816858971107499') + .head('/1container-with-dash158018565505707754/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018565540201753') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:10 GMT', + 'Tue, 28 Jan 2020 04:27:35 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EFD49612A"', + '"0x8D7A3AA66927338"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'df1972cf-401e-0058-5f47-686287000000', + '710ed76b-e01e-0038-3a93-d527a5000000', 'x-ms-client-request-id', - '6744807c-52d1-4170-b10f-3cd684d2f20c', + '84a4f3a8-cb8d-411f-a601-8716814b7b30', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:10 GMT', + 'Tue, 28 Jan 2020 04:27:35 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:10 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:34 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018565505707754') .query(true) - .reply(200, "にっぽんご/にほんご156816858971107499にっぽんご/にほんご156816858971107499Wed, 11 Sep 2019 02:23:10 GMTWed, 11 Sep 2019 02:23:10 GMT0x8D7365EFD49612A1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "にっぽんご/にほんご158018565540201753にっぽんご/にほんご158018565540201753Tue, 28 Jan 2020 04:27:35 GMTTue, 28 Jan 2020 04:27:35 GMT0x8D7A3AA669273381application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a4582dbe-f01e-0041-2947-684eef000000', + 'b910a501-b01e-0046-6c93-d5b86a000000', 'x-ms-client-request-id', - '73c5e0f1-3233-4778-ba28-f8c6626a993c', + 'e5b30e48-d5c9-4161-bc07-b998161e3b45', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:10 GMT' ]); + 'Tue, 28 Jan 2020 04:27:35 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018565505707754') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'b910a535-b01e-0046-1393-d5b86a000000', + 'x-ms-client-request-id', + '7d1763fe-03f6-4171-ba2e-dbb02c300f9a', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:35 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.js index b54107eb1b38..3d84c039f5d9 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"にっぽんご/にほんご":"にっぽんご/にほんご156816859093101570"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018565601801512","にっぽんご/にほんご":"にっぽんご/にほんご158018565635704252"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94156816859093101570', "A") + .put('/1container-with-dash158018565601801512') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:36 GMT', + 'ETag', + '"0x8D7A3AA66F015D3"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '81f82c99-001e-005f-3393-d59402000000', + 'x-ms-client-request-id', + '9fb019a8-ba37-4163-92ef-5ee657f0869f', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:35 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018565601801512/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018565635704252', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:11 GMT', + 'Tue, 28 Jan 2020 04:27:36 GMT', 'ETag', - '"0x8D7365EFE035CCE"', + '"0x8D7A3AA6724BB31"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '14e8e2db-b01e-0020-7747-680a30000000', + '7d9f8cc1-001e-0010-1993-d5501a000000', 'x-ms-client-request-id', - '55a50a09-7ef8-44fa-a5e6-a7e9f935dbe5', + '29a92f60-9d4b-4895-b71c-b1906b9d16b2', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:10 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:35 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94156816859093101570') + .head('/1container-with-dash158018565601801512/%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94/%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018565635704252') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:11 GMT', + 'Tue, 28 Jan 2020 04:27:36 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EFE035CCE"', + '"0x8D7A3AA6724BB31"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '8b51149e-b01e-0002-4547-686406000000', + '7d9f8cec-001e-0010-3d93-d5501a000000', 'x-ms-client-request-id', - '2d7f5850-f9e2-4a20-ab8c-ae201ef57e03', + '712a426f-3bdc-421f-a4bf-bda5334bff12', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:11 GMT', + 'Tue, 28 Jan 2020 04:27:36 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:11 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:35 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018565601801512') .query(true) - .reply(200, "にっぽんご/にほんご156816859093101570にっぽんご/にほんご156816859093101570Wed, 11 Sep 2019 02:23:11 GMTWed, 11 Sep 2019 02:23:11 GMT0x8D7365EFE035CCE1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "にっぽんご/にほんご158018565635704252にっぽんご/にほんご158018565635704252Tue, 28 Jan 2020 04:27:36 GMTTue, 28 Jan 2020 04:27:36 GMT0x8D7A3AA6724BB311application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'b36db264-801e-0023-0847-680937000000', + '81f82d1f-001e-005f-2993-d59402000000', 'x-ms-client-request-id', - 'b48fb3d8-b181-4697-8cd8-14d17506b89e', + 'a2e89d29-5994-415b-8b6a-baaa6bcb2ee3', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:11 GMT' ]); + 'Tue, 28 Jan 2020 04:27:36 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018565601801512') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '81f82d40-001e-005f-4693-d59402000000', + 'x-ms-client-request-id', + '89059376-a148-41f9-b51f-ee155e1b15d3', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:36 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.js index 09bdba8b5593..61463a49a3b6 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_japanese_uri_encoded.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"にっぽんご/にほんご":"にっぽんご/にほんご156816858848106571"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018565410305161","にっぽんご/にほんご":"にっぽんご/にほんご158018565444506903"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594156816858848106571', "A") + .put('/1container-with-dash158018565410305161') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:34 GMT', + 'ETag', + '"0x8D7A3AA65CC99C0"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'fc44cd9f-101e-0040-1d93-d54f12000000', + 'x-ms-client-request-id', + '2f58b825-a67f-4f12-a8bb-0402a4d06a49', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:34 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018565410305161/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594158018565444506903', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:08 GMT', + 'Tue, 28 Jan 2020 04:27:34 GMT', 'ETag', - '"0x8D7365EFC8E2CAF"', + '"0x8D7A3AA6600796C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '5b171952-501e-0065-7447-68d7a1000000', + '37042090-701e-0050-5d93-d579f4000000', 'x-ms-client-request-id', - '2717fd3d-e1ae-44b5-8c3f-ec66d029a0cf', + '22dfc735-608f-4277-bb5f-6895fc4505c6', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:08 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:34 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594156816858848106571') + .head('/1container-with-dash158018565410305161/%25E3%2581%25AB%25E3%2581%25A3%25E3%2581%25BD%25E3%2582%2593%25E3%2581%2594%252F%25E3%2581%25AB%25E3%2581%25BB%25E3%2582%2593%25E3%2581%2594158018565444506903') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:08 GMT', + 'Tue, 28 Jan 2020 04:27:34 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EFC8E2CAF"', + '"0x8D7A3AA6600796C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '86b72774-c01e-0049-4b47-68559c000000', + '370420ad-701e-0050-7993-d579f4000000', 'x-ms-client-request-id', - '9ae203b2-6317-4e66-8f9c-2b30c097bcb7', + '88ec062d-cdc8-4249-a5be-23d519084610', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:08 GMT', + 'Tue, 28 Jan 2020 04:27:34 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:09 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:34 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018565410305161') .query(true) - .reply(200, "%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94156816858848106571%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94156816858848106571Wed, 11 Sep 2019 02:23:08 GMTWed, 11 Sep 2019 02:23:08 GMT0x8D7365EFC8E2CAF1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018565444506903%E3%81%AB%E3%81%A3%E3%81%BD%E3%82%93%E3%81%94%2F%E3%81%AB%E3%81%BB%E3%82%93%E3%81%94158018565444506903Tue, 28 Jan 2020 04:27:34 GMTTue, 28 Jan 2020 04:27:34 GMT0x8D7A3AA6600796C1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'fbed488c-701e-001f-3347-68bdec000000', + 'fc44ce9a-101e-0040-0d93-d54f12000000', 'x-ms-client-request-id', - '8a2e6404-ca6b-4e28-bdf2-0db2b7751428', + 'afc5d68e-52b1-4fb6-805f-65907798335d', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:08 GMT' ]); + 'Tue, 28 Jan 2020 04:27:34 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018565410305161') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'fc44cebf-101e-0040-3293-d54f12000000', + 'x-ms-client-request-id', + 'd17a94c7-a5af-4659-a053-28a4fabf488c', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:34 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian.js index 6f7a7992cacb..1b745856aa0f 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"ру́сский язы́к":"ру́сский язы́к156816858235404453"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564930806823","ру́сский язы́к":"ру́сский язы́к158018564965807102"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA156816858235404453', "A") + .put('/1container-with-dash158018564930806823') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:29 GMT', + 'ETag', + '"0x8D7A3AA62F182F6"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'a90cdd50-501e-0047-1393-d5b997000000', + 'x-ms-client-request-id', + '9bf864cf-3e55-4681-93d6-e4f3f03cfc09', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:29 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564930806823/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018564965807102', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:02 GMT', + 'Tue, 28 Jan 2020 04:27:29 GMT', 'ETag', - '"0x8D7365EF8E7112E"', + '"0x8D7A3AA63253861"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'af57e0b0-501e-0008-4847-687d8f000000', + 'abb3b1db-601e-0044-4593-d5ba90000000', 'x-ms-client-request-id', - 'ecd22cc9-1b87-4f39-9752-727bedfcabf8', + '6ba58a08-9836-45a7-86af-08e9db409f65', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:02 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:29 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA156816858235404453') + .head('/1container-with-dash158018564930806823/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018564965807102') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:02 GMT', + 'Tue, 28 Jan 2020 04:27:29 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF8E7112E"', + '"0x8D7A3AA63253861"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a465f2c1-001e-001b-7947-68486e000000', + 'abb3b1fd-601e-0044-6493-d5ba90000000', 'x-ms-client-request-id', - 'd5263b81-5287-4329-8467-820f12fd7699', + '5ad41b11-159f-4d85-94b5-ff0fe2627715', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:02 GMT', + 'Tue, 28 Jan 2020 04:27:29 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:02 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:29 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564930806823') .query(true) - .reply(200, "ру́сский язы́к156816858235404453ру́сский язы́к156816858235404453Wed, 11 Sep 2019 02:23:02 GMTWed, 11 Sep 2019 02:23:02 GMT0x8D7365EF8E7112E1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "ру́сский язы́к158018564965807102ру́сский язы́к158018564965807102Tue, 28 Jan 2020 04:27:29 GMTTue, 28 Jan 2020 04:27:29 GMT0x8D7A3AA632538611application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'dd4c1ca2-901e-0037-5a47-68ca53000000', + 'a90cde4a-501e-0047-8093-d5b997000000', 'x-ms-client-request-id', - '01021fc3-f654-4688-a7eb-3254c0edb3f0', + '32394f88-588b-445d-b982-b726e12a38c9', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:03 GMT' ]); + 'Tue, 28 Jan 2020 04:27:29 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564930806823') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'a90cde6d-501e-0047-2193-d5b997000000', + 'x-ms-client-request-id', + 'ab34aea1-0268-45e8-bc0b-04e1b0d67cf4', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:29 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.js index 798706d12498..e82f863d5c64 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"ру́сский язы́к":"ру́сский язы́к156816858357607790"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018565025706388","ру́сский язы́к":"ру́сский язы́к158018565060203064"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA156816858357607790', "A") + .put('/1container-with-dash158018565025706388') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:30 GMT', + 'ETag', + '"0x8D7A3AA63817535"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'fe63955a-501e-0021-3c93-d50bcd000000', + 'x-ms-client-request-id', + 'cb9f58ec-1ef0-446a-9d2b-aa7612007d93', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:29 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018565025706388/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018565060203064', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:03 GMT', + 'Tue, 28 Jan 2020 04:27:30 GMT', 'ETag', - '"0x8D7365EF9A0979C"', + '"0x8D7A3AA63B7F5A2"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '018a73cd-d01e-0019-0247-684a94000000', + 'c2f8da95-501e-0008-2e93-d57d8f000000', 'x-ms-client-request-id', - '85611431-235c-4d50-bf99-d06e9b8569f9', + '4b2f8d86-25ad-4701-92c0-e6b372333feb', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:03 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:30 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA156816858357607790') + .head('/1container-with-dash158018565025706388/%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018565060203064') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:03 GMT', + 'Tue, 28 Jan 2020 04:27:30 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF9A0979C"', + '"0x8D7A3AA63B7F5A2"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'dd4c1e27-901e-0037-3647-68ca53000000', + 'c2f8da99-501e-0008-3193-d57d8f000000', 'x-ms-client-request-id', - 'a3aff5af-587f-4c8b-8910-fff4460a3d0a', + 'e8c36bbc-bd4b-4379-a66f-b19cb4f6c3f9', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:03 GMT', + 'Tue, 28 Jan 2020 04:27:30 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:03 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:30 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018565025706388') .query(true) - .reply(200, "ру́сский язы́к156816858357607790ру́сский язы́к156816858357607790Wed, 11 Sep 2019 02:23:03 GMTWed, 11 Sep 2019 02:23:03 GMT0x8D7365EF9A0979C1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "ру́сский язы́к158018565060203064ру́сский язы́к158018565060203064Tue, 28 Jan 2020 04:27:30 GMTTue, 28 Jan 2020 04:27:30 GMT0x8D7A3AA63B7F5A21application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '155bb076-c01e-0006-2847-689184000000', + 'fe6395bc-501e-0021-1893-d50bcd000000', 'x-ms-client-request-id', - '170f599e-d5d4-48a9-8e84-f5c5d92acb38', + '0d3f1297-34ab-43cf-aaa9-36e465511458', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:03 GMT' ]); + 'Tue, 28 Jan 2020 04:27:30 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018565025706388') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'fe6395d5-501e-0021-2c93-d50bcd000000', + 'x-ms-client-request-id', + 'd3c9f386-98ed-4908-be01-9b2ba6dff9d9', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:30 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.js index e1a2518b9cb5..91764b940ec4 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_name_russian_uri_encoded.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"ру́сский язы́к":"ру́сский язы́к156816858111807111"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564832705805","ру́сский язы́к":"ру́сский язы́к158018564866606259"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA156816858111807111', "A") + .put('/1container-with-dash158018564832705805') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:28 GMT', + 'ETag', + '"0x8D7A3AA625A85B1"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '891e4dc8-701e-0014-2b93-d5a598000000', + 'x-ms-client-request-id', + '010b587f-be7c-4e0d-8a0e-7716e96d8db3', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:28 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564832705805/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA158018564866606259', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:01 GMT', + 'Tue, 28 Jan 2020 04:27:28 GMT', 'ETag', - '"0x8D7365EF82A2EC0"', + '"0x8D7A3AA629057F5"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '48494982-201e-0048-5347-685461000000', + 'fe639408-501e-0021-8093-d50bcd000000', 'x-ms-client-request-id', - '7fe21ae0-8b95-46a9-8269-17e1f9455e34', + '346ba6a2-972b-4a82-b1b3-e15d8c1a353d', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:23:00 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:28 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA156816858111807111') + .head('/1container-with-dash158018564832705805/%25D1%2580%25D1%2583%25CC%2581%25D1%2581%25D1%2581%25D0%25BA%25D0%25B8%25D0%25B9%2520%25D1%258F%25D0%25B7%25D1%258B%25CC%2581%25D0%25BA158018564866606259') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:23:01 GMT', + 'Tue, 28 Jan 2020 04:27:28 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF82A2EC0"', + '"0x8D7A3AA629057F5"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '64cee067-601e-0066-3547-68d4a6000000', + 'fe63941c-501e-0021-1393-d50bcd000000', 'x-ms-client-request-id', - '719e3735-8d42-4eaa-90fb-124c2f320666', + 'e87d7486-7bae-4fde-bd83-909aee717cb8', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:23:01 GMT', + 'Tue, 28 Jan 2020 04:27:28 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:01 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:28 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564832705805') .query(true) - .reply(200, "%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA156816858111807111%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA156816858111807111Wed, 11 Sep 2019 02:23:01 GMTWed, 11 Sep 2019 02:23:01 GMT0x8D7365EF82A2EC01application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018564866606259%D1%80%D1%83%CC%81%D1%81%D1%81%D0%BA%D0%B8%D0%B9%20%D1%8F%D0%B7%D1%8B%CC%81%D0%BA158018564866606259Tue, 28 Jan 2020 04:27:28 GMTTue, 28 Jan 2020 04:27:28 GMT0x8D7A3AA629057F51application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'e438e8c1-401e-003e-6247-68d0dd000000', + '891e4ec8-701e-0014-1b93-d5a598000000', 'x-ms-client-request-id', - '883a638a-1656-4607-b91a-d6e37cce8fc0', + '6b67d874-e6b4-4d97-8a81-8fad8e8ca4d7', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:23:01 GMT' ]); + 'Tue, 28 Jan 2020 04:27:28 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564832705805') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '891e4f05-701e-0014-4f93-d5a598000000', + 'x-ms-client-request-id', + '72809ff5-b0bd-47ce-8a75-63408adf57ba', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:29 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.js index 782949b55cb7..993f9e809023 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"////Upper/blob/empty /another 汉字":"////Upper/blob/empty /another 汉字156816857609508935"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564436600672","////Upper/blob/empty /another 汉字":"////Upper/blob/empty /another 汉字158018564472508834"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97156816857609508935', "A") + .put('/1container-with-dash158018564436600672') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:24 GMT', + 'ETag', + '"0x8D7A3AA60007B8B"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'b5b47178-901e-005a-2193-d5607d000000', + 'x-ms-client-request-id', + '4cf1dbfc-a743-4d1b-9419-4de8c3d8ba07', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:24 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564436600672/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97158018564472508834', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:56 GMT', + 'Tue, 28 Jan 2020 04:27:25 GMT', 'ETag', - '"0x8D7365EF52CDF6D"', + '"0x8D7A3AA60350C0D"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a465e85a-001e-001b-0d47-68486e000000', + 'c235ee87-b01e-0064-3c93-d5d65c000000', 'x-ms-client-request-id', - 'e9f37f83-4f96-4d14-9dfe-75f874e4ec8a', + 'f3bbc4aa-350b-4a7f-9be7-ba913440759f', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:56 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:24 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97156816857609508935') + .head('/1container-with-dash158018564436600672/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother%20%E6%B1%89%E5%AD%97158018564472508834') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:56 GMT', + 'Tue, 28 Jan 2020 04:27:25 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF52CDF6D"', + '"0x8D7A3AA60350C0D"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a044c369-701e-0050-1a47-6879f4000000', + 'c235eec1-b01e-0064-7093-d5d65c000000', 'x-ms-client-request-id', - 'c0a0f404-d0d4-4810-905a-4fe67538e258', + 'f5beb622-d063-49cf-beab-a9fb79b2d12c', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:22:56 GMT', + 'Tue, 28 Jan 2020 04:27:25 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:55 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:24 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564436600672') .query(true) - .reply(200, "////Upper/blob/empty /another 汉字156816857609508935////Upper/blob/empty /another 汉字156816857609508935Wed, 11 Sep 2019 02:22:56 GMTWed, 11 Sep 2019 02:22:56 GMT0x8D7365EF52CDF6D1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "////Upper/blob/empty /another 汉字158018564472508834////Upper/blob/empty /another 汉字158018564472508834Tue, 28 Jan 2020 04:27:25 GMTTue, 28 Jan 2020 04:27:25 GMT0x8D7A3AA60350C0D1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a044c40b-701e-0050-2947-6879f4000000', + 'b5b4724c-901e-005a-6793-d5607d000000', 'x-ms-client-request-id', - '6f64a7d8-1b33-48d2-8838-9434698636a9', + '67a4cd60-14b7-4d65-94a7-1e3974afccee', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:56 GMT' ]); + 'Tue, 28 Jan 2020 04:27:24 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564436600672') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'b5b47269-901e-005a-0293-d5607d000000', + 'x-ms-client-request-id', + '1094eb94-27cb-44bc-aaf4-fe7c3cbff439', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:24 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.js index 59e5f2c3ee0e..6e7640871d7e 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_blob_names_chinese_characters_in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"////Upper/blob/empty /another 汉字":"////Upper/blob/empty /another 汉字156816857740308937"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564533802999","////Upper/blob/empty /another 汉字":"////Upper/blob/empty /another 汉字158018564569809046"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97156816857740308937', "A") + .put('/1container-with-dash158018564533802999') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:25 GMT', + 'ETag', + '"0x8D7A3AA6092E0D5"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '891e4986-701e-0014-2b93-d5a598000000', + 'x-ms-client-request-id', + 'f2504a97-bbeb-46bb-a506-96ba539e794a', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:25 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564533802999/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97158018564569809046', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:57 GMT', + 'Tue, 28 Jan 2020 04:27:25 GMT', 'ETag', - '"0x8D7365EF5FE860D"', + '"0x8D7A3AA60CB4C5C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '4745d18d-301e-0013-4d47-68531d000000', + 'b910969f-b01e-0046-1d93-d5b86a000000', 'x-ms-client-request-id', - '01084f98-99d5-405c-88cc-6552f6a70a07', + '65f9bcb5-0c7c-4f20-b543-dd3667e93aec', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:56 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:25 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97156816857740308937') + .head('/1container-with-dash158018564533802999/////Upper/blob/empty%20/another%20%E6%B1%89%E5%AD%97158018564569809046') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:57 GMT', + 'Tue, 28 Jan 2020 04:27:25 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF5FE860D"', + '"0x8D7A3AA60CB4C5C"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '5b641d11-801e-0001-0847-686701000000', + 'b91096cd-b01e-0046-4793-d5b86a000000', 'x-ms-client-request-id', - 'd665ebef-6d11-4ed0-8731-a35d5afd7a2f', + '88134f76-05dc-42e8-9217-537e4563d628', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:22:57 GMT', + 'Tue, 28 Jan 2020 04:27:25 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:58 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:25 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564533802999') .query(true) - .reply(200, "////Upper/blob/empty /another 汉字156816857740308937////Upper/blob/empty /another 汉字156816857740308937Wed, 11 Sep 2019 02:22:57 GMTWed, 11 Sep 2019 02:22:57 GMT0x8D7365EF5FE860D1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "////Upper/blob/empty /another 汉字158018564569809046////Upper/blob/empty /another 汉字158018564569809046Tue, 28 Jan 2020 04:27:25 GMTTue, 28 Jan 2020 04:27:25 GMT0x8D7A3AA60CB4C5C1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'e438e599-401e-003e-8047-68d0dd000000', + '891e4a30-701e-0014-4e93-d5a598000000', 'x-ms-client-request-id', - '8d29f01b-5ddb-4631-a37c-5462173df239', + '661a912d-07db-4710-ba5a-142804a77c6a', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:57 GMT' ]); + 'Tue, 28 Jan 2020 04:27:25 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564533802999') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '891e4a48-701e-0014-6493-d5a598000000', + 'x-ms-client-request-id', + '2ce8a506-f92d-4219-a302-050e732573f3', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:26 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.js index d03d0f1be040..d1f9049e474e 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"////Upper/blob/empty /another":"////Upper/blob/empty /another156816857358502384"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564244609958","////Upper/blob/empty /another":"////Upper/blob/empty /another158018564279107954"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother156816857358502384', "A") + .put('/1container-with-dash158018564244609958') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:22 GMT', + 'ETag', + '"0x8D7A3AA5EDA64AC"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '95fa1e6d-b01e-0009-0f93-d57c72000000', + 'x-ms-client-request-id', + 'df17262d-0deb-465b-aa4a-90908ba200ec', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:22 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564244609958/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother158018564279107954', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:53 GMT', + 'Tue, 28 Jan 2020 04:27:23 GMT', 'ETag', - '"0x8D7365EF3AE5ECD"', + '"0x8D7A3AA5F0F1C1E"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'e18b0a41-d01e-0030-3647-683cd6000000', + '4a1d8236-801e-0067-4793-d5d55b000000', 'x-ms-client-request-id', - '17fc0bd2-fc2e-4162-adc4-b47cf90d5fdd', + '4401c77c-bddc-47a3-a852-6b17e093ee7e', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:52 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:22 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother156816857358502384') + .head('/1container-with-dash158018564244609958/%2F%2F%2F%2FUpper%2Fblob%2Fempty%20%2Fanother158018564279107954') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:53 GMT', + 'Tue, 28 Jan 2020 04:27:23 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF3AE5ECD"', + '"0x8D7A3AA5F0F1C1E"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'dd4c0dc4-901e-0037-5d47-68ca53000000', + '4a1d825b-801e-0067-6993-d5d55b000000', 'x-ms-client-request-id', - '9f4dee1e-fea5-41fe-a14c-ea78f1227b3c', + 'bfca2cb4-8a2b-4a38-84f6-f6f92f092e28', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:22:53 GMT', + 'Tue, 28 Jan 2020 04:27:23 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:54 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:23 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564244609958') .query(true) - .reply(200, "////Upper/blob/empty /another156816857358502384////Upper/blob/empty /another156816857358502384Wed, 11 Sep 2019 02:22:53 GMTWed, 11 Sep 2019 02:22:53 GMT0x8D7365EF3AE5ECD1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "////Upper/blob/empty /another158018564279107954////Upper/blob/empty /another158018564279107954Tue, 28 Jan 2020 04:27:23 GMTTue, 28 Jan 2020 04:27:23 GMT0x8D7A3AA5F0F1C1E1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'd253f660-501e-0003-4747-6865fb000000', + '95fa1f7b-b01e-0009-0f93-d57c72000000', 'x-ms-client-request-id', - '94446b95-2405-40c1-b1fb-255b036e033d', + '3a763367-6f83-4b0a-8174-dd6a106d6be6', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:53 GMT' ]); + 'Tue, 28 Jan 2020 04:27:22 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564244609958') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '95fa1fae-b01e-0009-4193-d57c72000000', + 'x-ms-client-request-id', + 'c9469c8f-dd3a-4df2-96f5-fe7c7ff55d45', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:22 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.js index f8d1062bc67b..71a8f38861f1 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_uppercase_in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"////Upper/blob/empty /another":"////Upper/blob/empty /another156816857484106063"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564341300644","////Upper/blob/empty /another":"////Upper/blob/empty /another158018564374405347"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/////Upper/blob/empty%20/another156816857484106063', "A") + .put('/1container-with-dash158018564341300644') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:23 GMT', + 'ETag', + '"0x8D7A3AA5F6BBC92"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'db5d3750-001e-0054-5d93-d58c76000000', + 'x-ms-client-request-id', + '95b9ac3c-a196-49c1-9d25-91a61abad6cf', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:23 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564341300644/////Upper/blob/empty%20/another158018564374405347', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:55 GMT', + 'Tue, 28 Jan 2020 04:27:24 GMT', 'ETag', - '"0x8D7365EF46EEB60"', + '"0x8D7A3AA5FA02B8A"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'f40b955c-a01e-001d-1347-68bf16000000', + '029008af-a01e-0016-1b93-d5a762000000', 'x-ms-client-request-id', - 'd55f1cb5-a22c-4fce-8411-9308c6392ca8', + 'c32de8ce-cff5-416a-a25f-7ffda2566347', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:54 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:23 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/////Upper/blob/empty%20/another156816857484106063') + .head('/1container-with-dash158018564341300644/////Upper/blob/empty%20/another158018564374405347') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:55 GMT', + 'Tue, 28 Jan 2020 04:27:24 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF46EEB60"', + '"0x8D7A3AA5FA02B8A"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '1a788e1e-501e-0021-4547-680bcd000000', + '029008e5-a01e-0016-4c93-d5a762000000', 'x-ms-client-request-id', - 'd6ce602e-db0c-437f-8c78-1d91250409d1', + 'c9c67f18-5f07-424f-8689-a561cad07d30', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:22:55 GMT', + 'Tue, 28 Jan 2020 04:27:24 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:55 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:23 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564341300644') .query(true) - .reply(200, "////Upper/blob/empty /another156816857484106063////Upper/blob/empty /another156816857484106063Wed, 11 Sep 2019 02:22:55 GMTWed, 11 Sep 2019 02:22:55 GMT0x8D7365EF46EEB601application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "////Upper/blob/empty /another158018564374405347////Upper/blob/empty /another158018564374405347Tue, 28 Jan 2020 04:27:24 GMTTue, 28 Jan 2020 04:27:24 GMT0x8D7A3AA5FA02B8A1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '155ba443-c01e-0006-3e47-689184000000', + 'db5d3807-001e-0054-8093-d58c76000000', 'x-ms-client-request-id', - '8a9ff3d2-6472-4340-82f7-0c0e8d7c6c82', + '79c3d09b-7412-4045-9c94-302723e56a0c', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:55 GMT' ]); + 'Tue, 28 Jan 2020 04:27:23 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564341300644') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + 'db5d3829-001e-0054-2193-d58c76000000', + 'x-ms-client-request-id', + '66c3f430-4757-4879-b0f1-e559c1bc991b', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:23 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.js index 4564859583bb..112636e690fa 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"////blob/empty /another":"////blob/empty /another156816857106602422"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564046307953","////blob/empty /another":"////blob/empty /another158018564080603229"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother156816857106602422', "A") + .put('/1container-with-dash158018564046307953') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:20 GMT', + 'ETag', + '"0x8D7A3AA5DAB4022"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '60e28f67-201e-0048-1993-d55461000000', + 'x-ms-client-request-id', + '77d2a3e2-3e36-44d3-8ff9-0daf8744efbb', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:20 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564046307953/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother158018564080603229', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:51 GMT', + 'Tue, 28 Jan 2020 04:27:21 GMT', 'ETag', - '"0x8D7365EF22DBAF3"', + '"0x8D7A3AA5DE07832"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'c3c9d32f-c01e-0042-0d47-684de8000000', + '96e5b408-e01e-0033-4a93-d53fd1000000', 'x-ms-client-request-id', - '64e00ad3-09ce-4594-85f3-ba24aa9c82d7', + '6f7963e2-2198-4125-946c-add2abdd3873', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:50 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:20 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother156816857106602422') + .head('/1container-with-dash158018564046307953/%2F%2F%2F%2Fblob%2Fempty%20%2Fanother158018564080603229') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:51 GMT', + 'Tue, 28 Jan 2020 04:27:21 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF22DBAF3"', + '"0x8D7A3AA5DE07832"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '8bb9303f-601e-000b-1e47-687e88000000', + '96e5b441-e01e-0033-7893-d53fd1000000', 'x-ms-client-request-id', - '3007b360-3547-48de-8c4b-bc19f758e801', + '647b1df0-ac3b-434e-9e49-a252d09c2136', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:22:51 GMT', + 'Tue, 28 Jan 2020 04:27:21 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:51 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:20 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564046307953') .query(true) - .reply(200, "////blob/empty /another156816857106602422////blob/empty /another156816857106602422Wed, 11 Sep 2019 02:22:51 GMTWed, 11 Sep 2019 02:22:51 GMT0x8D7365EF22DBAF31application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "////blob/empty /another158018564080603229////blob/empty /another158018564080603229Tue, 28 Jan 2020 04:27:21 GMTTue, 28 Jan 2020 04:27:21 GMT0x8D7A3AA5DE078321application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'bc0ba05e-901e-003c-6a47-68d227000000', + '60e29059-201e-0048-5993-d55461000000', 'x-ms-client-request-id', - 'b5d6c3b5-f04d-4c46-98cd-a0d9f7ca18d6', + '79c26d18-f384-4ee4-8fac-cf29a60a304a', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:52 GMT' ]); + 'Tue, 28 Jan 2020 04:27:21 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564046307953') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '60e2907c-201e-0048-7893-d55461000000', + 'x-ms-client-request-id', + 'beeebacd-2671-4a4e-8d8c-f2e7afd492ce', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:21 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.js index bc1b3754940b..e69f3e672b5e 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with__in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"////blob/empty /another":"////blob/empty /another156816857231905555"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018564142704967","////blob/empty /another":"////blob/empty /another158018564179705419"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/////blob/empty%20/another156816857231905555', "A") + .put('/1container-with-dash158018564142704967') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:21 GMT', + 'ETag', + '"0x8D7A3AA5E409050"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2bf8bc0a-801e-006c-0e93-d5cd2f000000', + 'x-ms-client-request-id', + 'f8ca7682-e455-4048-b919-7d327cc1f4e9', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:20 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018564142704967/////blob/empty%20/another158018564179705419', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:52 GMT', + 'Tue, 28 Jan 2020 04:27:22 GMT', 'ETag', - '"0x8D7365EF2EE206D"', + '"0x8D7A3AA5E777BF2"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '5b915b70-e01e-001a-5047-684993000000', + 'db5d3522-001e-0054-5c93-d58c76000000', 'x-ms-client-request-id', - '2fa071b1-a968-456a-834c-8911232cec0b', + 'c6e61c5e-7a55-475a-a6f3-768c5615ad82', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,11 +45,10 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:52 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:21 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/1container-with-dash156816856896007000/////blob/empty%20/another156816857231905555') + .head('/1container-with-dash158018564142704967/////blob/empty%20/another158018564179705419') .reply(200, "", [ 'Content-Length', '1', 'Content-Type', @@ -37,23 +56,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:52 GMT', + 'Tue, 28 Jan 2020 04:27:22 GMT', 'Accept-Ranges', 'bytes', 'ETag', - '"0x8D7365EF2EE206D"', + '"0x8D7A3AA5E777BF2"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '585fb4a4-101e-0026-0847-68fd48000000', + 'db5d353d-001e-0054-7293-d58c76000000', 'x-ms-client-request-id', - '0d3ea4ad-9920-425b-9180-6b3af512e0a0', + '54deef94-70a0-40fc-9283-d596b8df0cd5', 'x-ms-version', '2019-02-02', - 'x-ms-tag-count', - '0', 'x-ms-creation-time', - 'Wed, 11 Sep 2019 02:22:52 GMT', + 'Tue, 28 Jan 2020 04:27:22 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -67,26 +84,25 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-access-tier-inferred', 'true', 'Access-Control-Expose-Headers', - 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-tag-count,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,Content-MD5,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:52 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:21 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018564142704967') .query(true) - .reply(200, "////blob/empty /another156816857231905555////blob/empty /another156816857231905555Wed, 11 Sep 2019 02:22:52 GMTWed, 11 Sep 2019 02:22:52 GMT0x8D7365EF2EE206D1application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "////blob/empty /another158018564179705419////blob/empty /another158018564179705419Tue, 28 Jan 2020 04:27:22 GMTTue, 28 Jan 2020 04:27:22 GMT0x8D7A3AA5E777BF21application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '25d771bf-101e-002d-4b47-68e53c000000', + '2bf8bc7a-801e-006c-7393-d5cd2f000000', 'x-ms-client-request-id', - '7d4dfc7e-6b42-4255-a58e-a48a1bc678a0', + 'c75431ae-84e2-4b63-b4d3-d45f6c00a569', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -94,5 +110,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:52 GMT' ]); + 'Tue, 28 Jan 2020 04:27:21 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018564142704967') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2bf8bc90-801e-006c-0593-d5cd2f000000', + 'x-ms-client-request-id', + 'cfd62f56-a0d7-4968-ad58-2928d2d608b5', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:21 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.js index fc4a3f18beda..2f2f5b26dd5b 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"blob empty":"blob empty156816856938305487"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018563778300519","blob empty":"blob empty158018563900608388"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/blob%20empty156816856938305487', "A") + .put('/1container-with-dash158018563778300519') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:18 GMT', + 'ETag', + '"0x8D7A3AA5C93C8E0"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '8af2db5c-d01e-0056-4693-d58e8c000000', + 'x-ms-client-request-id', + '05789ef6-5766-47ea-8d98-738a8c1ef47b', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:18 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018563778300519/blob%20empty158018563900608388', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:49 GMT', + 'Tue, 28 Jan 2020 04:27:19 GMT', 'ETag', - '"0x8D7365EF12CE579"', + '"0x8D7A3AA5CCDECDF"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '155b9b71-c01e-0006-1c47-689184000000', + 'df90a09a-c01e-0049-5b93-d5559c000000', 'x-ms-client-request-id', - '353bf7a2-1707-46e9-95e3-995f1bf3deac', + 'aa509e13-b8bf-460e-b301-7d5e99467a3d', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,22 +45,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:48 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:19 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018563778300519') .query(true) - .reply(200, "blob empty156816856938305487blob empty156816856938305487Wed, 11 Sep 2019 02:22:49 GMTWed, 11 Sep 2019 02:22:49 GMT0x8D7365EF12CE5791application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "blob empty158018563900608388blob empty158018563900608388Tue, 28 Jan 2020 04:27:19 GMTTue, 28 Jan 2020 04:27:19 GMT0x8D7A3AA5CCDECDF1application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'a274917a-b01e-0046-1747-68b86a000000', + '8af2dbd9-d01e-0056-3e93-d58e8c000000', 'x-ms-client-request-id', - 'ea039e07-1798-447a-b116-f213165bd22d', + '1c8bbad2-e1c4-4f73-b422-9b533b3d5c39', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -48,5 +67,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:49 GMT' ]); + 'Tue, 28 Jan 2020 04:27:18 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018563778300519') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '8af2dbf9-d01e-0056-5c93-d58e8c000000', + 'x-ms-client-request-id', + '1247b1df-3104-49e1-9c08-1d14e7a6163d', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:18 GMT' ]); diff --git a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.js b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.js index 597a429ac0e4..8c326368210e 100644 --- a/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.js +++ b/sdk/storage/storage-blob/recordings/node/special_naming_tests/recording_should_work_with_special_container_and_blob_names_with_spaces_in_url_string.js @@ -1,23 +1,43 @@ let nock = require('nock'); -module.exports.testInfo = {"blob empty":"blob empty156816857022403226"} +module.exports.testInfo = {"uniqueName":{"1container-with-dash":"1container-with-dash158018563957509762","blob empty":"blob empty158018563991707816"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/1container-with-dash156816856896007000/blob%20empty156816857022403226', "A") + .put('/1container-with-dash158018563957509762') + .query(true) + .reply(201, "", [ 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 28 Jan 2020 04:27:19 GMT', + 'ETag', + '"0x8D7A3AA5D238CDC"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '87aea962-101e-0026-6993-d5fd48000000', + 'x-ms-client-request-id', + '54934dcf-453c-4a44-b6ad-6c4addbc31aa', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:19 GMT' ]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/1container-with-dash158018563957509762/blob%20empty158018563991707816', "A") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'f8VicOenD6gaWTW3Lqy+KQ==', 'Last-Modified', - 'Wed, 11 Sep 2019 02:22:50 GMT', + 'Tue, 28 Jan 2020 04:27:20 GMT', 'ETag', - '"0x8D7365EF1ADC572"', + '"0x8D7A3AA5D5A1934"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'd6530bc0-a01e-0034-4647-68c954000000', + '4f219ea5-101e-000f-2493-d58b0a000000', 'x-ms-client-request-id', - '864bdd5b-7cf8-401a-ae7c-cafb2481812c', + '5126478d-c74b-45b1-8073-fc4bcc7c2fb1', 'x-ms-version', '2019-02-02', 'x-ms-content-crc64', @@ -25,22 +45,21 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'Date', - 'Wed, 11 Sep 2019 02:22:50 GMT' ]); - + 'Tue, 28 Jan 2020 04:27:19 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/1container-with-dash156816856896007000') + .get('/1container-with-dash158018563957509762') .query(true) - .reply(200, "blob empty156816857022403226blob empty156816857022403226Wed, 11 Sep 2019 02:22:50 GMTWed, 11 Sep 2019 02:22:50 GMT0x8D7365EF1ADC5721application/octet-streamPiO3pTJ67n0=f8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue0", [ 'Transfer-Encoding', + .reply(200, "blob empty158018563991707816blob empty158018563991707816Tue, 28 Jan 2020 04:27:20 GMTTue, 28 Jan 2020 04:27:20 GMT0x8D7A3AA5D5A19341application/octet-streamf8VicOenD6gaWTW3Lqy+KQ==BlockBlobCooltrueunlockedavailabletrue", [ 'Transfer-Encoding', 'chunked', 'Content-Type', 'application/xml', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'fd559257-801e-0045-2847-68bb6d000000', + '87aea9bb-101e-0026-3493-d5fd48000000', 'x-ms-client-request-id', - '9ff453fc-6e0d-44d6-b12d-3de927b3b93e', + '2c44dcac-ebd9-4966-94d0-fd1b33483a63', 'x-ms-version', '2019-02-02', 'Access-Control-Expose-Headers', @@ -48,5 +67,20 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Access-Control-Allow-Origin', '*', 'Date', - 'Wed, 11 Sep 2019 02:22:50 GMT' ]); + 'Tue, 28 Jan 2020 04:27:19 GMT' ]); +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/1container-with-dash158018563957509762') + .query(true) + .reply(202, "", [ 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '87aea9c7-101e-0026-3e93-d5fd48000000', + 'x-ms-client-request-id', + '7977a72e-3497-4999-a8ff-16399e18a878', + 'x-ms-version', + '2019-02-02', + 'Date', + 'Tue, 28 Jan 2020 04:27:20 GMT' ]); diff --git a/sdk/storage/storage-blob/test/aborter.spec.ts b/sdk/storage/storage-blob/test/aborter.spec.ts index 1dfc81456bf9..a21dfe394394 100644 --- a/sdk/storage/storage-blob/test/aborter.spec.ts +++ b/sdk/storage/storage-blob/test/aborter.spec.ts @@ -2,22 +2,21 @@ import * as assert from "assert"; import { AbortController, AbortSignal } from "@azure/abort-controller"; import { ContainerClient } from "../src"; -import { getBSU, setupEnvironment } from "./utils"; +import { getBSU, recorderEnvSetup } from "./utils"; import { record, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; dotenv.config({ path: "../.env" }); // tslint:disable:no-empty describe("Aborter", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); }); diff --git a/sdk/storage/storage-blob/test/appendblobclient.spec.ts b/sdk/storage/storage-blob/test/appendblobclient.spec.ts index 621f609723ef..8d5f0a7ccb09 100644 --- a/sdk/storage/storage-blob/test/appendblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/appendblobclient.spec.ts @@ -4,7 +4,7 @@ import { bodyToString, getBSU, getSASConnectionStringFromEnvironment, - setupEnvironment + recorderEnvSetup } from "./utils"; import { record } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; @@ -12,8 +12,6 @@ import { AppendBlobClient, ContainerClient } from "../src"; dotenv.config({ path: "../.env" }); describe("AppendBlobClient", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -22,7 +20,8 @@ describe("AppendBlobClient", () => { let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/blobbatch.spec.ts b/sdk/storage/storage-blob/test/blobbatch.spec.ts index 3e211da300ea..36a23436625f 100644 --- a/sdk/storage/storage-blob/test/blobbatch.spec.ts +++ b/sdk/storage/storage-blob/test/blobbatch.spec.ts @@ -5,19 +5,25 @@ import { getGenericCredential, getTokenCredential, SimpleTokenCredential, - setupEnvironment + recorderEnvSetup } from "./utils"; import { record, Recorder } from "@azure/test-utils-recorder"; import { BlobBatch } from "../src/BlobBatch"; -import { ContainerClient, BlockBlobClient, BlobServiceClient, newPipeline } from "../src"; +import { + ContainerClient, + BlockBlobClient, + BlobServiceClient, + newPipeline, + BlobBatchClient, + StorageSharedKeyCredential +} from "../src"; dotenv.config({ path: "../.env" }); describe("BlobBatch", () => { - setupEnvironment(); - const blobServiceClient = getGenericBSU(""); - const blobBatchClient = blobServiceClient.getBlobBatchClient(); - const credential = getGenericCredential(""); + let blobServiceClient: BlobServiceClient; + let blobBatchClient: BlobBatchClient; + let credential: StorageSharedKeyCredential; let containerName: string; let containerClient: ContainerClient; const blockBlobCount = 3; @@ -27,7 +33,11 @@ describe("BlobBatch", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + + blobServiceClient = getGenericBSU(""); + blobBatchClient = blobServiceClient.getBlobBatchClient(); + credential = getGenericCredential(""); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/blobclient.spec.ts b/sdk/storage/storage-blob/test/blobclient.spec.ts index 23ea6f1209f5..11df16b8abc5 100644 --- a/sdk/storage/storage-blob/test/blobclient.spec.ts +++ b/sdk/storage/storage-blob/test/blobclient.spec.ts @@ -8,16 +8,21 @@ import { bodyToString, getBSU, getSASConnectionStringFromEnvironment, - setupEnvironment + recorderEnvSetup } from "./utils"; import { record, delay } from "@azure/test-utils-recorder"; -import { BlobClient, BlockBlobClient, ContainerClient, BlockBlobTier } from "../src"; +import { + BlobClient, + BlockBlobClient, + ContainerClient, + BlockBlobTier, + BlobServiceClient +} from "../src"; import { Test_CPK_INFO } from "./utils/constants"; dotenv.config({ path: "../.env" }); describe("BlobClient", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); + let blobServiceClient: BlobServiceClient; let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -28,7 +33,8 @@ describe("BlobClient", () => { let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/blobclientpollers.spec.ts b/sdk/storage/storage-blob/test/blobclientpollers.spec.ts index f67a18d5bae2..cf3ef192bc57 100644 --- a/sdk/storage/storage-blob/test/blobclientpollers.spec.ts +++ b/sdk/storage/storage-blob/test/blobclientpollers.spec.ts @@ -6,7 +6,7 @@ import * as dotenv from "dotenv"; import { getBSU } from "./utils"; import { record, Recorder, isRecordMode, isPlaybackMode } from "@azure/test-utils-recorder"; -import { setupEnvironment, testPollerProperties } from "./utils/testutils.common"; +import { recorderEnvSetup, testPollerProperties } from "./utils/testutils.common"; import { BlobClient, BlockBlobClient, @@ -18,8 +18,6 @@ import { dotenv.config({ path: "../.env" }); describe("BlobClient beginCopyFromURL Poller", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -32,7 +30,8 @@ describe("BlobClient beginCopyFromURL Poller", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/blobserviceclient.spec.ts b/sdk/storage/storage-blob/test/blobserviceclient.spec.ts index e8f670d31d52..47a136ab0568 100644 --- a/sdk/storage/storage-blob/test/blobserviceclient.spec.ts +++ b/sdk/storage/storage-blob/test/blobserviceclient.spec.ts @@ -7,17 +7,17 @@ import { getBSU, getSASConnectionStringFromEnvironment, getTokenBSU, - setupEnvironment + recorderEnvSetup } from "./utils"; import { record, delay, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("BlobServiceClient", () => { - setupEnvironment(); + let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this,recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-blob/test/blockblobclient.spec.ts b/sdk/storage/storage-blob/test/blockblobclient.spec.ts index 60aefcf730ea..312c79db499a 100644 --- a/sdk/storage/storage-blob/test/blockblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/blockblobclient.spec.ts @@ -7,7 +7,7 @@ import { bodyToString, getBSU, getSASConnectionStringFromEnvironment, - setupEnvironment + recorderEnvSetup } from "./utils"; import { ContainerClient, BlobClient, BlockBlobClient } from "../src"; import { Test_CPK_INFO } from "./utils/constants"; @@ -15,8 +15,6 @@ import { BlockBlobTier } from "../src"; dotenv.config({ path: "../.env" }); describe("BlockBlobClient", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -26,7 +24,8 @@ describe("BlockBlobClient", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/browser/highlevel.browser.spec.ts b/sdk/storage/storage-blob/test/browser/highlevel.browser.spec.ts index 95a57dd44b9d..f7d1039e07cf 100644 --- a/sdk/storage/storage-blob/test/browser/highlevel.browser.spec.ts +++ b/sdk/storage/storage-blob/test/browser/highlevel.browser.spec.ts @@ -9,15 +9,13 @@ import { getBrowserFile, getBSU, isIE, - setupEnvironment + recorderEnvSetup } from "../utils/index.browser"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { ContainerClient, BlobClient, BlockBlobClient } from "../../src"; +import { ContainerClient, BlobClient, BlockBlobClient, BlobServiceClient } from "../../src"; // tslint:disable:no-empty describe("Highlevel", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -30,8 +28,10 @@ describe("Highlevel", () => { let recorder: Recorder; + let blobServiceClient: BlobServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); @@ -46,7 +46,7 @@ describe("Highlevel", () => { }); before(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); tempFile1 = getBrowserFile(recorder.getUniqueName("browserfile"), tempFile1Length); tempFile2 = getBrowserFile(recorder.getUniqueName("browserfile"), tempFile2Length); recorder.stop(); diff --git a/sdk/storage/storage-blob/test/containerclient.spec.ts b/sdk/storage/storage-blob/test/containerclient.spec.ts index 7ce91438b37b..162e07266ba4 100644 --- a/sdk/storage/storage-blob/test/containerclient.spec.ts +++ b/sdk/storage/storage-blob/test/containerclient.spec.ts @@ -6,24 +6,29 @@ import { getBSU, getSASConnectionStringFromEnvironment, isSuperSet, - setupEnvironment + recorderEnvSetup } from "./utils"; import { record, Recorder } from "@azure/test-utils-recorder"; import { URLBuilder } from "@azure/core-http"; -import { ContainerClient, BlockBlobTier, ContainerListBlobHierarchySegmentResponse } from "../src"; +import { + ContainerClient, + BlockBlobTier, + ContainerListBlobHierarchySegmentResponse, + BlobServiceClient +} from "../src"; import { Test_CPK_INFO } from "./utils/constants"; dotenv.config({ path: "../.env" }); describe("ContainerClient", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); + let blobServiceClient: BlobServiceClient; let containerName: string; let containerClient: ContainerClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/leaseclient.spec.ts b/sdk/storage/storage-blob/test/leaseclient.spec.ts index 3eb056ab4aa6..fc57c991d703 100644 --- a/sdk/storage/storage-blob/test/leaseclient.spec.ts +++ b/sdk/storage/storage-blob/test/leaseclient.spec.ts @@ -1,21 +1,21 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; -import { getBSU, setupEnvironment } from "./utils"; +import { getBSU, recorderEnvSetup } from "./utils"; import { record, delay, Recorder } from "@azure/test-utils-recorder"; -import { ContainerClient, BlobClient, BlockBlobClient } from "../src"; +import { ContainerClient, BlobClient, BlockBlobClient, BlobServiceClient } from "../src"; dotenv.config({ path: "../.env" }); describe("LeaseClient from Container", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); + let blobServiceClient: BlobServiceClient; let containerName: string; let containerClient: ContainerClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); @@ -139,7 +139,6 @@ describe("LeaseClient from Container", () => { }); describe("LeaseClient from Blob", () => { - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -149,7 +148,8 @@ describe("LeaseClient from Blob", () => { let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts b/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts index a334efb8e318..73271f295a2f 100644 --- a/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts @@ -7,13 +7,14 @@ import { StorageSharedKeyCredential, ContainerClient, generateBlobSASQueryParameters, - BlobSASPermissions + BlobSASPermissions, + BlobServiceClient } from "../../src"; import { getBSU, getConnectionStringFromEnvironment, bodyToString, - setupEnvironment + recorderEnvSetup } from "../utils"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; @@ -22,8 +23,6 @@ import { Test_CPK_INFO } from "../utils/constants"; dotenv.config({ path: "../.env" }); describe("AppendBlobClient Node.js only", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -31,8 +30,10 @@ describe("AppendBlobClient Node.js only", () => { let recorder: any; + let blobServiceClient: BlobServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/node/blobclient.spec.ts b/sdk/storage/storage-blob/test/node/blobclient.spec.ts index 6ffd9d98c24f..587ee5a844d9 100644 --- a/sdk/storage/storage-blob/test/node/blobclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/blobclient.spec.ts @@ -9,13 +9,14 @@ import { ContainerClient, BlockBlobClient, generateBlobSASQueryParameters, - BlobSASPermissions + BlobSASPermissions, + BlobServiceClient } from "../../src"; import { bodyToString, getBSU, getConnectionStringFromEnvironment, - setupEnvironment + recorderEnvSetup } from "../utils"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; @@ -23,8 +24,6 @@ import { record, delay } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("BlobClient Node.js only", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -34,8 +33,10 @@ describe("BlobClient Node.js only", () => { let recorder: any; + let blobServiceClient: BlobServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); @@ -139,12 +140,14 @@ describe("BlobClient Node.js only", () => { await blobSnapshotClient.delete(); await blobClient.delete(); - const result2 = (await containerClient - .listBlobsFlat({ - includeSnapshots: true - }) - .byPage() - .next()).value; + const result2 = ( + await containerClient + .listBlobsFlat({ + includeSnapshots: true + }) + .byPage() + .next() + ).value; // Verify that the snapshot is deleted assert.equal(result2.segment.blobItems!.length, 0); @@ -157,12 +160,14 @@ describe("BlobClient Node.js only", () => { const blobSnapshotClient = blobClient.withSnapshot(result.snapshot!); await blobSnapshotClient.getProperties(); - const result3 = (await containerClient - .listBlobsFlat({ - includeSnapshots: true - }) - .byPage() - .next()).value; + const result3 = ( + await containerClient + .listBlobsFlat({ + includeSnapshots: true + }) + .byPage() + .next() + ).value; // As a snapshot doesn't have leaseStatus and leaseState properties but origin blob has, // let assign them to undefined both for other properties' easy comparison @@ -196,23 +201,27 @@ describe("BlobClient Node.js only", () => { await blobClient.delete(); - const result = (await containerClient - .listBlobsFlat({ - includeDeleted: true - }) - .byPage() - .next()).value; + const result = ( + await containerClient + .listBlobsFlat({ + includeDeleted: true + }) + .byPage() + .next() + ).value; assert.ok(result.segment.blobItems![0].deleted); await blobClient.undelete(); - const result2 = (await containerClient - .listBlobsFlat({ - includeDeleted: true - }) - .byPage() - .next()).value; + const result2 = ( + await containerClient + .listBlobsFlat({ + includeDeleted: true + }) + .byPage() + .next() + ).value; assert.ok(!result2.segment.blobItems![0].deleted); }); diff --git a/sdk/storage/storage-blob/test/node/blobserviceclient.spec.ts b/sdk/storage/storage-blob/test/node/blobserviceclient.spec.ts index 23d41a238f9d..de3c2fe5d89c 100644 --- a/sdk/storage/storage-blob/test/node/blobserviceclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/blobserviceclient.spec.ts @@ -2,16 +2,15 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { BlobServiceClient, newPipeline, StorageSharedKeyCredential } from "../../src"; -import { getBSU, getConnectionStringFromEnvironment, setupEnvironment } from "../utils"; -import { record } from "@azure/test-utils-recorder"; +import { getBSU, getConnectionStringFromEnvironment, recorderEnvSetup } from "../utils"; +import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("BlobServiceClient Node.js only", () => { - setupEnvironment(); - let recorder: any; + let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-blob/test/node/blockblobclient.spec.ts b/sdk/storage/storage-blob/test/node/blockblobclient.spec.ts index 5ec6b90eb675..a74755cc20f6 100644 --- a/sdk/storage/storage-blob/test/node/blockblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/blockblobclient.spec.ts @@ -4,31 +4,32 @@ import { bodyToString, getBSU, getConnectionStringFromEnvironment, - setupEnvironment + recorderEnvSetup } from "../utils"; import { BlockBlobClient, newPipeline, StorageSharedKeyCredential, BlobClient, - ContainerClient + ContainerClient, + BlobServiceClient } from "../../src"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; -import { record } from "@azure/test-utils-recorder"; +import { record, Recorder } from "@azure/test-utils-recorder"; describe("BlockBlobClient Node.js only", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; let blobClient: BlobClient; let blockBlobClient: BlockBlobClient; - let recorder: any; + let recorder: Recorder; + let blobServiceClient: BlobServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/node/containerclient.spec.ts b/sdk/storage/storage-blob/test/node/containerclient.spec.ts index 48525eee9584..26f49d1f45ec 100644 --- a/sdk/storage/storage-blob/test/node/containerclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/containerclient.spec.ts @@ -1,26 +1,27 @@ import * as assert from "assert"; -import { getBSU, getConnectionStringFromEnvironment, setupEnvironment } from "../utils"; +import { getBSU, getConnectionStringFromEnvironment, recorderEnvSetup } from "../utils"; import { PublicAccessType } from "../../src/generated/src/models/index"; import { ContainerClient, newPipeline, StorageSharedKeyCredential, - ContainerSASPermissions + ContainerSASPermissions, + BlobServiceClient } from "../../src"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; import { record } from "@azure/test-utils-recorder"; describe("ContainerClient Node.js only", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let recorder: any; + let blobServiceClient: BlobServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/node/emulator-tests.spec.ts b/sdk/storage/storage-blob/test/node/emulator-tests.spec.ts index 0b5c4f36eab7..29c4730d326b 100644 --- a/sdk/storage/storage-blob/test/node/emulator-tests.spec.ts +++ b/sdk/storage/storage-blob/test/node/emulator-tests.spec.ts @@ -14,7 +14,7 @@ dotenv.config({ path: "../.env" }); // Expected environment variable to run this test-suite // STORAGE_CONNECTION_STRING=UseDevelopmentStorage=true describe("Emulator Tests", () => { - const blobServiceClient = getBSU(); + let blobServiceClient: BlobServiceClient; let containerName: string; let blobName: string; let containerClient: ContainerClient; @@ -26,6 +26,7 @@ describe("Emulator Tests", () => { if (!env.STORAGE_CONNECTION_STRING.startsWith("UseDevelopmentStorage=true")) { this.skip(); } + blobServiceClient = getBSU(); containerName = getUniqueName("container"); blobName = getUniqueName("blob"); containerClient = blobServiceClient.getContainerClient(containerName); diff --git a/sdk/storage/storage-blob/test/node/highlevel.node.spec.ts b/sdk/storage/storage-blob/test/node/highlevel.node.spec.ts index e38d55446743..d436dfefa812 100644 --- a/sdk/storage/storage-blob/test/node/highlevel.node.spec.ts +++ b/sdk/storage/storage-blob/test/node/highlevel.node.spec.ts @@ -4,16 +4,14 @@ import * as path from "path"; import { PassThrough } from "stream"; import { AbortController } from "@azure/abort-controller"; -import { createRandomLocalFile, getBSU, setupEnvironment } from "../utils"; +import { createRandomLocalFile, getBSU, recorderEnvSetup } from "../utils"; import { RetriableReadableStreamOptions } from "../../src/utils/RetriableReadableStream"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { ContainerClient, BlobClient, BlockBlobClient } from "../../src"; +import { ContainerClient, BlobClient, BlockBlobClient, BlobServiceClient } from "../../src"; import { readStreamToLocalFileWithLogs } from "../../test/utils/testutils.node"; // tslint:disable:no-empty describe("Highlevel", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -28,8 +26,10 @@ describe("Highlevel", () => { let recorder: Recorder; + let blobServiceClient: BlobServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); @@ -44,7 +44,7 @@ describe("Highlevel", () => { }); before(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); if (!fs.existsSync(tempFolderPath)) { fs.mkdirSync(tempFolderPath); } @@ -56,7 +56,7 @@ describe("Highlevel", () => { }); after(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); fs.unlinkSync(tempFileLarge); fs.unlinkSync(tempFileSmall); recorder.stop(); diff --git a/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts b/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts index cbcd691a4c96..3eaa0da83f68 100644 --- a/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts @@ -1,6 +1,11 @@ import * as assert from "assert"; -import { getBSU, getConnectionStringFromEnvironment, bodyToString, setupEnvironment } from "../utils"; +import { + getBSU, + getConnectionStringFromEnvironment, + bodyToString, + recorderEnvSetup +} from "../utils"; import { newPipeline, PageBlobClient, @@ -8,7 +13,8 @@ import { ContainerClient, BlobClient, generateBlobSASQueryParameters, - BlobSASPermissions + BlobSASPermissions, + BlobServiceClient } from "../../src"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; @@ -16,8 +22,6 @@ import { record, delay } from "@azure/test-utils-recorder"; import { Test_CPK_INFO } from "../utils/constants"; describe("PageBlobClient Node.js only", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -26,8 +30,10 @@ describe("PageBlobClient Node.js only", () => { let recorder: any; + let blobServiceClient: BlobServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); @@ -85,13 +91,15 @@ describe("PageBlobClient Node.js only", () => { await waitForCopy(); - let listBlobResponse = (await containerClient - .listBlobsFlat({ - includeCopy: true, - includeSnapshots: true - }) - .byPage() - .next()).value; + let listBlobResponse = ( + await containerClient + .listBlobsFlat({ + includeCopy: true, + includeSnapshots: true + }) + .byPage() + .next() + ).value; assert.equal(listBlobResponse.segment.blobItems.length, 4); @@ -103,13 +111,15 @@ describe("PageBlobClient Node.js only", () => { await waitForCopy(); - listBlobResponse = (await containerClient - .listBlobsFlat({ - includeCopy: true, - includeSnapshots: true - }) - .byPage() - .next()).value; + listBlobResponse = ( + await containerClient + .listBlobsFlat({ + includeCopy: true, + includeSnapshots: true + }) + .byPage() + .next() + ).value; assert.equal(listBlobResponse.segment.blobItems.length, 6); diff --git a/sdk/storage/storage-blob/test/node/sas.spec.ts b/sdk/storage/storage-blob/test/node/sas.spec.ts index 37c8d0860e07..de9a3e4d01d2 100644 --- a/sdk/storage/storage-blob/test/node/sas.spec.ts +++ b/sdk/storage/storage-blob/test/node/sas.spec.ts @@ -16,17 +16,16 @@ import { newPipeline } from "../../src"; import { SASProtocol } from "../../src/SASQueryParameters"; -import { getBSU, getTokenBSU, setupEnvironment } from "../utils"; +import { getBSU, getTokenBSU, recorderEnvSetup } from "../utils"; import { record } from "@azure/test-utils-recorder"; describe("Shared Access Signature (SAS) generation Node.js only", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); - let recorder: any; - beforeEach(function() { - recorder = record(this); + let blobServiceClient: BlobServiceClient; + beforeEach(async function() { + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); }); afterEach(function() { @@ -206,10 +205,12 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { newPipeline(new AnonymousCredential()) ); - (await containerClientwithSAS - .listBlobsFlat() - .byPage() - .next()).value; + ( + await containerClientwithSAS + .listBlobsFlat() + .byPage() + .next() + ).value; await containerClient.delete(); }); @@ -530,10 +531,12 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { newPipeline(new AnonymousCredential()) ); - (await containerClientwithSAS - .listBlobsFlat() - .byPage() - .next()).value; + ( + await containerClientwithSAS + .listBlobsFlat() + .byPage() + .next() + ).value; await containerClient.delete(); }); @@ -582,10 +585,12 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { newPipeline(new AnonymousCredential()) ); - (await containerClientwithSAS - .listBlobsFlat() - .byPage() - .next()).value; + ( + await containerClientwithSAS + .listBlobsFlat() + .byPage() + .next() + ).value; await containerClient.delete(); }); diff --git a/sdk/storage/storage-blob/test/node/utils.spec.ts b/sdk/storage/storage-blob/test/node/utils.spec.ts index 1ea629b33a30..38935b9a6bfa 100644 --- a/sdk/storage/storage-blob/test/node/utils.spec.ts +++ b/sdk/storage/storage-blob/test/node/utils.spec.ts @@ -6,11 +6,10 @@ import { extractConnectionStringParts } from "../../src/utils/utils.common"; import { Readable, ReadableOptions } from "stream"; import { readStreamToLocalFile } from "../../src/utils/utils.node"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "../utils"; +import { recorderEnvSetup } from "../utils"; dotenv.config({ path: "../.env" }); describe("Utility Helpers Node.js only", () => { - setupEnvironment(); let recorder: Recorder; const protocol = "https"; const endpointSuffix = "core.windows.net"; @@ -38,7 +37,7 @@ describe("Utility Helpers Node.js only", () => { } beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(function() { diff --git a/sdk/storage/storage-blob/test/pageblobclient.spec.ts b/sdk/storage/storage-blob/test/pageblobclient.spec.ts index bd54315a631d..47f40a99b12b 100644 --- a/sdk/storage/storage-blob/test/pageblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/pageblobclient.spec.ts @@ -4,15 +4,20 @@ import { bodyToString, getBSU, getSASConnectionStringFromEnvironment, - setupEnvironment + recorderEnvSetup } from "./utils"; -import { ContainerClient, BlobClient, PageBlobClient, PremiumPageBlobTier } from "../src"; +import { + ContainerClient, + BlobClient, + PageBlobClient, + PremiumPageBlobTier, + BlobServiceClient +} from "../src"; import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("PageBlobClient", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); + let blobServiceClient: BlobServiceClient; let containerName: string; let containerClient: ContainerClient; let blobName: string; @@ -22,7 +27,8 @@ describe("PageBlobClient", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/retrypolicy.spec.ts b/sdk/storage/storage-blob/test/retrypolicy.spec.ts index 4d17cf72a9ce..9c76711ad429 100644 --- a/sdk/storage/storage-blob/test/retrypolicy.spec.ts +++ b/sdk/storage/storage-blob/test/retrypolicy.spec.ts @@ -3,24 +3,24 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { AbortController } from "@azure/abort-controller"; -import { ContainerClient, RestError } from "../src"; +import { ContainerClient, RestError, BlobServiceClient } from "../src"; import { newPipeline, Pipeline } from "../src/Pipeline"; -import { getBSU, setupEnvironment } from "./utils"; +import { getBSU, recorderEnvSetup } from "./utils"; import { InjectorPolicyFactory } from "./utils/InjectorPolicyFactory"; import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("RetryPolicy", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); + let blobServiceClient: BlobServiceClient; let containerName: string; let containerClient: ContainerClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("container"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); diff --git a/sdk/storage/storage-blob/test/specialnaming.spec.ts b/sdk/storage/storage-blob/test/specialnaming.spec.ts index 758c97567298..6fedf362ab03 100644 --- a/sdk/storage/storage-blob/test/specialnaming.spec.ts +++ b/sdk/storage/storage-blob/test/specialnaming.spec.ts @@ -1,5 +1,5 @@ -import { BlockBlobClient } from "../src"; -import { getBSU, setupEnvironment } from "./utils/index"; +import { BlockBlobClient, BlobServiceClient } from "../src"; +import { getBSU, recorderEnvSetup } from "./utils/index"; import * as assert from "assert"; import { appendToURLPath } from "../src/utils/utils.common"; import { record, Recorder } from "@azure/test-utils-recorder"; @@ -8,46 +8,38 @@ import { ContainerClient } from "../src"; dotenv.config({ path: "../.env" }); describe("Special Naming Tests", () => { - setupEnvironment(); - const blobServiceClient = getBSU(); let containerName: string; let containerClient: ContainerClient; let recorder: Recorder; - before(async function() { - recorder = record(this); + let blobServiceClient: BlobServiceClient; + beforeEach(async function() { + recorder = record(this, recorderEnvSetup); + blobServiceClient = getBSU(); containerName = recorder.getUniqueName("1container-with-dash"); containerClient = blobServiceClient.getContainerClient(containerName); await containerClient.create(); - recorder.stop(); }); - after(async function() { - recorder = record(this); + afterEach(async function() { await containerClient.delete(); recorder.stop(); }); - beforeEach(function() { - recorder = record(this); - }); - - afterEach(function() { - recorder.stop(); - }); - it("Should work with special container and blob names with spaces", async () => { const blobName: string = recorder.getUniqueName("blob empty"); const blockBlobClient = containerClient.getBlockBlobClient(blobName); await blockBlobClient.upload("A", 1); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -60,12 +52,14 @@ describe("Special Naming Tests", () => { ); await blockBlobClient.upload("A", 1); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -76,12 +70,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -95,12 +91,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -111,12 +109,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -130,12 +130,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -146,12 +148,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -165,12 +169,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -183,13 +189,15 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - // NOTICE: Azure Storage Server will replace "\" with "/" in the blob names - prefix: blobName.replace(/\\/g, "/") - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + // NOTICE: Azure Storage Server will replace "\" with "/" in the blob names + prefix: blobName.replace(/\\/g, "/") + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -208,13 +216,15 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - // NOTICE: Azure Storage Server will replace "\" with "/" in the blob names - prefix: blobName.replace(/\\/g, "/") - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + // NOTICE: Azure Storage Server will replace "\" with "/" in the blob names + prefix: blobName.replace(/\\/g, "/") + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -226,12 +236,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobNameEncoded - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobNameEncoded + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -242,12 +254,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -261,12 +275,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -278,12 +294,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobNameEncoded - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobNameEncoded + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -294,12 +312,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -313,12 +333,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -330,12 +352,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobNameEncoded - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobNameEncoded + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -346,12 +370,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); @@ -365,12 +391,14 @@ describe("Special Naming Tests", () => { await blockBlobClient.upload("A", 1); await blockBlobClient.getProperties(); - const response = (await containerClient - .listBlobsFlat({ - prefix: blobName - }) - .byPage() - .next()).value; + const response = ( + await containerClient + .listBlobsFlat({ + prefix: blobName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.blobItems.length, 0); }); diff --git a/sdk/storage/storage-blob/test/utils.spec.ts b/sdk/storage/storage-blob/test/utils.spec.ts index eecf6f54e113..fe9be239297e 100644 --- a/sdk/storage/storage-blob/test/utils.spec.ts +++ b/sdk/storage/storage-blob/test/utils.spec.ts @@ -7,11 +7,11 @@ import { extractConnectionStringParts } from "../src/utils/utils.common"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "./utils"; +import { recorderEnvSetup } from "./utils"; dotenv.config({ path: "../.env" }); describe("Utility Helpers", () => { - setupEnvironment(); + let recorder: Recorder; const protocol = "https"; const endpointSuffix = "core.windows.net"; @@ -34,7 +34,7 @@ describe("Utility Helpers", () => { } beforeEach(function() { - recorder = record(this); + recorder = record(this,recorderEnvSetup); }); afterEach(function() { diff --git a/sdk/storage/storage-blob/test/utils/testutils.common.ts b/sdk/storage/storage-blob/test/utils/testutils.common.ts index 6a5e71afe8d7..99db9cf4748f 100644 --- a/sdk/storage/storage-blob/test/utils/testutils.common.ts +++ b/sdk/storage/storage-blob/test/utils/testutils.common.ts @@ -1,43 +1,49 @@ import { padStart } from "../../src/utils/utils.common"; import { TokenCredential, GetTokenOptions, AccessToken } from "@azure/core-http"; -import { - isPlaybackMode, - setReplaceableVariables, - skipQueryParams, - env, - setReplacements -} from "@azure/test-utils-recorder"; +import { isPlaybackMode, env, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; export const testPollerProperties = { intervalInMs: isPlaybackMode() ? 0 : undefined }; -export function setupEnvironment() { - // setReplaceableVariables() - // 1. The key-value pairs will be used as the environment variables in playback - // 2. If the env variales are present in the recordings as plain strings, they will be replaced with the provided values - setReplaceableVariables({ - // Providing dummy values - ACCOUNT_NAME: "fakestorageaccount", - ACCOUNT_KEY: "aaaaa", - ACCOUNT_SAS: "aaaaa", - STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${env.ACCOUNT_NAME};AccountKey=${env.ACCOUNT_KEY};EndpointSuffix=core.windows.net`, +const mockAccountName = "fakestorageaccount"; +const mockAccountKey = "aaaaa"; +export const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + // Used in record and playback modes + // 1. The key-value pairs will be used as the environment variables in playback mode + // 2. If the env variales are present in the recordings as plain strings, they will be replaced with the provided values in record mode + ACCOUNT_NAME: `${mockAccountName}`, + ACCOUNT_KEY: `${mockAccountKey}`, + ACCOUNT_SAS: `${mockAccountKey}`, + STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${mockAccountName};AccountKey=${mockAccountKey};EndpointSuffix=core.windows.net`, // Comment following line to skip user delegation key/SAS related cases in record and play // which depends on this environment variable - ACCOUNT_TOKEN: "aaaaa" - }); - - // Array of callback functions can be passed to `setReplacements` to customize the generated recordings - // `sig` param of SAS Token is being filtered here - setReplacements([ + ACCOUNT_TOKEN: `${mockAccountKey}` + }, + replaceInRecordings: [ + // Used in record mode + // Array of callback functions can be provided to customize the generated recordings in record mode + // `sig` param of SAS Token is being filtered here (recording: string): string => - recording.replace(new RegExp(env.ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), "aaaaa") - ]); - + recording.replace( + new RegExp(env.ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), + `${mockAccountKey}` + ) + ], // SAS token may contain sensitive information - // skipQueryParams() method will filter out the plain parameter info from the recordings - skipQueryParams(["se", "sig", "sp", "spr", "srt", "ss", "st", "sv"]); -} + queryParametersToSkip: [ + // Used in record and playback modes + "se", + "sig", + "sp", + "spr", + "srt", + "ss", + "st", + "sv" + ] +}; /** * A TokenCredential that always returns the given token. This class can be diff --git a/sdk/storage/storage-file-datalake/test/aborter.spec.ts b/sdk/storage/storage-file-datalake/test/aborter.spec.ts index c30334e7011f..4d326203bd46 100644 --- a/sdk/storage/storage-file-datalake/test/aborter.spec.ts +++ b/sdk/storage/storage-file-datalake/test/aborter.spec.ts @@ -2,22 +2,21 @@ import * as assert from "assert"; import { AbortController, AbortSignal } from "@azure/abort-controller"; import { DataLakeFileSystemClient } from "../src"; -import { getDataLakeServiceClient, setupEnvironment } from "./utils"; +import { getDataLakeServiceClient, recorderEnvSetup } from "./utils"; import { record, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; dotenv.config({ path: "../.env" }); // tslint:disable:no-empty describe("Aborter", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("container"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); }); diff --git a/sdk/storage/storage-file-datalake/test/filesystemclient.spec.ts b/sdk/storage/storage-file-datalake/test/filesystemclient.spec.ts index c6f3b6cbe2de..9995d97d375c 100644 --- a/sdk/storage/storage-file-datalake/test/filesystemclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/filesystemclient.spec.ts @@ -3,22 +3,26 @@ import { record, Recorder } from "@azure/test-utils-recorder"; import * as assert from "assert"; import * as dotenv from "dotenv"; -import { DataLakeFileSystemClient, FileSystemListPathsResponse } from "../src"; -import { getDataLakeServiceClient, setupEnvironment } from "./utils"; +import { + DataLakeFileSystemClient, + FileSystemListPathsResponse, + DataLakeServiceClient +} from "../src"; +import { getDataLakeServiceClient, recorderEnvSetup } from "./utils"; import { URLBuilder } from "@azure/core-http"; dotenv.config({ path: "../.env" }); describe("DataLakeFileSystemClient", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let recorder: Recorder; + let serviceClient: DataLakeServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("filesystem"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); diff --git a/sdk/storage/storage-file-datalake/test/leaseclient.spec.ts b/sdk/storage/storage-file-datalake/test/leaseclient.spec.ts index 6ac1ec141aaf..3999505d9752 100644 --- a/sdk/storage/storage-file-datalake/test/leaseclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/leaseclient.spec.ts @@ -3,20 +3,19 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { DataLakeFileClient, DataLakeDirectoryClient, DataLakeFileSystemClient } from "../src"; -import { getDataLakeServiceClient, setupEnvironment } from "./utils"; +import { getDataLakeServiceClient, recorderEnvSetup } from "./utils"; dotenv.config({ path: "../.env" }); describe("LeaseClient from FileSystem", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("filesystem"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); @@ -140,7 +139,6 @@ describe("LeaseClient from FileSystem", () => { }); describe("LeaseClient from File", () => { - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let fileName: string; @@ -148,7 +146,8 @@ describe("LeaseClient from File", () => { let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("filesystem"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); @@ -263,7 +262,6 @@ describe("LeaseClient from File", () => { }); describe("LeaseClient from Directory", () => { - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let directoryName: string; @@ -271,7 +269,8 @@ describe("LeaseClient from Directory", () => { let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("filesystem"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); diff --git a/sdk/storage/storage-file-datalake/test/node/filesystemclient.spec.ts b/sdk/storage/storage-file-datalake/test/node/filesystemclient.spec.ts index 13dad64a1555..4cb9bda7f332 100644 --- a/sdk/storage/storage-file-datalake/test/node/filesystemclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/node/filesystemclient.spec.ts @@ -2,20 +2,24 @@ import { TokenCredential } from "@azure/core-http"; import { record } from "@azure/test-utils-recorder"; import * as assert from "assert"; -import { DataLakeFileSystemClient, FileSystemSASPermissions, newPipeline, StorageSharedKeyCredential } from "../../src"; +import { + DataLakeFileSystemClient, + FileSystemSASPermissions, + newPipeline, + StorageSharedKeyCredential +} from "../../src"; import { PublicAccessType } from "../../src/models"; -import { getDataLakeServiceClient, setupEnvironment } from "../utils"; +import { getDataLakeServiceClient, recorderEnvSetup } from "../utils"; import { assertClientUsesTokenCredential } from "../utils/assert"; describe("DataLakeFileSystemClient Node.js only", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("filesystem"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); diff --git a/sdk/storage/storage-file-datalake/test/node/pathclient.spec.ts b/sdk/storage/storage-file-datalake/test/node/pathclient.spec.ts index fe60f3e07d01..f73cee78fab7 100644 --- a/sdk/storage/storage-file-datalake/test/node/pathclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/node/pathclient.spec.ts @@ -2,25 +2,30 @@ import { record } from "@azure/test-utils-recorder"; import * as assert from "assert"; import * as dotenv from "dotenv"; -import { DataLakeFileClient, DataLakeFileSystemClient, PathAccessControlItem } from "../../src"; +import { + DataLakeFileClient, + DataLakeFileSystemClient, + PathAccessControlItem, + DataLakeServiceClient +} from "../../src"; import { PathPermissions } from "../../src/models"; -import { getDataLakeServiceClient, setupEnvironment } from "../utils"; +import { getDataLakeServiceClient, recorderEnvSetup } from "../utils"; dotenv.config({ path: "../.env" }); describe("DataLakePathClient Node.js only", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let fileName: string; let fileClient: DataLakeFileClient; const content = "Hello World"; + let serviceClient: DataLakeServiceClient; let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("filesystem"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); diff --git a/sdk/storage/storage-file-datalake/test/node/sas.spec.ts b/sdk/storage/storage-file-datalake/test/node/sas.spec.ts index de24a1b5336b..1ee2ec96c7d5 100644 --- a/sdk/storage/storage-file-datalake/test/node/sas.spec.ts +++ b/sdk/storage/storage-file-datalake/test/node/sas.spec.ts @@ -1,4 +1,4 @@ -import { record } from "@azure/test-utils-recorder"; +import { record, Recorder } from "@azure/test-utils-recorder"; import * as assert from "assert"; import { @@ -13,20 +13,23 @@ import { generateAccountSASQueryParameters, generateDataLakeSASQueryParameters, newPipeline, - StorageSharedKeyCredential, + StorageSharedKeyCredential } from "../../src"; import { DataLakeFileClient } from "../../src/"; import { SASProtocol } from "../../src/SASQueryParameters"; -import { getDataLakeServiceClient, getTokenDataLakeServiceClient, setupEnvironment } from "../utils"; +import { + getDataLakeServiceClient, + getTokenDataLakeServiceClient, + recorderEnvSetup +} from "../utils"; describe("Shared Access Signature (SAS) generation Node.js only", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); - - let recorder: any; + let recorder: Recorder; + let serviceClient: DataLakeServiceClient; beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + serviceClient = getDataLakeServiceClient(); }); afterEach(function() { diff --git a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts index fc9d75c7e1fe..524d2bd9acef 100644 --- a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts @@ -7,13 +7,11 @@ import * as dotenv from "dotenv"; import { DataLakeFileClient, DataLakeFileSystemClient } from "../src"; import { toPermissionsString } from "../src/transforms"; -import { bodyToString, getDataLakeServiceClient, setupEnvironment } from "./utils"; +import { bodyToString, getDataLakeServiceClient, recorderEnvSetup } from "./utils"; dotenv.config({ path: "../.env" }); describe("DataLakePathClient", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let fileName: string; @@ -23,7 +21,8 @@ describe("DataLakePathClient", () => { let recorder: any; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("filesystem"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); diff --git a/sdk/storage/storage-file-datalake/test/retrypolicy.spec.ts b/sdk/storage/storage-file-datalake/test/retrypolicy.spec.ts index 0fe5991cef4f..c562c4590d38 100644 --- a/sdk/storage/storage-file-datalake/test/retrypolicy.spec.ts +++ b/sdk/storage/storage-file-datalake/test/retrypolicy.spec.ts @@ -3,24 +3,23 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { AbortController } from "@azure/abort-controller"; -import { DataLakeFileSystemClient, RestError } from "../src"; +import { DataLakeFileSystemClient, RestError, DataLakeServiceClient } from "../src"; import { newPipeline, Pipeline } from "../src/Pipeline"; -import { getDataLakeServiceClient, setupEnvironment } from "./utils"; +import { getDataLakeServiceClient, recorderEnvSetup } from "./utils"; import { InjectorPolicyFactory } from "./utils/InjectorPolicyFactory"; import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("RetryPolicy", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let dataLakeFileSystemClient: DataLakeFileSystemClient; let recorder: Recorder; - + let serviceClient: DataLakeServiceClient; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("container"); dataLakeFileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await dataLakeFileSystemClient.create(); @@ -42,7 +41,10 @@ describe("RetryPolicy", () => { const factories = (dataLakeFileSystemClient as any).pipeline.factories.slice(); // clone factories array factories.push(injector); const pipeline = new Pipeline(factories); - const injectContainerClient = new DataLakeFileSystemClient(dataLakeFileSystemClient.url, pipeline); + const injectContainerClient = new DataLakeFileSystemClient( + dataLakeFileSystemClient.url, + pipeline + ); const metadata = { key0: "val0", @@ -67,7 +69,10 @@ describe("RetryPolicy", () => { const factories = (dataLakeFileSystemClient as any).pipeline.factories.slice(); // clone factories array factories.push(injector); const pipeline = new Pipeline(factories); - const injectContainerClient = new DataLakeFileSystemClient(dataLakeFileSystemClient.url, pipeline); + const injectContainerClient = new DataLakeFileSystemClient( + dataLakeFileSystemClient.url, + pipeline + ); const metadata = { key0: "val0", @@ -101,7 +106,10 @@ describe("RetryPolicy", () => { }).factories; factories.push(injector); const pipeline = new Pipeline(factories); - const injectContainerClient = new DataLakeFileSystemClient(dataLakeFileSystemClient.url, pipeline); + const injectContainerClient = new DataLakeFileSystemClient( + dataLakeFileSystemClient.url, + pipeline + ); let hasError = false; try { @@ -142,7 +150,10 @@ describe("RetryPolicy", () => { }).factories; factories.push(injector); const pipeline = new Pipeline(factories); - const injectContainerClient = new DataLakeFileSystemClient(dataLakeFileSystemClient.url, pipeline); + const injectContainerClient = new DataLakeFileSystemClient( + dataLakeFileSystemClient.url, + pipeline + ); let finalRequestURL = ""; try { diff --git a/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts b/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts index 236d06524586..952b2e22c4cf 100644 --- a/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts @@ -3,16 +3,15 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { DataLakeServiceClient, ServiceListFileSystemsSegmentResponse } from "../src"; -import { getDataLakeServiceClient, getTokenDataLakeServiceClient, setupEnvironment } from "./utils"; +import { getDataLakeServiceClient, getTokenDataLakeServiceClient, recorderEnvSetup } from "./utils"; dotenv.config({ path: "../.env" }); describe("DataLakeServiceClient", () => { - setupEnvironment(); let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-file-datalake/test/specialnaming.spec.ts b/sdk/storage/storage-file-datalake/test/specialnaming.spec.ts index ab9892fc1f52..110d34dba843 100644 --- a/sdk/storage/storage-file-datalake/test/specialnaming.spec.ts +++ b/sdk/storage/storage-file-datalake/test/specialnaming.spec.ts @@ -5,25 +5,20 @@ import * as dotenv from "dotenv"; import { DataLakeFileClient, DataLakeFileSystemClient } from "../src"; import { appendToURLPath } from "../src/utils/utils.common"; -import { getDataLakeServiceClient, setupEnvironment } from "./utils"; +import { getDataLakeServiceClient, recorderEnvSetup } from "./utils"; // import { appendToURLPath } from "../src/utils/utils.common"; dotenv.config({ path: "../.env" }); describe("Special Naming Tests", () => { - setupEnvironment(); - const serviceClient = getDataLakeServiceClient(); let fileSystemName: string; let fileSystemClient: DataLakeFileSystemClient; let recorder: Recorder; - before(async function() {}); - - after(async function() {}); - beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getDataLakeServiceClient(); fileSystemName = recorder.getUniqueName("1container-with-dash"); fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); await fileSystemClient.create(); diff --git a/sdk/storage/storage-file-datalake/test/utils.spec.ts b/sdk/storage/storage-file-datalake/test/utils.spec.ts index eecf6f54e113..fe9be239297e 100644 --- a/sdk/storage/storage-file-datalake/test/utils.spec.ts +++ b/sdk/storage/storage-file-datalake/test/utils.spec.ts @@ -7,11 +7,11 @@ import { extractConnectionStringParts } from "../src/utils/utils.common"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "./utils"; +import { recorderEnvSetup } from "./utils"; dotenv.config({ path: "../.env" }); describe("Utility Helpers", () => { - setupEnvironment(); + let recorder: Recorder; const protocol = "https"; const endpointSuffix = "core.windows.net"; @@ -34,7 +34,7 @@ describe("Utility Helpers", () => { } beforeEach(function() { - recorder = record(this); + recorder = record(this,recorderEnvSetup); }); afterEach(function() { diff --git a/sdk/storage/storage-file-datalake/test/utils/testutils.common.ts b/sdk/storage/storage-file-datalake/test/utils/testutils.common.ts index f53b33489fff..50b7ea9f253c 100644 --- a/sdk/storage/storage-file-datalake/test/utils/testutils.common.ts +++ b/sdk/storage/storage-file-datalake/test/utils/testutils.common.ts @@ -1,11 +1,5 @@ import { AccessToken, GetTokenOptions, TokenCredential } from "@azure/core-http"; -import { - env, - isPlaybackMode, - setReplaceableVariables, - setReplacements, - skipQueryParams, -} from "@azure/test-utils-recorder"; +import { env, isPlaybackMode, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; import { padStart } from "../../src/utils/utils.common"; @@ -13,32 +7,44 @@ export const testPollerProperties = { intervalInMs: isPlaybackMode() ? 0 : undefined }; -export function setupEnvironment() { - // setReplaceableVariables() - // 1. The key-value pairs will be used as the environment variables in playback - // 2. If the env variables are present in the recordings as plain strings, they will be replaced with the provided values - setReplaceableVariables({ - // Providing dummy values - DFS_ACCOUNT_NAME: "fakestorageaccount", - DFS_ACCOUNT_KEY: "aaaaa", - DFS_ACCOUNT_SAS: "aaaaa", - DFS_STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${env.ACCOUNT_NAME};AccountKey=${env.ACCOUNT_KEY};EndpointSuffix=core.windows.net`, +const mockAccountName = "fakestorageaccount"; +const mockAccountKey = "aaaaa"; +export const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + // Used in record and playback modes + // 1. The key-value pairs will be used as the environment variables in playback mode + // 2. If the env variales are present in the recordings as plain strings, they will be replaced with the provided values in record mode + DFS_ACCOUNT_NAME: `${mockAccountName}`, + DFS_ACCOUNT_KEY: `${mockAccountKey}`, + DFS_ACCOUNT_SAS: `${mockAccountKey}`, + DFS_STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${mockAccountName};AccountKey=${mockAccountKey};EndpointSuffix=core.windows.net`, // Comment following line to skip user delegation key/SAS related cases in record and play // which depends on this environment variable - DFS_ACCOUNT_TOKEN: "aaaaa" - }); - - // Array of callback functions can be passed to `setReplacements` to customize the generated recordings - // `sig` param of SAS Token is being filtered here - setReplacements([ + DFS_ACCOUNT_TOKEN: `${mockAccountKey}` + }, + replaceInRecordings: [ + // Used in record mode + // Array of callback functions can be provided to customize the generated recordings in record mode + // `sig` param of SAS Token is being filtered here (recording: string): string => - recording.replace(new RegExp(env.DFS_ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), "aaaaa") - ]); - + recording.replace( + new RegExp(env.DFS_ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), + `${mockAccountKey}` + ) + ], // SAS token may contain sensitive information - // skipQueryParams() method will filter out the plain parameter info from the recordings - skipQueryParams(["se", "sig", "sp", "spr", "srt", "ss", "st", "sv"]); -} + queryParametersToSkip: [ + // Used in record and playback modes + "se", + "sig", + "sp", + "spr", + "srt", + "ss", + "st", + "sv" + ] +}; /** * A TokenCredential that always returns the given token. This class can be diff --git a/sdk/storage/storage-file-share/test/aborter.spec.ts b/sdk/storage/storage-file-share/test/aborter.spec.ts index 95f6a255fbc8..0c2c169ebca7 100644 --- a/sdk/storage/storage-file-share/test/aborter.spec.ts +++ b/sdk/storage/storage-file-share/test/aborter.spec.ts @@ -1,7 +1,7 @@ import * as assert from "assert"; import { AbortController } from "@azure/abort-controller"; -import { getBSU, setupEnvironment } from "./utils"; +import { getBSU, recorderEnvSetup } from "./utils"; import { record, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; import { ShareClient } from "../src"; @@ -9,15 +9,14 @@ dotenv.config({ path: "../.env" }); // tslint:disable:no-empty describe("Aborter", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); }); diff --git a/sdk/storage/storage-file-share/test/directoryclient.spec.ts b/sdk/storage/storage-file-share/test/directoryclient.spec.ts index e38710731813..d2b52c56960e 100644 --- a/sdk/storage/storage-file-share/test/directoryclient.spec.ts +++ b/sdk/storage/storage-file-share/test/directoryclient.spec.ts @@ -1,5 +1,5 @@ import * as assert from "assert"; -import { getBSU, setupEnvironment } from "./utils"; +import { getBSU, recorderEnvSetup } from "./utils"; import * as dotenv from "dotenv"; import { ShareClient, ShareDirectoryClient, FileSystemAttributes } from "../src"; import { record, Recorder } from "@azure/test-utils-recorder"; @@ -10,8 +10,6 @@ import { URLBuilder } from "@azure/core-http"; dotenv.config({ path: "../.env" }); describe("DirectoryClient", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let dirName: string; @@ -29,7 +27,8 @@ describe("DirectoryClient", () => { fullDirAttributes.noScrubData = true; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/fileclient.spec.ts b/sdk/storage/storage-file-share/test/fileclient.spec.ts index cda168c55cb3..baf8a7f2decb 100644 --- a/sdk/storage/storage-file-share/test/fileclient.spec.ts +++ b/sdk/storage/storage-file-share/test/fileclient.spec.ts @@ -5,7 +5,7 @@ import { AbortController } from "@azure/abort-controller"; import { record, delay, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; import { ShareClient, ShareDirectoryClient, ShareFileClient } from "../src"; -import { getBSU, bodyToString, setupEnvironment } from "./utils"; +import { getBSU, bodyToString, recorderEnvSetup } from "./utils"; import { DirectoryCreateResponse } from "../src/generated/src/models"; import { FileSystemAttributes } from "../src/FileSystemAttributes"; import { truncatedISO8061Date } from "../src/utils/utils.common"; @@ -13,8 +13,6 @@ import { truncatedISO8061Date } from "../src/utils/utils.common"; dotenv.config({ path: "../.env" }); describe("FileClient", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let dirName: string; @@ -37,7 +35,8 @@ describe("FileClient", () => { fullFileAttributes.noScrubData = true; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts b/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts index b3a6161c0b4f..3d35da16d84e 100644 --- a/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts +++ b/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts @@ -1,30 +1,31 @@ import * as assert from "assert"; -import { getBSU, getSASConnectionStringFromEnvironment, setupEnvironment } from "./utils"; +import { getBSU, getSASConnectionStringFromEnvironment, recorderEnvSetup } from "./utils"; import { record, delay, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; import { ShareServiceClient } from "../src"; dotenv.config({ path: "../.env" }); describe("FileServiceClient", () => { - setupEnvironment(); let recorder: Recorder; - beforeEach(function () { - recorder = record(this); + beforeEach(function() { + recorder = record(this, recorderEnvSetup); }); - afterEach(function () { + afterEach(function() { recorder.stop(); }); it("ListShares with default parameters", async () => { const serviceClient = getBSU(); - const result = (await serviceClient - .listShares() - .byPage() - .next()).value; + const result = ( + await serviceClient + .listShares() + .byPage() + .next() + ).value; assert.ok(typeof result.requestId); assert.ok(result.requestId!.length > 0); @@ -45,10 +46,12 @@ describe("FileServiceClient", () => { it("listShares with default parameters - empty prefix should not cause an error", async () => { const serviceClient = getBSU(); - const result = (await serviceClient - .listShares({ prefix: "" }) - .byPage() - .next()).value; + const result = ( + await serviceClient + .listShares({ prefix: "" }) + .byPage() + .next() + ).value; assert.ok(typeof result.requestId); assert.ok(result.requestId!.length > 0); @@ -99,14 +102,16 @@ describe("FileServiceClient", () => { assert.ok(result1.shareItems![0].properties.lastModified); assert.deepEqual(result1.shareItems![0].metadata!.key, "val"); - const result2 = (await serviceClient - .listShares({ - includeMetadata: true, - includeSnapshots: true, - prefix: shareNamePrefix - }) - .byPage({ continuationToken: result1.continuationToken, maxPageSize: 1 }) - .next()).value; + const result2 = ( + await serviceClient + .listShares({ + includeMetadata: true, + includeSnapshots: true, + prefix: shareNamePrefix + }) + .byPage({ continuationToken: result1.continuationToken, maxPageSize: 1 }) + .next() + ).value; assert.ok(!result2.continuationToken); assert.equal(result2.shareItems!.length, 1); diff --git a/sdk/storage/storage-file-share/test/node/directoryclient.spec.ts b/sdk/storage/storage-file-share/test/node/directoryclient.spec.ts index 676c418acd2e..6d53f88bc6c5 100644 --- a/sdk/storage/storage-file-share/test/node/directoryclient.spec.ts +++ b/sdk/storage/storage-file-share/test/node/directoryclient.spec.ts @@ -1,5 +1,5 @@ import * as assert from "assert"; -import { getBSU, setupEnvironment } from "../utils"; +import { getBSU, recorderEnvSetup } from "../utils"; import * as dotenv from "dotenv"; import { ShareDirectoryClient, @@ -11,8 +11,6 @@ import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("DirectoryClient Node.js only", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let dirName: string; @@ -21,7 +19,8 @@ describe("DirectoryClient Node.js only", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/node/fileclient.spec.ts b/sdk/storage/storage-file-share/test/node/fileclient.spec.ts index 5210144f7614..2f8c38aa0763 100644 --- a/sdk/storage/storage-file-share/test/node/fileclient.spec.ts +++ b/sdk/storage/storage-file-share/test/node/fileclient.spec.ts @@ -1,6 +1,6 @@ import * as assert from "assert"; import { Duplex } from "stream"; -import { bodyToString, getBSU, createRandomLocalFile, setupEnvironment } from "../utils"; +import { bodyToString, getBSU, createRandomLocalFile, recorderEnvSetup } from "../utils"; import { Buffer } from "buffer"; import { ShareFileClient, @@ -18,8 +18,6 @@ import { readStreamToLocalFileWithLogs } from "../../test/utils/testutils.node"; import { record, Recorder } from "@azure/test-utils-recorder"; describe("FileClient Node.js only", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let dirName: string; @@ -32,7 +30,8 @@ describe("FileClient Node.js only", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/node/fileserviceclient.spec.ts b/sdk/storage/storage-file-share/test/node/fileserviceclient.spec.ts index e2ce7d91c0c8..2faaf0afa42e 100644 --- a/sdk/storage/storage-file-share/test/node/fileserviceclient.spec.ts +++ b/sdk/storage/storage-file-share/test/node/fileserviceclient.spec.ts @@ -1,16 +1,15 @@ import * as assert from "assert"; -import { getBSU, getConnectionStringFromEnvironment, setupEnvironment } from "../utils"; +import { getBSU, getConnectionStringFromEnvironment, recorderEnvSetup } from "../utils"; import * as dotenv from "dotenv"; import { ShareServiceClient, newPipeline, StorageSharedKeyCredential } from "../../src"; import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("FileServiceClient Node.js only", () => { - setupEnvironment(); let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-file-share/test/node/highlevel.node.spec.ts b/sdk/storage/storage-file-share/test/node/highlevel.node.spec.ts index 3084229b3fdb..8878ba998b9e 100644 --- a/sdk/storage/storage-file-share/test/node/highlevel.node.spec.ts +++ b/sdk/storage/storage-file-share/test/node/highlevel.node.spec.ts @@ -3,7 +3,7 @@ import * as dotenv from "dotenv"; import * as fs from "fs"; import * as path from "path"; import { AbortController } from "@azure/abort-controller"; -import { createRandomLocalFile, getBSU, setupEnvironment } from "../utils"; +import { createRandomLocalFile, getBSU, recorderEnvSetup } from "../utils"; import { RetriableReadableStreamOptions } from "../../src/utils/RetriableReadableStream"; import { ShareClient, ShareDirectoryClient, ShareFileClient } from "../../src"; import { readStreamToLocalFileWithLogs } from "../../test/utils/testutils.node"; @@ -12,8 +12,6 @@ dotenv.config({ path: "../.env" }); // tslint:disable:no-empty describe("Highlevel Node.js only", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let dirName: string; @@ -30,7 +28,8 @@ describe("Highlevel Node.js only", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/node/sas.spec.ts b/sdk/storage/storage-file-share/test/node/sas.spec.ts index 57b3456a71cc..ea774bb73d05 100644 --- a/sdk/storage/storage-file-share/test/node/sas.spec.ts +++ b/sdk/storage/storage-file-share/test/node/sas.spec.ts @@ -16,17 +16,16 @@ import { generateFileSASQueryParameters } from "../../src/FileSASSignatureValues import { newPipeline } from "../../src/Pipeline"; import { ShareClient } from "../../src/ShareClient"; import { ShareSASPermissions } from "../../src/ShareSASPermissions"; -import { getBSU, setupEnvironment } from "../utils"; +import { getBSU, recorderEnvSetup } from "../utils"; import { record, Recorder } from "@azure/test-utils-recorder"; describe("Shared Access Signature (SAS) generation Node.js only", () => { - setupEnvironment(); - const serviceClient = getBSU(); - let recorder: Recorder; + let serviceClient: ShareServiceClient; beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + serviceClient = getBSU(); }); afterEach(function() { @@ -64,10 +63,12 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { newPipeline(new AnonymousCredential()) ); - (await serviceClientWithSAS - .listShares() - .byPage() - .next()).value; + ( + await serviceClientWithSAS + .listShares() + .byPage() + .next() + ).value; }); it("generateAccountSASQueryParameters should not work with invalid permission", async () => { @@ -201,10 +202,12 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const shareClientwithSAS = new ShareClient(sasURL); const dirURLwithSAS = shareClientwithSAS.getDirectoryClient(""); - (await dirURLwithSAS - .listFilesAndDirectories() - .byPage() - .next()).value; + ( + await dirURLwithSAS + .listFilesAndDirectories() + .byPage() + .next() + ).value; await shareClient.delete(); }); @@ -319,10 +322,12 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const shareClientwithSAS = new ShareClient(sasURL, newPipeline(new AnonymousCredential())); const dirClientwithSAS = shareClientwithSAS.getDirectoryClient(""); - (await dirClientwithSAS - .listFilesAndDirectories() - .byPage() - .next()).value; + ( + await dirClientwithSAS + .listFilesAndDirectories() + .byPage() + .next() + ).value; await shareClient.delete(); }); }); diff --git a/sdk/storage/storage-file-share/test/node/shareclient.spec.ts b/sdk/storage/storage-file-share/test/node/shareclient.spec.ts index 129b426fed9a..5307652a96de 100644 --- a/sdk/storage/storage-file-share/test/node/shareclient.spec.ts +++ b/sdk/storage/storage-file-share/test/node/shareclient.spec.ts @@ -1,18 +1,17 @@ import * as assert from "assert"; import { newPipeline, ShareClient, StorageSharedKeyCredential, SignedIdentifier } from "../../src"; -import { getBSU, getConnectionStringFromEnvironment, setupEnvironment } from "./../utils"; +import { getBSU, getConnectionStringFromEnvironment, recorderEnvSetup } from "./../utils"; import { record, Recorder } from "@azure/test-utils-recorder"; describe("ShareClient Node.js only", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/node/sharedkeycredentialpolicy.spec.ts b/sdk/storage/storage-file-share/test/node/sharedkeycredentialpolicy.spec.ts index 5ca77389c4c3..272d1ae06a2f 100644 --- a/sdk/storage/storage-file-share/test/node/sharedkeycredentialpolicy.spec.ts +++ b/sdk/storage/storage-file-share/test/node/sharedkeycredentialpolicy.spec.ts @@ -1,17 +1,16 @@ -import { getBSU, setupEnvironment } from "../utils"; +import { getBSU, recorderEnvSetup } from "../utils"; import { ShareClient } from "../../src"; import { Recorder, record } from "@azure/test-utils-recorder"; describe("StorageSharedKeyCredentialPolicy Node.js only", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let recorder: Recorder; before(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("1share-with-dash"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); @@ -19,13 +18,13 @@ describe("StorageSharedKeyCredentialPolicy Node.js only", () => { }); after(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); await shareClient.delete(); recorder.stop(); }); beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(function() { diff --git a/sdk/storage/storage-file-share/test/node/utils.spec.ts b/sdk/storage/storage-file-share/test/node/utils.spec.ts index 336e6e4cb88c..a95d772063b5 100644 --- a/sdk/storage/storage-file-share/test/node/utils.spec.ts +++ b/sdk/storage/storage-file-share/test/node/utils.spec.ts @@ -2,11 +2,10 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { extractConnectionStringParts } from "../../src/utils/utils.common"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "../utils"; +import { recorderEnvSetup } from "../utils"; dotenv.config({ path: "../.env" }); describe("Utility Helpers Node.js only", () => { - setupEnvironment(); let recorder: Recorder; const protocol = "https"; const endpointSuffix = "core.windows.net"; @@ -34,7 +33,7 @@ describe("Utility Helpers Node.js only", () => { } beforeEach(async function() { - recorder = record(this); + recorder = record(this,recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-file-share/test/retrypolicy.spec.ts b/sdk/storage/storage-file-share/test/retrypolicy.spec.ts index 22a63ffdc4a9..9fd3fa3dd9ce 100644 --- a/sdk/storage/storage-file-share/test/retrypolicy.spec.ts +++ b/sdk/storage/storage-file-share/test/retrypolicy.spec.ts @@ -3,22 +3,21 @@ import * as assert from "assert"; import { AbortController } from "@azure/abort-controller"; import { RestError, ShareClient } from "../src"; import { newPipeline, Pipeline } from "../src/Pipeline"; -import { getBSU, setupEnvironment } from "./utils"; +import { getBSU, recorderEnvSetup } from "./utils"; import { InjectorPolicyFactory } from "./utils/InjectorPolicyFactory"; import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("RetryPolicy", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/shareclient.spec.ts b/sdk/storage/storage-file-share/test/shareclient.spec.ts index 6c31cd9b7d6e..ce50175cbe50 100644 --- a/sdk/storage/storage-file-share/test/shareclient.spec.ts +++ b/sdk/storage/storage-file-share/test/shareclient.spec.ts @@ -1,20 +1,20 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; -import { getBSU, getSASConnectionStringFromEnvironment, setupEnvironment } from "./utils"; -import { ShareClient } from "../src"; +import { getBSU, getSASConnectionStringFromEnvironment, recorderEnvSetup } from "./utils"; +import { ShareClient, ShareServiceClient } from "../src"; import { record, Recorder } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); describe("ShareClient", () => { - setupEnvironment(); - const serviceClient = getBSU(); + let serviceClient: ShareServiceClient; let shareName: string; let shareClient: ShareClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + serviceClient = getBSU(); shareName = recorder.getUniqueName("share"); shareClient = serviceClient.getShareClient(shareName); await shareClient.create(); diff --git a/sdk/storage/storage-file-share/test/specialnaming.spec.ts b/sdk/storage/storage-file-share/test/specialnaming.spec.ts index 13c92651fdaa..47b2cd4c4822 100644 --- a/sdk/storage/storage-file-share/test/specialnaming.spec.ts +++ b/sdk/storage/storage-file-share/test/specialnaming.spec.ts @@ -1,5 +1,5 @@ import { ShareFileClient } from "../src/ShareFileClient"; -import { getBSU, setupEnvironment } from "./utils/index"; +import { getBSU, recorderEnvSetup } from "./utils/index"; import * as assert from "assert"; import { appendToURLPath } from "../src/utils/utils.common"; import { ShareDirectoryClient } from "../src/ShareDirectoryClient"; @@ -9,8 +9,6 @@ import { ShareClient } from "../src"; dotenv.config({ path: "../.env" }); describe("Special Naming Tests", () => { - setupEnvironment(); - const serviceClient = getBSU(); let shareName: string; let shareClient: ShareClient; let directoryName: string; @@ -19,7 +17,8 @@ describe("Special Naming Tests", () => { let recorder: Recorder; before(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const serviceClient = getBSU(); shareName = recorder.getUniqueName("1share-with-dash"); shareClient = serviceClient.getShareClient(shareName); @@ -34,13 +33,13 @@ describe("Special Naming Tests", () => { }); after(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); await shareClient.delete(); recorder.stop(); }); beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(function() { @@ -53,10 +52,12 @@ describe("Special Naming Tests", () => { await fileClient.create(10); - const response = (await directoryClient - .listFilesAndDirectories({ prefix: fileName }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ prefix: fileName }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -70,10 +71,12 @@ describe("Special Naming Tests", () => { await fileClient.create(10); - const response = (await directoryClient - .listFilesAndDirectories({ prefix: fileName }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ prefix: fileName }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -85,10 +88,12 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ prefix: fileName }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ prefix: fileName }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -103,10 +108,12 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ prefix: fileName }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ prefix: fileName }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -118,10 +125,12 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ prefix: fileName }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ prefix: fileName }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -136,10 +145,12 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ prefix: fileName }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ prefix: fileName }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -153,13 +164,15 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - // NOTICE: Azure Storage Server will replace "\" with "/" in the file names - prefix: fileName.replace(/\\/g, "/") - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + // NOTICE: Azure Storage Server will replace "\" with "/" in the file names + prefix: fileName.replace(/\\/g, "/") + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -179,13 +192,15 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - // NOTICE: Azure Storage Server will replace "\" with "/" in the file names - prefix: fileName.replace(/\\/g, "/") - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + // NOTICE: Azure Storage Server will replace "\" with "/" in the file names + prefix: fileName.replace(/\\/g, "/") + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -200,13 +215,15 @@ describe("Special Naming Tests", () => { await specialDirectoryClient.create(); await specialDirectoryClient.getProperties(); - const response = (await rootDirectoryClient - .listFilesAndDirectories({ - // NOTICE: Azure Storage Server will replace "\" with "/" in the file names - prefix: directoryName.replace(/\\/g, "/") - }) - .byPage() - .next()).value; + const response = ( + await rootDirectoryClient + .listFilesAndDirectories({ + // NOTICE: Azure Storage Server will replace "\" with "/" in the file names + prefix: directoryName.replace(/\\/g, "/") + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.directoryItems.length, 0); }); @@ -228,13 +245,15 @@ describe("Special Naming Tests", () => { const rootDirectoryClient = shareClient.getDirectoryClient(""); - const response = (await rootDirectoryClient - .listFilesAndDirectories({ - // NOTICE: Azure Storage Server will replace "\" with "/" in the file names - prefix: directoryName.replace(/\\/g, "/") - }) - .byPage() - .next()).value; + const response = ( + await rootDirectoryClient + .listFilesAndDirectories({ + // NOTICE: Azure Storage Server will replace "\" with "/" in the file names + prefix: directoryName.replace(/\\/g, "/") + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.directoryItems.length, 0); }); @@ -247,12 +266,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: blobNameEncoded - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: blobNameEncoded + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -264,12 +285,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: fileName - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: fileName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -284,12 +307,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: fileName - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: fileName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -302,12 +327,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: blobNameEncoded - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: blobNameEncoded + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -319,12 +346,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: fileName - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: fileName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -339,12 +368,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: fileName - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: fileName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -357,12 +388,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: blobNameEncoded - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: blobNameEncoded + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -374,12 +407,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: fileName - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: fileName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); @@ -394,12 +429,14 @@ describe("Special Naming Tests", () => { await fileClient.create(10); await fileClient.getProperties(); - const response = (await directoryClient - .listFilesAndDirectories({ - prefix: fileName - }) - .byPage() - .next()).value; + const response = ( + await directoryClient + .listFilesAndDirectories({ + prefix: fileName + }) + .byPage() + .next() + ).value; assert.notDeepEqual(response.segment.fileItems.length, 0); }); diff --git a/sdk/storage/storage-file-share/test/utils.spec.ts b/sdk/storage/storage-file-share/test/utils.spec.ts index 281d2c8c35c3..6c2fd0221ddb 100644 --- a/sdk/storage/storage-file-share/test/utils.spec.ts +++ b/sdk/storage/storage-file-share/test/utils.spec.ts @@ -7,11 +7,10 @@ import { extractConnectionStringParts } from "../src/utils/utils.common"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "./utils"; +import { recorderEnvSetup } from "./utils"; dotenv.config({ path: "../.env" }); describe("Utility Helpers", () => { - setupEnvironment(); let recorder: Recorder; const protocol = "https"; const endpointSuffix = "core.windows.net"; @@ -34,7 +33,7 @@ describe("Utility Helpers", () => { } beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-file-share/test/utils/testutils.common.ts b/sdk/storage/storage-file-share/test/utils/testutils.common.ts index bce77dd4d5a4..1fbf4f8b8d47 100644 --- a/sdk/storage/storage-file-share/test/utils/testutils.common.ts +++ b/sdk/storage/storage-file-share/test/utils/testutils.common.ts @@ -1,41 +1,48 @@ import { padStart } from "../../src/utils/utils.common"; -import { - setReplaceableVariables, - skipQueryParams, - env, - setReplacements -} from "@azure/test-utils-recorder"; +import { env, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; export function isBrowser(): boolean { return typeof window !== "undefined"; } -export function setupEnvironment() { - // setReplaceableVariables() - // 1. The key-value pairs will be used as the environment variables in playback - // 2. If the env variales are present in the recordings as plain strings, they will be replaced with the provided values - setReplaceableVariables({ - // Providing dummy values - ACCOUNT_NAME: "fakestorageaccount", - ACCOUNT_KEY: "aaaaa", - ACCOUNT_SAS: "aaaaa", - STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${env.ACCOUNT_NAME};AccountKey=${env.ACCOUNT_KEY};EndpointSuffix=core.windows.net`, +const mockAccountName = "fakestorageaccount"; +const mockAccountKey = "aaaaa"; +export const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + // Used in record and playback modes + // 1. The key-value pairs will be used as the environment variables in playback mode + // 2. If the env variales are present in the recordings as plain strings, they will be replaced with the provided values in record mode + ACCOUNT_NAME: `${mockAccountName}`, + ACCOUNT_KEY: `${mockAccountKey}`, + ACCOUNT_SAS: `${mockAccountKey}`, + STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${mockAccountName};AccountKey=${mockAccountKey};EndpointSuffix=core.windows.net`, // Comment following line to skip user delegation key/SAS related cases in record and play // which depends on this environment variable - ACCOUNT_TOKEN: "aaaaa" - }); - - // Array of callback functions can be passed to `setReplacements` to customize the generated recordings - // `sig` param of SAS Token is being filtered here - setReplacements([ + ACCOUNT_TOKEN: `${mockAccountKey}` + }, + replaceInRecordings: [ + // Used in record mode + // Array of callback functions can be provided to customize the generated recordings in record mode + // `sig` param of SAS Token is being filtered here (recording: string): string => - recording.replace(new RegExp(env.ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), "aaaaa") - ]); - + recording.replace( + new RegExp(env.ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), + `${mockAccountKey}` + ) + ], // SAS token may contain sensitive information - // skipQueryParams() method will filter out the plain parameter info from the recordings - skipQueryParams(["se", "sig", "sp", "spr", "srt", "ss", "st", "sv"]); -} + queryParametersToSkip: [ + // Used in record and playback modes + "se", + "sig", + "sp", + "spr", + "srt", + "ss", + "st", + "sv" + ] +}; export function getUniqueName(prefix: string): string { return `${prefix}${new Date().getTime()}${padStart( diff --git a/sdk/storage/storage-queue/test/aborter.spec.ts b/sdk/storage/storage-queue/test/aborter.spec.ts index 930b01811bf8..3d3794a061f1 100644 --- a/sdk/storage/storage-queue/test/aborter.spec.ts +++ b/sdk/storage/storage-queue/test/aborter.spec.ts @@ -3,22 +3,21 @@ import { AbortController } from "@azure/abort-controller"; import { QueueClient } from "../src/QueueClient"; import { getQSU } from "./utils"; -import { record, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; -import { setupEnvironment } from "./utils/testutils.common"; +import { recorderEnvSetup } from "./utils/testutils.common"; +import { Recorder, record } from "@azure/test-utils-recorder"; dotenv.config({ path: "../.env" }); // tslint:disable:no-empty describe("Aborter", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); let queueName: string; let queueClient: QueueClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); }); diff --git a/sdk/storage/storage-queue/test/messageidclient.spec.ts b/sdk/storage/storage-queue/test/messageidclient.spec.ts index 7b5905e18479..e7b269a6d8df 100644 --- a/sdk/storage/storage-queue/test/messageidclient.spec.ts +++ b/sdk/storage/storage-queue/test/messageidclient.spec.ts @@ -4,12 +4,10 @@ import { QueueClient } from "../src/QueueClient"; import { record, delay, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; import { extractConnectionStringParts } from "../src/utils/utils.common"; -import { setupEnvironment } from "./utils/testutils.common"; +import { recorderEnvSetup } from "./utils/index.browser"; dotenv.config({ path: "../.env" }); describe("QueueClient messageId methods", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); let queueName: string; let queueClient: QueueClient; const messageContent = "Hello World"; @@ -17,7 +15,8 @@ describe("QueueClient messageId methods", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/node/emulator-tests.spec.ts b/sdk/storage/storage-queue/test/node/emulator-tests.spec.ts index eb71bee248f1..7bdd8d043315 100644 --- a/sdk/storage/storage-queue/test/node/emulator-tests.spec.ts +++ b/sdk/storage/storage-queue/test/node/emulator-tests.spec.ts @@ -9,12 +9,12 @@ describe("Emulator Tests", () => { const messageContent = "Hello World"; let queueName: string; let queueClient: QueueClient; - let queueServiceClient = getQSU(); const env = isBrowser() ? (window as any).__env__ : process.env; beforeEach(async function() { if (!env.STORAGE_CONNECTION_STRING.startsWith("UseDevelopmentStorage=true")) { this.skip(); } + let queueServiceClient = getQSU(); queueName = getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/node/messageidclient.spec.ts b/sdk/storage/storage-queue/test/node/messageidclient.spec.ts index a4dc74ba36d0..d2f1234ed348 100644 --- a/sdk/storage/storage-queue/test/node/messageidclient.spec.ts +++ b/sdk/storage/storage-queue/test/node/messageidclient.spec.ts @@ -4,11 +4,9 @@ import { getQSU, getConnectionStringFromEnvironment } from "../utils"; import { record, Recorder } from "@azure/test-utils-recorder"; import { QueueClient } from "../../src/QueueClient"; import { StorageSharedKeyCredential } from "../../src/credentials/StorageSharedKeyCredential"; -import { setupEnvironment } from "../utils/testutils.common"; +import { recorderEnvSetup } from "../utils/index.browser"; describe("QueueClient messageId methods, Node.js only", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); let queueName: string; let queueClient: QueueClient; const messageContent = "Hello World"; @@ -16,7 +14,8 @@ describe("QueueClient messageId methods, Node.js only", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/node/messagesclient.spec.ts b/sdk/storage/storage-queue/test/node/messagesclient.spec.ts index 7c39165730d1..900ac0cbb4b6 100644 --- a/sdk/storage/storage-queue/test/node/messagesclient.spec.ts +++ b/sdk/storage/storage-queue/test/node/messagesclient.spec.ts @@ -6,11 +6,9 @@ import { StorageSharedKeyCredential } from "../../src/credentials/StorageSharedK import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; import { newPipeline } from "../../src"; -import { setupEnvironment } from "../utils/testutils.common"; +import { recorderEnvSetup } from "../utils/index.browser"; describe("QueueClient message methods, Node.js only", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); let queueName: string; let queueClient: QueueClient; const messageContent = "Hello World"; @@ -18,7 +16,8 @@ describe("QueueClient message methods, Node.js only", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/node/queueclient.spec.ts b/sdk/storage/storage-queue/test/node/queueclient.spec.ts index 3d02fa73a20a..030e704a5045 100644 --- a/sdk/storage/storage-queue/test/node/queueclient.spec.ts +++ b/sdk/storage/storage-queue/test/node/queueclient.spec.ts @@ -4,18 +4,17 @@ import { record, Recorder } from "@azure/test-utils-recorder"; import { newPipeline, QueueClient, StorageSharedKeyCredential } from "../../src"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; -import { setupEnvironment } from "../utils/testutils.common"; +import { recorderEnvSetup } from "../utils/testutils.common"; describe("QueueClient Node.js only", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); let queueName: string; let queueClient: QueueClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/node/queueserviceclient.spec.ts b/sdk/storage/storage-queue/test/node/queueserviceclient.spec.ts index ff58ce743fbf..0bb288169a75 100644 --- a/sdk/storage/storage-queue/test/node/queueserviceclient.spec.ts +++ b/sdk/storage/storage-queue/test/node/queueserviceclient.spec.ts @@ -6,14 +6,13 @@ import { StorageSharedKeyCredential } from "../../src/credentials/StorageSharedK import { newPipeline } from "../../src"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; -import { setupEnvironment } from "../utils/testutils.common"; +import { recorderEnvSetup } from "../utils/testutils.common"; describe("QueueServiceClient Node.js only", () => { - setupEnvironment(); let recorder: Recorder; beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(function() { diff --git a/sdk/storage/storage-queue/test/node/sas.spec.ts b/sdk/storage/storage-queue/test/node/sas.spec.ts index 52b4efad842d..2060fc0dba27 100644 --- a/sdk/storage/storage-queue/test/node/sas.spec.ts +++ b/sdk/storage/storage-queue/test/node/sas.spec.ts @@ -16,16 +16,15 @@ import { import { SASProtocol } from "../../src/SASQueryParameters"; import { getQSU } from "../utils/index"; import { record, delay, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "../utils/testutils.common"; +import { recorderEnvSetup } from "../utils/index.browser"; describe("Shared Access Signature (SAS) generation Node.js only", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); - + let queueServiceClient: QueueServiceClient; let recorder: Recorder; beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + queueServiceClient = getQSU(); }); afterEach(function() { diff --git a/sdk/storage/storage-queue/test/node/utils.spec.ts b/sdk/storage/storage-queue/test/node/utils.spec.ts index 67516ee15016..23b4ba2a7872 100644 --- a/sdk/storage/storage-queue/test/node/utils.spec.ts +++ b/sdk/storage/storage-queue/test/node/utils.spec.ts @@ -2,11 +2,10 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { extractConnectionStringParts } from "../../src/utils/utils.common"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "../utils/testutils.common"; +import { recorderEnvSetup } from "../utils/index.browser"; dotenv.config({ path: "../.env" }); describe("Utility Helpers Node.js only", () => { - setupEnvironment(); let recorder: Recorder; const protocol = "https"; const endpointSuffix = "core.windows.net"; @@ -34,7 +33,7 @@ describe("Utility Helpers Node.js only", () => { } beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-queue/test/queueclient.spec.ts b/sdk/storage/storage-queue/test/queueclient.spec.ts index c87f416017a1..8bb4735be7f5 100644 --- a/sdk/storage/storage-queue/test/queueclient.spec.ts +++ b/sdk/storage/storage-queue/test/queueclient.spec.ts @@ -1,23 +1,23 @@ import * as assert from "assert"; import { getQSU, getSASConnectionStringFromEnvironment } from "./utils"; -import { record, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; -import { QueueClient } from "../src"; +import { QueueClient, QueueServiceClient } from "../src"; import { TestTracer, setTracer, SpanGraph } from "@azure/core-tracing"; -import { setupEnvironment } from "./utils/testutils.common"; import { URLBuilder } from "@azure/core-http"; +import { Recorder, record } from "@azure/test-utils-recorder"; +import { recorderEnvSetup } from "./utils/testutils.common"; dotenv.config({ path: "../.env" }); describe("QueueClient", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); + let queueServiceClient: QueueServiceClient; let queueName: string; let queueClient: QueueClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/queueclientmessages.spec.ts b/sdk/storage/storage-queue/test/queueclientmessages.spec.ts index 8f732a8e3b89..9386fa545fda 100644 --- a/sdk/storage/storage-queue/test/queueclientmessages.spec.ts +++ b/sdk/storage/storage-queue/test/queueclientmessages.spec.ts @@ -4,12 +4,10 @@ import { QueueClient } from "../src/QueueClient"; import { record, Recorder } from "@azure/test-utils-recorder"; import * as dotenv from "dotenv"; import { extractConnectionStringParts } from "../src/utils/utils.common"; -import { setupEnvironment } from "./utils/testutils.common"; +import { recorderEnvSetup } from "./utils/testutils.common"; dotenv.config({ path: "../.env" }); describe("QueueClient message methods", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); let queueName: string; let queueClient: QueueClient; const messageContent = "Hello World"; @@ -17,7 +15,8 @@ describe("QueueClient message methods", () => { let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + const queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/queueserviceclient.spec.ts b/sdk/storage/storage-queue/test/queueserviceclient.spec.ts index 61429722b547..612888b929a2 100644 --- a/sdk/storage/storage-queue/test/queueserviceclient.spec.ts +++ b/sdk/storage/storage-queue/test/queueserviceclient.spec.ts @@ -3,15 +3,14 @@ import * as dotenv from "dotenv"; import { QueueServiceClient } from "../src/QueueServiceClient"; import { getAlternateQSU, getQSU, getSASConnectionStringFromEnvironment } from "./utils"; import { record, delay, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "./utils/testutils.common"; +import { recorderEnvSetup } from "./utils/index.browser"; dotenv.config({ path: "../.env" }); describe("QueueServiceClient", () => { - setupEnvironment(); let recorder: Recorder; beforeEach(function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(function() { diff --git a/sdk/storage/storage-queue/test/retrypolicy.spec.ts b/sdk/storage/storage-queue/test/retrypolicy.spec.ts index c2fdd48817bc..84a2140afdd8 100644 --- a/sdk/storage/storage-queue/test/retrypolicy.spec.ts +++ b/sdk/storage/storage-queue/test/retrypolicy.spec.ts @@ -1,26 +1,26 @@ import { URLBuilder } from "@azure/core-http"; import * as assert from "assert"; -import { QueueClient, RestError, newPipeline } from "../src"; +import { QueueClient, RestError, newPipeline, QueueServiceClient } from "../src"; import * as dotenv from "dotenv"; import { AbortController } from "@azure/abort-controller"; import { Pipeline } from "../src/Pipeline"; import { getQSU } from "./utils"; import { InjectorPolicyFactory } from "./utils/InjectorPolicyFactory"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "./utils/testutils.common"; +import { recorderEnvSetup } from "./utils/index.browser"; dotenv.config({ path: "../.env" }); describe("RetryPolicy", () => { - setupEnvironment(); - const queueServiceClient = getQSU(); + let queueServiceClient: QueueServiceClient; let queueName: string; let queueClient: QueueClient; let recorder: Recorder; beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); + queueServiceClient = getQSU(); queueName = recorder.getUniqueName("queue"); queueClient = queueServiceClient.getQueueClient(queueName); await queueClient.create(); diff --git a/sdk/storage/storage-queue/test/utils.spec.ts b/sdk/storage/storage-queue/test/utils.spec.ts index 7a2657ef8844..0b7b5fc9f41e 100644 --- a/sdk/storage/storage-queue/test/utils.spec.ts +++ b/sdk/storage/storage-queue/test/utils.spec.ts @@ -7,11 +7,10 @@ import { extractConnectionStringParts } from "../src/utils/utils.common"; import { record, Recorder } from "@azure/test-utils-recorder"; -import { setupEnvironment } from "./utils/testutils.common"; +import { recorderEnvSetup } from "./utils/testutils.common"; dotenv.config({ path: "../.env" }); describe("Utility Helpers", () => { - setupEnvironment(); let recorder: Recorder; const protocol = "https"; const endpointSuffix = "core.windows.net"; @@ -34,7 +33,7 @@ describe("Utility Helpers", () => { } beforeEach(async function() { - recorder = record(this); + recorder = record(this, recorderEnvSetup); }); afterEach(async function() { diff --git a/sdk/storage/storage-queue/test/utils/testutils.common.ts b/sdk/storage/storage-queue/test/utils/testutils.common.ts index bce77dd4d5a4..1fbf4f8b8d47 100644 --- a/sdk/storage/storage-queue/test/utils/testutils.common.ts +++ b/sdk/storage/storage-queue/test/utils/testutils.common.ts @@ -1,41 +1,48 @@ import { padStart } from "../../src/utils/utils.common"; -import { - setReplaceableVariables, - skipQueryParams, - env, - setReplacements -} from "@azure/test-utils-recorder"; +import { env, RecorderEnvironmentSetup } from "@azure/test-utils-recorder"; export function isBrowser(): boolean { return typeof window !== "undefined"; } -export function setupEnvironment() { - // setReplaceableVariables() - // 1. The key-value pairs will be used as the environment variables in playback - // 2. If the env variales are present in the recordings as plain strings, they will be replaced with the provided values - setReplaceableVariables({ - // Providing dummy values - ACCOUNT_NAME: "fakestorageaccount", - ACCOUNT_KEY: "aaaaa", - ACCOUNT_SAS: "aaaaa", - STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${env.ACCOUNT_NAME};AccountKey=${env.ACCOUNT_KEY};EndpointSuffix=core.windows.net`, +const mockAccountName = "fakestorageaccount"; +const mockAccountKey = "aaaaa"; +export const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + // Used in record and playback modes + // 1. The key-value pairs will be used as the environment variables in playback mode + // 2. If the env variales are present in the recordings as plain strings, they will be replaced with the provided values in record mode + ACCOUNT_NAME: `${mockAccountName}`, + ACCOUNT_KEY: `${mockAccountKey}`, + ACCOUNT_SAS: `${mockAccountKey}`, + STORAGE_CONNECTION_STRING: `DefaultEndpointsProtocol=https;AccountName=${mockAccountName};AccountKey=${mockAccountKey};EndpointSuffix=core.windows.net`, // Comment following line to skip user delegation key/SAS related cases in record and play // which depends on this environment variable - ACCOUNT_TOKEN: "aaaaa" - }); - - // Array of callback functions can be passed to `setReplacements` to customize the generated recordings - // `sig` param of SAS Token is being filtered here - setReplacements([ + ACCOUNT_TOKEN: `${mockAccountKey}` + }, + replaceInRecordings: [ + // Used in record mode + // Array of callback functions can be provided to customize the generated recordings in record mode + // `sig` param of SAS Token is being filtered here (recording: string): string => - recording.replace(new RegExp(env.ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), "aaaaa") - ]); - + recording.replace( + new RegExp(env.ACCOUNT_SAS.match("(.*)&sig=(.*)")[2], "g"), + `${mockAccountKey}` + ) + ], // SAS token may contain sensitive information - // skipQueryParams() method will filter out the plain parameter info from the recordings - skipQueryParams(["se", "sig", "sp", "spr", "srt", "ss", "st", "sv"]); -} + queryParametersToSkip: [ + // Used in record and playback modes + "se", + "sig", + "sp", + "spr", + "srt", + "ss", + "st", + "sv" + ] +}; export function getUniqueName(prefix: string): string { return `${prefix}${new Date().getTime()}${padStart(