diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py index 6016a8a10ef8..c5590a8da3f9 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py @@ -5,6 +5,7 @@ # -------------------------------------------------------------------------- import functools +import warnings from typing import ( # pylint: disable=unused-import Union, Optional, Any, Iterable, Dict, List, TYPE_CHECKING @@ -624,14 +625,13 @@ def undelete_container(self, deleted_container_name, deleted_container_version, Specifies the name of the deleted container to restore. :param str deleted_container_version: Specifies the version of the deleted container to restore. - :keyword str new_name: - The new name for the deleted container to be restored to. - If not specified deleted_container_name will be used as the restored container name. :keyword int timeout: The timeout parameter is expressed in seconds. :rtype: ~azure.storage.blob.ContainerClient """ new_name = kwargs.pop('new_name', None) + if new_name: + warnings.warn("`new_name` is no longer supported.", DeprecationWarning) container = self.get_container_client(new_name or deleted_container_name) try: container._client.container.restore(deleted_container_name=deleted_container_name, # pylint: disable = protected-access diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py index d3d72ba65389..cfe0654e3aa2 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py @@ -5,6 +5,7 @@ # -------------------------------------------------------------------------- # pylint: disable=invalid-overridden-method import functools +import warnings from typing import ( # pylint: disable=unused-import Union, Optional, Any, Iterable, Dict, List, TYPE_CHECKING @@ -568,14 +569,13 @@ async def undelete_container(self, deleted_container_name, deleted_container_ver Specifies the name of the deleted container to restore. :param str deleted_container_version: Specifies the version of the deleted container to restore. - :keyword str new_name: - The new name for the deleted container to be restored to. - If not specified deleted_container_name will be used as the restored container name. :keyword int timeout: The timeout parameter is expressed in seconds. :rtype: ~azure.storage.blob.aio.ContainerClient """ new_name = kwargs.pop('new_name', None) + if new_name: + warnings.warn("`new_name` is no longer supported.", DeprecationWarning) container = self.get_container_client(new_name or deleted_container_name) try: await container._client.container.restore(deleted_container_name=deleted_container_name, # pylint: disable = protected-access diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_restore_to_existing_container.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_restore_to_existing_container.yaml deleted file mode 100644 index f6a4cf40b769..000000000000 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_restore_to_existing_container.yaml +++ /dev/null @@ -1,262 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:29:54 GMT - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/existingfca91462?restype=container - response: - body: - string: "\uFEFFContainerAlreadyExistsThe - specified container already exists.\nRequestId:7e2e3cd0-301e-0050-130a-258ff0000000\nTime:2020-05-08T07:29:54.8263773Z" - headers: - content-length: - - '230' - content-type: - - application/xml - date: - - Fri, 08 May 2020 07:29:53 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: - - ContainerAlreadyExists - x-ms-version: - - '2019-12-12' - status: - code: 409 - message: The specified container already exists. -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:29:54 GMT - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/containerfca91462?restype=container - response: - body: - string: "\uFEFFContainerBeingDeletedThe - specified container is being deleted. Try operation later.\nRequestId:7e2e3cd8-301e-0050-190a-258ff0000000\nTime:2020-05-08T07:29:54.9274495Z" - headers: - content-length: - - '252' - content-type: - - application/xml - date: - - Fri, 08 May 2020 07:29:54 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: - - ContainerBeingDeleted - x-ms-version: - - '2019-12-12' - status: - code: 409 - message: The specified container is being deleted. Try operation later. -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:29:54 GMT - x-ms-version: - - '2019-12-12' - method: DELETE - uri: https://storagename.blob.core.windows.net/containerfca91462?restype=container - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:29:54 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: - - '2019-12-12' - status: - code: 202 - message: Accepted -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:29:55 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/containerfca91462?restype=container - response: - body: - string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:7e2e3cfa-301e-0050-360a-258ff0000000\nTime:2020-05-08T07:29:55.1215874Z" - headers: - content-length: - - '225' - content-type: - - application/xml - date: - - Fri, 08 May 2020 07:29:54 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: - - ContainerNotFound - x-ms-version: - - '2019-12-12' - status: - code: 404 - message: The specified container does not exist. -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:29:55 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/?include=deleted&comp=list - response: - body: - string: "\uFEFFcontainer0Fri, - 08 May 2020 07:04:31 GMT\"0x8D7F31E0ECAAE24\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer1Fri, - 08 May 2020 07:04:33 GMT\"0x8D7F31E0FE26D76\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer319b0fa8true01D62509D55582C5Fri, - 08 May 2020 07:25:21 GMT\"0x8D7F320F7CCA44C\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:25:21 GMT7container319b0fa8true01D62509FD6EBD2CFri, - 08 May 2020 07:26:29 GMT\"0x8D7F3211FE56E30\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:26:29 GMT7container319b0fa8true01D6250A2AB5659EFri, - 08 May 2020 07:27:45 GMT\"0x8D7F3214D2BFEDB\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:27:48 GMT7containerfca91462true01D6250A6E81EC48Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190F8CA83\"lockedleasedfixed$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:29:38 GMT7existingfca91462Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190E8C200\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainerFri, - 08 May 2020 07:16:42 GMT\"0x8D7F31FC24DE2CA\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer0Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F81BF888\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer1Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8381157\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer2Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8540307\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer0Fri, - 08 May 2020 07:01:45 GMT\"0x8D7F31DABB8FEDE\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer2Fri, - 08 May 2020 07:07:25 GMT\"0x8D7F31E75F8EDC3\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer3Fri, - 08 May 2020 07:07:29 GMT\"0x8D7F31E78DB14DA\"unlockedavailable$account-encryption-keyfalsefalsefalserst20f8537e66b24e68b2a9681cee0a4539Fri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B98F74205\"unlockedavailable$account-encryption-keyfalsefalsefalserst4a7f78c4fbe24a369acb73a3614f290bFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE307232F\"unlockedavailable$account-encryption-keyfalsefalsefalserst4f9a00eb255c400d831cf41f72c3a3ddFri, - 08 May 2020 06:53:50 GMT\"0x8D7F31C90B3CDD9\"unlockedavailable$account-encryption-keyfalsefalsefalserst54c325d4d83e43c9a1bdbc8e0b916e4fFri, - 08 May 2020 06:46:51 GMT\"0x8D7F31B96FA0099\"unlockedavailable$account-encryption-keyfalsefalsefalserst60b2beebcaa942e8b77aec6fb545e41cFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE34EC10B\"unlockedavailable$account-encryption-keyfalsefalsefalserst7916f0de0354443aac32f9b270bceca5Fri, - 08 May 2020 06:46:48 GMT\"0x8D7F31B951D45B0\"unlockedavailable$account-encryption-keyfalsefalsefalserst9405053c53ca4dfc94e5219b0110bb15Fri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B9962741D\"unlockedavailable$account-encryption-keyfalsefalsefalserstb5da911e0a504ef2bb475ff143ce16ecFri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B983A852E\"unlockedavailable$account-encryption-keyfalsefalsefalserstd3279fff13cb431bbd9a173a6f05bbceFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE2BEE8FD\"unlockedavailable$account-encryption-keyfalsefalsefalserstdc872f63b91149e0bcdab92207d26bd5Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE2310D32\"unlockedavailable$account-encryption-keyfalsefalsefalserstdf98568c66da45bdbf258910c1365f31Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE277E783\"unlockedavailable$account-encryption-keyfalsefalsefalserste5fb5a4e1e654cc38a24d2229980ac42Fri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B97B33A68\"unlockedavailable$account-encryption-keyfalsefalsefalserstf26b8cb981e2419a83fae8ea45d48a73Fri, - 08 May 2020 06:52:17 GMT\"0x8D7F31C59005AE3\"unlockedavailable$account-encryption-keyfalsefalsefalserstf8f674a6033047a4acb35b8ef0170ec8Fri, - 08 May 2020 06:53:58 GMT\"0x8D7F31C95767FE6\"unlockedavailable$account-encryption-keyfalsefalsefalse" - headers: - content-type: - - application/xml - date: - - Fri, 08 May 2020 07:29:54 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - transfer-encoding: - - chunked - x-ms-version: - - '2019-12-12' - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:33:34 GMT - x-ms-deleted-container-name: - - containerfca91462 - x-ms-deleted-container-version: - - 01D6250A6E81EC48 - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/existingfca91462?restype=container&comp=undelete - response: - body: - string: "\uFEFF\nContainerAlreadyExistsThe - specified container already exists.\nRequestId:ac025624-901e-0092-6b0b-25c976000000\nTime:2020-05-08T07:33:51.0578479Z" - headers: - content-length: - - '231' - content-type: - - application/xml - date: - - Fri, 08 May 2020 07:33:50 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: - - ContainerAlreadyExists - x-ms-version: - - '2019-12-12' - status: - code: 409 - message: The specified container already exists. -version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_undelete_container.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_undelete_container.yaml index cad00e3d9f88..54bdd498fe7e 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_undelete_container.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_container.test_undelete_container.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept: - - '*/*' + - application/xml Accept-Encoding: - gzip, deflate Connection: @@ -11,29 +11,29 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 07:32:39 GMT + - Thu, 13 May 2021 02:33:35 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: PUT uri: https://storagename.blob.core.windows.net/container319b0fa8?restype=container response: body: string: '' headers: - content-length: - - '0' date: - - Fri, 08 May 2020 07:32:39 GMT + - Thu, 13 May 2021 02:33:34 GMT etag: - - '"0x8D7F321FD29C656"' + - '"0x8D915B781ABF866"' last-modified: - - Fri, 08 May 2020 07:32:40 GMT + - Thu, 13 May 2021 02:33:34 GMT server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked x-ms-version: - - '2019-12-12' + - '2020-08-04' status: code: 201 message: Created @@ -41,7 +41,7 @@ interactions: body: null headers: Accept: - - '*/*' + - application/xml Accept-Encoding: - gzip, deflate Connection: @@ -49,25 +49,25 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 07:32:42 GMT + - Thu, 13 May 2021 02:33:35 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: DELETE uri: https://storagename.blob.core.windows.net/container319b0fa8?restype=container response: body: string: '' headers: - content-length: - - '0' date: - - Fri, 08 May 2020 07:32:41 GMT + - Thu, 13 May 2021 02:33:34 GMT server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked x-ms-version: - - '2019-12-12' + - '2020-08-04' status: code: 202 message: Accepted @@ -75,36 +75,36 @@ interactions: body: null headers: Accept: - - '*/*' + - application/xml Accept-Encoding: - gzip, deflate Connection: - keep-alive User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 07:32:42 GMT + - Thu, 13 May 2021 02:34:15 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: GET uri: https://storagename.blob.core.windows.net/container319b0fa8?restype=container response: body: string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:64b0745c-801e-006a-330a-259588000000\nTime:2020-05-08T07:32:42.5914368Z" + specified container does not exist.\nRequestId:91c101d6-001e-0079-7aa0-479572000000\nTime:2021-05-13T02:34:15.0070460Z" headers: content-length: - '225' content-type: - application/xml date: - - Fri, 08 May 2020 07:32:41 GMT + - Thu, 13 May 2021 02:34:14 GMT server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 x-ms-error-code: - ContainerNotFound x-ms-version: - - '2019-12-12' + - '2020-08-04' status: code: 404 message: The specified container does not exist. @@ -118,323 +118,41 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 07:32:43 GMT + - Thu, 13 May 2021 02:34:15 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: GET - uri: https://storagename.blob.core.windows.net/?include=deleted&comp=list + uri: https://storagename.blob.core.windows.net/?comp=list&include=deleted response: body: string: "\uFEFFcontainer0Fri, - 08 May 2020 07:04:31 GMT\"0x8D7F31E0ECAAE24\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer1Fri, - 08 May 2020 07:04:33 GMT\"0x8D7F31E0FE26D76\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer319b0fa8true01D62509D55582C5Fri, - 08 May 2020 07:25:21 GMT\"0x8D7F320F7CCA44C\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:25:21 GMT7container319b0fa8true01D62509FD6EBD2CFri, - 08 May 2020 07:26:29 GMT\"0x8D7F3211FE56E30\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:26:29 GMT7container319b0fa8true01D6250A2AB5659EFri, - 08 May 2020 07:27:45 GMT\"0x8D7F3214D2BFEDB\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:27:48 GMT7container319b0fa8true01D6250A9224BEE6Fri, - 08 May 2020 07:30:38 GMT\"0x8D7F321B49B7990\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:30:38 GMT7container319b0fa8true01D6250ADAB354E0Fri, - 08 May 2020 07:32:40 GMT\"0x8D7F321FD29C656\"lockedleasedfixed$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:32:42 GMT7containerfca91462true01D6250A6E81EC48Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190F8CA83\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:29:38 GMT7existingfca91462Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190E8C200\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainerFri, - 08 May 2020 07:16:42 GMT\"0x8D7F31FC24DE2CA\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer0Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F81BF888\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer1Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8381157\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer2Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8540307\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer0Fri, - 08 May 2020 07:01:45 GMT\"0x8D7F31DABB8FEDE\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer2Fri, - 08 May 2020 07:07:25 GMT\"0x8D7F31E75F8EDC3\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer3Fri, - 08 May 2020 07:07:29 GMT\"0x8D7F31E78DB14DA\"unlockedavailable$account-encryption-keyfalsefalsefalserst20f8537e66b24e68b2a9681cee0a4539Fri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B98F74205\"unlockedavailable$account-encryption-keyfalsefalsefalserst4a7f78c4fbe24a369acb73a3614f290bFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE307232F\"unlockedavailable$account-encryption-keyfalsefalsefalserst4f9a00eb255c400d831cf41f72c3a3ddFri, - 08 May 2020 06:53:50 GMT\"0x8D7F31C90B3CDD9\"unlockedavailable$account-encryption-keyfalsefalsefalserst54c325d4d83e43c9a1bdbc8e0b916e4fFri, - 08 May 2020 06:46:51 GMT\"0x8D7F31B96FA0099\"unlockedavailable$account-encryption-keyfalsefalsefalserst60b2beebcaa942e8b77aec6fb545e41cFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE34EC10B\"unlockedavailable$account-encryption-keyfalsefalsefalserst7916f0de0354443aac32f9b270bceca5Fri, - 08 May 2020 06:46:48 GMT\"0x8D7F31B951D45B0\"unlockedavailable$account-encryption-keyfalsefalsefalserst9405053c53ca4dfc94e5219b0110bb15Fri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B9962741D\"unlockedavailable$account-encryption-keyfalsefalsefalserstb5da911e0a504ef2bb475ff143ce16ecFri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B983A852E\"unlockedavailable$account-encryption-keyfalsefalsefalserstd3279fff13cb431bbd9a173a6f05bbceFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE2BEE8FD\"unlockedavailable$account-encryption-keyfalsefalsefalserstdc872f63b91149e0bcdab92207d26bd5Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE2310D32\"unlockedavailable$account-encryption-keyfalsefalsefalserstdf98568c66da45bdbf258910c1365f31Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE277E783\"unlockedavailable$account-encryption-keyfalsefalsefalserste5fb5a4e1e654cc38a24d2229980ac42Fri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B97B33A68\"unlockedavailable$account-encryption-keyfalsefalsefalserstf26b8cb981e2419a83fae8ea45d48a73Fri, - 08 May 2020 06:52:17 GMT\"0x8D7F31C59005AE3\"unlockedavailable$account-encryption-keyfalsefalsefalserstf8f674a6033047a4acb35b8ef0170ec8Fri, - 08 May 2020 06:53:58 GMT\"0x8D7F31C95767FE6\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer319b0fa8true01D747A05F3533D2Thu, + 13 May 2021 02:33:34 GMT\"0x8D915B781ABF866\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:33:34 GMT7container775b16a0Sun, + 25 Apr 2021 23:57:06 GMT\"0x8D90845D4B76C02\"unlockedavailable$account-encryption-keyfalsefalsefalsecontaineraa031289Thu, + 22 Apr 2021 00:45:42 GMT\"0x8D90527F51A7A7E\"unlockedavailable$account-encryption-keyfalsefalsefalsefge775b16a0Sun, + 25 Apr 2021 23:58:46 GMT\"0x8D90846101C0D39\"unlockedavailable$account-encryption-keyfalsefalsefalsefsdaa031289Thu, + 22 Apr 2021 00:47:47 GMT\"0x8D905283FDD92F0\"unlockedavailable$account-encryption-keyfalsefalsefalsetestcontMon, + 19 Apr 2021 23:48:23 GMT\"0x8D9038D9E67A498\"unlockedavailable$account-encryption-keyfalsefalsefalseutcontainer8ad716e9Wed, + 12 May 2021 21:13:57 GMT\"0x8D9158ADB3F30CD\"unlockedavailable$account-encryption-keyfalsefalsefalseutcontainerbd9a17d3Mon, + 10 May 2021 20:09:32 GMT\"0x8D913EF86535D1B\"unlockedavailable$account-encryption-keyfalsefalsefalseutcontainerd6f71856Mon, + 10 May 2021 20:08:58 GMT\"0x8D913EF726C52A7\"unlockedavailable$account-encryption-keyfalsefalsefalseutqqcontainerb38317dfTue, + 27 Apr 2021 20:47:09 GMT\"0x8D909BDA06D37D0\"unlockedavailable$account-encryption-keyfalsefalsefalseutqqcontainere29c188bTue, + 11 May 2021 21:05:20 GMT\"0x8D914C07C6B5234\"unlockedavailable$account-encryption-keyfalsefalsefalse" headers: content-type: - application/xml date: - - Fri, 08 May 2020 07:32:42 GMT + - Thu, 13 May 2021 02:34:14 GMT server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: - chunked x-ms-version: - - '2019-12-12' - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:34:55 GMT - x-ms-deleted-container-name: - - container319b0fa8 - x-ms-deleted-container-version: - - 01D62509D55582C5 - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restored0?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:34:55 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: - - '2019-12-12' - status: - code: 201 - message: Created -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:34:55 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restored0?restype=container - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:34:55 GMT - etag: - - '"0x8D7F3224DB9229A"' - last-modified: - - Fri, 08 May 2020 07:34:55 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: - - $account-encryption-key - x-ms-deny-encryption-scope-override: - - 'false' - x-ms-has-immutability-policy: - - 'false' - x-ms-has-legal-hold: - - 'false' - x-ms-lease-state: - - available - x-ms-lease-status: - - unlocked - x-ms-version: - - '2019-12-12' - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:36:08 GMT - x-ms-deleted-container-name: - - container319b0fa8 - x-ms-deleted-container-version: - - 01D62509FD6EBD2C - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restored1?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:36:07 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: - - '2019-12-12' - status: - code: 201 - message: Created -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:36:08 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restored1?restype=container - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:36:07 GMT - etag: - - '"0x8D7F322791ED81E"' - last-modified: - - Fri, 08 May 2020 07:36:08 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: - - $account-encryption-key - x-ms-deny-encryption-scope-override: - - 'false' - x-ms-has-immutability-policy: - - 'false' - x-ms-has-legal-hold: - - 'false' - x-ms-lease-state: - - available - x-ms-lease-status: - - unlocked - x-ms-version: - - '2019-12-12' - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:37:14 GMT - x-ms-deleted-container-name: - - container319b0fa8 - x-ms-deleted-container-version: - - 01D6250A2AB5659E - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restored2?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:37:14 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: - - '2019-12-12' - status: - code: 201 - message: Created -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:37:14 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restored2?restype=container - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:37:14 GMT - etag: - - '"0x8D7F322A08947CF"' - last-modified: - - Fri, 08 May 2020 07:37:14 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: - - $account-encryption-key - x-ms-deny-encryption-scope-override: - - 'false' - x-ms-has-immutability-policy: - - 'false' - x-ms-has-legal-hold: - - 'false' - x-ms-lease-state: - - available - x-ms-lease-status: - - unlocked - x-ms-version: - - '2019-12-12' + - '2020-08-04' status: code: 200 message: OK @@ -442,93 +160,7 @@ interactions: body: null headers: Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:38:16 GMT - x-ms-deleted-container-name: - - container319b0fa8 - x-ms-deleted-container-version: - - 01D6250A9224BEE6 - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restored3?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:38:15 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: - - '2019-12-12' - status: - code: 201 - message: Created -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 07:38:16 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restored3?restype=container - response: - body: - string: '' - headers: - content-length: - - '0' - date: - - Fri, 08 May 2020 07:38:16 GMT - etag: - - '"0x8D7F322C569D2B5"' - last-modified: - - Fri, 08 May 2020 07:38:16 GMT - server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: - - $account-encryption-key - x-ms-deny-encryption-scope-override: - - 'false' - x-ms-has-immutability-policy: - - 'false' - x-ms-has-legal-hold: - - 'false' - x-ms-lease-state: - - available - x-ms-lease-status: - - unlocked - x-ms-version: - - '2019-12-12' - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' + - application/xml Accept-Encoding: - gzip, deflate Connection: @@ -536,17 +168,17 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 07:39:18 GMT + - Thu, 13 May 2021 02:34:15 GMT x-ms-deleted-container-name: - container319b0fa8 x-ms-deleted-container-version: - - 01D6250ADAB354E0 + - 01D747A05F3533D2 x-ms-version: - - '2019-12-12' + - '2020-08-04' method: PUT - uri: https://storagename.blob.core.windows.net/restored4?restype=container&comp=undelete + uri: https://storagename.blob.core.windows.net/container319b0fa8?restype=container&comp=undelete response: body: string: '' @@ -554,11 +186,11 @@ interactions: content-length: - '0' date: - - Fri, 08 May 2020 07:39:18 GMT + - Thu, 13 May 2021 02:34:14 GMT server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 x-ms-version: - - '2019-12-12' + - '2020-08-04' status: code: 201 message: Created @@ -566,33 +198,33 @@ interactions: body: null headers: Accept: - - '*/*' + - application/xml Accept-Encoding: - gzip, deflate Connection: - keep-alive User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 07:39:19 GMT + - Thu, 13 May 2021 02:34:15 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: GET - uri: https://storagename.blob.core.windows.net/restored4?restype=container + uri: https://storagename.blob.core.windows.net/container319b0fa8?restype=container response: body: string: '' headers: - content-length: - - '0' date: - - Fri, 08 May 2020 07:39:18 GMT + - Thu, 13 May 2021 02:34:14 GMT etag: - - '"0x8D7F322EADC58F5"' + - '"0x8D915B799B9CFC4"' last-modified: - - Fri, 08 May 2020 07:39:19 GMT + - Thu, 13 May 2021 02:34:15 GMT server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: + - chunked x-ms-default-encryption-scope: - $account-encryption-key x-ms-deny-encryption-scope-override: @@ -606,7 +238,7 @@ interactions: x-ms-lease-status: - unlocked x-ms-version: - - '2019-12-12' + - '2020-08-04' status: code: 200 message: OK diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_restore_to_existing_container.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_restore_to_existing_container.yaml deleted file mode 100644 index 3d6d30cdcd15..000000000000 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_restore_to_existing_container.yaml +++ /dev/null @@ -1,260 +0,0 @@ -interactions: -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:48:05 GMT - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/existing7fb616df?restype=container - response: - body: - string: "\uFEFFContainerAlreadyExistsThe - specified container already exists.\nRequestId:913a2e48-e01e-0098-2a60-256dc1000000\nTime:2020-05-08T17:48:05.6908402Z" - headers: - content-length: '230' - content-type: application/xml - date: Fri, 08 May 2020 17:48:05 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: ContainerAlreadyExists - x-ms-version: '2019-12-12' - status: - code: 409 - message: The specified container already exists. - url: https://emilyeuap.blob.core.windows.net/existing7fb616df?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:48:05 GMT - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/acontainer7fb616df?restype=container - response: - body: - string: "\uFEFFContainerBeingDeletedThe - specified container is being deleted. Try operation later.\nRequestId:913a2e5c-e01e-0098-3a60-256dc1000000\nTime:2020-05-08T17:48:05.8449492Z" - headers: - content-length: '252' - content-type: application/xml - date: Fri, 08 May 2020 17:48:05 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: ContainerBeingDeleted - x-ms-version: '2019-12-12' - status: - code: 409 - message: The specified container is being deleted. Try operation later. - url: https://emilyeuap.blob.core.windows.net/acontainer7fb616df?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:48:05 GMT - x-ms-version: - - '2019-12-12' - method: DELETE - uri: https://storagename.blob.core.windows.net/acontainer7fb616df?restype=container - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:48:05 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' - status: - code: 202 - message: Accepted - url: https://emilyeuap.blob.core.windows.net/acontainer7fb616df?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:48:06 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/acontainer7fb616df?restype=container - response: - body: - string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:913a2e96-e01e-0098-7060-256dc1000000\nTime:2020-05-08T17:48:06.1311528Z" - headers: - content-length: '225' - content-type: application/xml - date: Fri, 08 May 2020 17:48:05 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: ContainerNotFound - x-ms-version: '2019-12-12' - status: - code: 404 - message: The specified container does not exist. - url: https://emilyeuap.blob.core.windows.net/acontainer7fb616df?restype=container -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:48:09 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/?include=deleted&comp=list - response: - body: - string: "\uFEFFacontainer7fb616dftrue01D62560C5A771A5Fri, - 08 May 2020 17:47:41 GMT\"0x8D7F377E81E3967\"lockedleasedfixed$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:47:41 GMT7container0true01D62506EC53A152Fri, - 08 May 2020 07:04:31 GMT\"0x8D7F31E0ECAAE24\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:20 GMT7container1true01D62506ED6B5E7AFri, - 08 May 2020 07:04:33 GMT\"0x8D7F31E0FE26D76\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:18 GMT7container14430ef5true01D625576B350C1AFri, - 08 May 2020 16:40:44 GMT\"0x8D7F36E8DAC024F\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:40:44 GMT6container14430ef5true01D6255782184BE0Fri, - 08 May 2020 16:41:22 GMT\"0x8D7F36EA48F031D\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:41:23 GMT6container14430ef5true01D62557A0A33EDCFri, - 08 May 2020 16:42:14 GMT\"0x8D7F36EC319DF8A\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:42:14 GMT6container14430ef5true01D62557BA0CB435Fri, - 08 May 2020 16:42:56 GMT\"0x8D7F36EDC834D26\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:43:02 GMT6container14430ef5true01D6255889E71F26Fri, - 08 May 2020 16:48:45 GMT\"0x8D7F36FAC5E046B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:49:27 GMT6container14430ef5true01D62558BD8737BBFri, - 08 May 2020 16:50:12 GMT\"0x8D7F36FDFFDAE2B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:50:12 GMT6container14430ef5true01D62559037EF628Fri, - 08 May 2020 16:52:09 GMT\"0x8D7F37025F5833E\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:52:11 GMT6container14430ef5true01D6255924650F0EFri, - 08 May 2020 16:53:04 GMT\"0x8D7F37046DBDCDB\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:53:05 GMT6container14430ef5true01D625593A5ED5D6Fri, - 08 May 2020 16:53:41 GMT\"0x8D7F3705CD40E4A\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:28 GMT7containerad0f17a3true01D6255ABD6865DDFri, - 08 May 2020 17:04:30 GMT\"0x8D7F371DFDF8AD6\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:04:31 GMT6containerad0f17a3true01D6255AE1F17BB9Fri, - 08 May 2020 17:05:32 GMT\"0x8D7F372046880AC\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:05:32 GMT6containerad0f17a3true01D6255AFE315D36Fri, - 08 May 2020 17:06:19 GMT\"0x8D7F37220A8149B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:06:19 GMT6containerad0f17a3true01D6255B6A2EA962Fri, - 08 May 2020 17:09:20 GMT\"0x8D7F3728CA53418\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:09:20 GMT6containerad0f17a3true01D6255BBCCDD851Fri, - 08 May 2020 17:11:39 GMT\"0x8D7F372DF4435D0\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:11:39 GMT6containerad0f17a3true01D6255C5812487AFri, - 08 May 2020 17:15:59 GMT\"0x8D7F3737A88E3C9\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:15:59 GMT6containerfca91462true01D6250A6E81EC48Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190F8CA83\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:29:38 GMT6existing7fb616dfFri, - 08 May 2020 17:47:41 GMT\"0x8D7F377E80C34B8\"unlockedavailable$account-encryption-keyfalsefalsefalseexistingfca91462true01D6250A6E71E3D2Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190E8C200\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restorecontainertrue01D625089FD6E953Fri, - 08 May 2020 07:16:42 GMT\"0x8D7F31FC24DE2CA\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:16 GMT7restorecontainer0true01D62509D5A4E99FFri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F81BF888\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restorecontainer1true01D62509D5C0DB1CFri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8381157\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:22 GMT7restorecontainer2true01D62509D5DCF3B0Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8540307\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:12 GMT7restored0true01D6250B2B42263AFri, - 08 May 2020 07:34:55 GMT\"0x8D7F3224DB9229A\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:26 GMT7restored1true01D6250B56A7DA74Fri, - 08 May 2020 07:36:08 GMT\"0x8D7F322791ED81E\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restored2true01D6250B7E124F9FFri, - 08 May 2020 07:37:14 GMT\"0x8D7F322A08947CF\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:12 GMT7restored3true01D6250BA2F2BE04Fri, - 08 May 2020 07:38:16 GMT\"0x8D7F322C569D2B5\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restored4true01D6250BC8654DA1Fri, - 08 May 2020 07:39:19 GMT\"0x8D7F322EADC58F5\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restoredcontainer0true01D6250689420C16Fri, - 08 May 2020 07:01:45 GMT\"0x8D7F31DABB8FEDE\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restoredcontainer2true01D625075381BF19Fri, - 08 May 2020 07:07:25 GMT\"0x8D7F31E75F8EDC3\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restoredcontainer3true01D625075663E118Fri, - 08 May 2020 07:07:29 GMT\"0x8D7F31E78DB14DA\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7restoredctn0Fri, - 08 May 2020 17:41:50 GMT\"0x8D7F37716C2C7DA\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredctn1Fri, - 08 May 2020 17:42:20 GMT\"0x8D7F37728D0B5D9\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredctn2Fri, - 08 May 2020 17:42:30 GMT\"0x8D7F3772E62EE4B\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredctn3Fri, - 08 May 2020 17:42:36 GMT\"0x8D7F3773247E93D\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredctn4Fri, - 08 May 2020 17:42:39 GMT\"0x8D7F37734265233\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredctn5Fri, - 08 May 2020 17:42:42 GMT\"0x8D7F37735CD7452\"unlockedavailable$account-encryption-keyfalsefalsefalserst20f8537e66b24e68b2a9681cee0a4539true01D6250476803F41Fri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B98F74205\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rst4a7f78c4fbe24a369acb73a3614f290btrue01D62504C08FE4E8Fri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE307232F\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rst4f9a00eb255c400d831cf41f72c3a3ddtrue01D625056E3CEF8AFri, - 08 May 2020 06:53:50 GMT\"0x8D7F31C90B3CDD9\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rst54c325d4d83e43c9a1bdbc8e0b916e4ftrue01D625047482DA79Fri, - 08 May 2020 06:46:51 GMT\"0x8D7F31B96FA0099\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rst60b2beebcaa942e8b77aec6fb545e41ctrue01D62504C0D78229Fri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE34EC10B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rst7916f0de0354443aac32f9b270bceca5true01D6250472A622F5Fri, - 08 May 2020 06:46:48 GMT\"0x8D7F31B951D45B0\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rst9405053c53ca4dfc94e5219b0110bb15true01D6250476EB496EFri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B9962741D\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:12 GMT7rstb5da911e0a504ef2bb475ff143ce16ectrue01D6250475C383E0Fri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B983A852E\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rstd3279fff13cb431bbd9a173a6f05bbcetrue01D62504C047D25DFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE2BEE8FD\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rstdc872f63b91149e0bcdab92207d26bd5true01D62504BFB9F794Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE2310D32\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:10 GMT7rstdf98568c66da45bdbf258910c1365f31true01D62504C000AA65Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE277E783\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:24 GMT7rste5fb5a4e1e654cc38a24d2229980ac42true01D62504753C12BEFri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B97B33A68\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7rstf26b8cb981e2419a83fae8ea45d48a73true01D6250536893968Fri, - 08 May 2020 06:52:17 GMT\"0x8D7F31C59005AE3\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:14 GMT7rstf8f674a6033047a4acb35b8ef0170ec8true01D6250572FF72FBFri, - 08 May 2020 06:53:58 GMT\"0x8D7F31C95767FE6\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:41:11 GMT7" - headers: - content-type: application/xml - date: Fri, 08 May 2020 17:48:08 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - transfer-encoding: chunked - x-ms-version: '2019-12-12' - status: - code: 200 - message: OK - url: https://emilyeuap.blob.core.windows.net/?include=deleted&comp=list -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:48:17 GMT - x-ms-deleted-container-name: - - acontainer7fb616df - x-ms-deleted-container-version: - - 01D62560C5A771A5 - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/existing7fb616df?restype=container&comp=undelete - response: - body: - string: "\uFEFF\nContainerAlreadyExistsThe - specified container already exists.\nRequestId:913a36d6-e01e-0098-5060-256dc1000000\nTime:2020-05-08T17:48:17.4211727Z" - headers: - content-length: '231' - content-type: application/xml - date: Fri, 08 May 2020 17:48:17 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: ContainerAlreadyExists - x-ms-version: '2019-12-12' - status: - code: 409 - message: The specified container already exists. - url: https://emilyeuap.blob.core.windows.net/existing7fb616df?restype=container&comp=undelete -version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_undelete_container.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_undelete_container.yaml index 2cf930132af6..4d3cb7492add 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_undelete_container.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_container_async.test_undelete_container.yaml @@ -2,523 +2,186 @@ interactions: - request: body: null headers: + Accept: + - application/xml User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 17:40:19 GMT + - Thu, 13 May 2021 03:22:16 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: PUT uri: https://storagename.blob.core.windows.net/acontainer993a1225?restype=container response: body: string: '' headers: - content-length: '0' - date: Fri, 08 May 2020 17:40:19 GMT - etag: '"0x8D7F376E0BE188D"' - last-modified: Fri, 08 May 2020 17:40:19 GMT + date: Thu, 13 May 2021 03:22:15 GMT + etag: '"0x8D915BE4ED649ED"' + last-modified: Thu, 13 May 2021 03:22:16 GMT server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' + transfer-encoding: chunked + x-ms-version: '2020-08-04' status: code: 201 message: Created - url: https://emilyeuap.blob.core.windows.net/acontainer993a1225?restype=container + url: https://tamerperf.blob.core.windows.net/acontainer993a1225?restype=container - request: body: null headers: + Accept: + - application/xml User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 17:40:19 GMT + - Thu, 13 May 2021 03:22:16 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: DELETE uri: https://storagename.blob.core.windows.net/acontainer993a1225?restype=container response: body: string: '' headers: - content-length: '0' - date: Fri, 08 May 2020 17:40:19 GMT + date: Thu, 13 May 2021 03:22:15 GMT server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' + transfer-encoding: chunked + x-ms-version: '2020-08-04' status: code: 202 message: Accepted - url: https://emilyeuap.blob.core.windows.net/acontainer993a1225?restype=container + url: https://tamerperf.blob.core.windows.net/acontainer993a1225?restype=container - request: body: null headers: + Accept: + - application/xml User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 17:40:20 GMT + - Thu, 13 May 2021 03:22:56 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: GET uri: https://storagename.blob.core.windows.net/acontainer993a1225?restype=container response: body: string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:c8adf9ae-d01e-003a-5e5f-2557d8000000\nTime:2020-05-08T17:40:20.0971333Z" + specified container does not exist.\nRequestId:b7fd2c70-f01e-007d-77a7-471875000000\nTime:2021-05-13T03:22:56.1269545Z" headers: content-length: '225' content-type: application/xml - date: Fri, 08 May 2020 17:40:19 GMT + date: Thu, 13 May 2021 03:22:55 GMT server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 x-ms-error-code: ContainerNotFound - x-ms-version: '2019-12-12' + x-ms-version: '2020-08-04' status: code: 404 message: The specified container does not exist. - url: https://emilyeuap.blob.core.windows.net/acontainer993a1225?restype=container + url: https://tamerperf.blob.core.windows.net/acontainer993a1225?restype=container - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 17:40:22 GMT + - Thu, 13 May 2021 03:22:56 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: GET - uri: https://storagename.blob.core.windows.net/?include=deleted&comp=list + uri: https://storagename.blob.core.windows.net/?comp=list&include=deleted response: body: string: "\uFEFFacontainer993a1225true01D6255E4418FAADFri, - 08 May 2020 17:29:45 GMT\"0x8D7F375668FCF49\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:29:45 GMT7acontainer993a1225true01D6255EB01C64AEFri, - 08 May 2020 17:32:46 GMT\"0x8D7F375D29306D2\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:32:46 GMT7acontainer993a1225true01D6255F0742A762Fri, - 08 May 2020 17:35:12 GMT\"0x8D7F37629B956F4\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:35:12 GMT7acontainer993a1225true01D6255F6D8D6859Fri, - 08 May 2020 17:38:04 GMT\"0x8D7F3769004234B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:38:04 GMT7acontainer993a1225true01D6255F84CBAA4EFri, - 08 May 2020 17:38:43 GMT\"0x8D7F376A7425F0B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:38:43 GMT7acontainer993a1225true01D6255FBE47ACF6Fri, - 08 May 2020 17:40:19 GMT\"0x8D7F376E0BE188D\"lockedleasedfixed$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:40:19 GMT7container0Fri, - 08 May 2020 07:04:31 GMT\"0x8D7F31E0ECAAE24\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer1Fri, - 08 May 2020 07:04:33 GMT\"0x8D7F31E0FE26D76\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer14430ef5true01D625576B350C1AFri, - 08 May 2020 16:40:44 GMT\"0x8D7F36E8DAC024F\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:40:44 GMT6container14430ef5true01D6255782184BE0Fri, - 08 May 2020 16:41:22 GMT\"0x8D7F36EA48F031D\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:41:23 GMT6container14430ef5true01D62557A0A33EDCFri, - 08 May 2020 16:42:14 GMT\"0x8D7F36EC319DF8A\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:42:14 GMT6container14430ef5true01D62557BA0CB435Fri, - 08 May 2020 16:42:56 GMT\"0x8D7F36EDC834D26\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:43:02 GMT6container14430ef5true01D6255889E71F26Fri, - 08 May 2020 16:48:45 GMT\"0x8D7F36FAC5E046B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:49:27 GMT6container14430ef5true01D62558BD8737BBFri, - 08 May 2020 16:50:12 GMT\"0x8D7F36FDFFDAE2B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:50:12 GMT6container14430ef5true01D62559037EF628Fri, - 08 May 2020 16:52:09 GMT\"0x8D7F37025F5833E\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:52:11 GMT6container14430ef5true01D6255924650F0EFri, - 08 May 2020 16:53:04 GMT\"0x8D7F37046DBDCDB\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 16:53:05 GMT6container14430ef5Fri, - 08 May 2020 16:53:41 GMT\"0x8D7F3705CD40E4A\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainerad0f17a3true01D6255ABD6865DDFri, - 08 May 2020 17:04:30 GMT\"0x8D7F371DFDF8AD6\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:04:31 GMT6containerad0f17a3true01D6255AE1F17BB9Fri, - 08 May 2020 17:05:32 GMT\"0x8D7F372046880AC\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:05:32 GMT6containerad0f17a3true01D6255AFE315D36Fri, - 08 May 2020 17:06:19 GMT\"0x8D7F37220A8149B\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:06:19 GMT6containerad0f17a3true01D6255B6A2EA962Fri, - 08 May 2020 17:09:20 GMT\"0x8D7F3728CA53418\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:09:20 GMT6containerad0f17a3true01D6255BBCCDD851Fri, - 08 May 2020 17:11:39 GMT\"0x8D7F372DF4435D0\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:11:39 GMT7containerad0f17a3true01D6255C5812487AFri, - 08 May 2020 17:15:59 GMT\"0x8D7F3737A88E3C9\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 17:15:59 GMT7containerfca91462true01D6250A6E81EC48Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190F8CA83\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 08 May 2020 07:29:38 GMT6existingfca91462Fri, - 08 May 2020 07:29:38 GMT\"0x8D7F32190E8C200\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainerFri, - 08 May 2020 07:16:42 GMT\"0x8D7F31FC24DE2CA\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer0Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F81BF888\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer1Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8381157\"unlockedavailable$account-encryption-keyfalsefalsefalserestorecontainer2Fri, - 08 May 2020 07:25:22 GMT\"0x8D7F320F8540307\"unlockedavailable$account-encryption-keyfalsefalsefalserestored0Fri, - 08 May 2020 07:34:55 GMT\"0x8D7F3224DB9229A\"unlockedavailable$account-encryption-keyfalsefalsefalserestored1Fri, - 08 May 2020 07:36:08 GMT\"0x8D7F322791ED81E\"unlockedavailable$account-encryption-keyfalsefalsefalserestored2Fri, - 08 May 2020 07:37:14 GMT\"0x8D7F322A08947CF\"unlockedavailable$account-encryption-keyfalsefalsefalserestored3Fri, - 08 May 2020 07:38:16 GMT\"0x8D7F322C569D2B5\"unlockedavailable$account-encryption-keyfalsefalsefalserestored4Fri, - 08 May 2020 07:39:19 GMT\"0x8D7F322EADC58F5\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer0Fri, - 08 May 2020 07:01:45 GMT\"0x8D7F31DABB8FEDE\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer2Fri, - 08 May 2020 07:07:25 GMT\"0x8D7F31E75F8EDC3\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredcontainer3Fri, - 08 May 2020 07:07:29 GMT\"0x8D7F31E78DB14DA\"unlockedavailable$account-encryption-keyfalsefalsefalserst20f8537e66b24e68b2a9681cee0a4539Fri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B98F74205\"unlockedavailable$account-encryption-keyfalsefalsefalserst4a7f78c4fbe24a369acb73a3614f290bFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE307232F\"unlockedavailable$account-encryption-keyfalsefalsefalserst4f9a00eb255c400d831cf41f72c3a3ddFri, - 08 May 2020 06:53:50 GMT\"0x8D7F31C90B3CDD9\"unlockedavailable$account-encryption-keyfalsefalsefalserst54c325d4d83e43c9a1bdbc8e0b916e4fFri, - 08 May 2020 06:46:51 GMT\"0x8D7F31B96FA0099\"unlockedavailable$account-encryption-keyfalsefalsefalserst60b2beebcaa942e8b77aec6fb545e41cFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE34EC10B\"unlockedavailable$account-encryption-keyfalsefalsefalserst7916f0de0354443aac32f9b270bceca5Fri, - 08 May 2020 06:46:48 GMT\"0x8D7F31B951D45B0\"unlockedavailable$account-encryption-keyfalsefalsefalserst9405053c53ca4dfc94e5219b0110bb15Fri, - 08 May 2020 06:46:55 GMT\"0x8D7F31B9962741D\"unlockedavailable$account-encryption-keyfalsefalsefalserstb5da911e0a504ef2bb475ff143ce16ecFri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B983A852E\"unlockedavailable$account-encryption-keyfalsefalsefalserstd3279fff13cb431bbd9a173a6f05bbceFri, - 08 May 2020 06:48:59 GMT\"0x8D7F31BE2BEE8FD\"unlockedavailable$account-encryption-keyfalsefalsefalserstdc872f63b91149e0bcdab92207d26bd5Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE2310D32\"unlockedavailable$account-encryption-keyfalsefalsefalserstdf98568c66da45bdbf258910c1365f31Fri, - 08 May 2020 06:48:58 GMT\"0x8D7F31BE277E783\"unlockedavailable$account-encryption-keyfalsefalsefalserste5fb5a4e1e654cc38a24d2229980ac42Fri, - 08 May 2020 06:46:53 GMT\"0x8D7F31B97B33A68\"unlockedavailable$account-encryption-keyfalsefalsefalserstf26b8cb981e2419a83fae8ea45d48a73Fri, - 08 May 2020 06:52:17 GMT\"0x8D7F31C59005AE3\"unlockedavailable$account-encryption-keyfalsefalsefalserstf8f674a6033047a4acb35b8ef0170ec8Fri, - 08 May 2020 06:53:58 GMT\"0x8D7F31C95767FE6\"unlockedavailable$account-encryption-keyfalsefalsefalseacontainer993a1225true01D747A72C5FA014Thu, + 13 May 2021 03:22:16 GMT\"0x8D915BE4ED649ED\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 03:22:16 GMT7container319b0fa8Thu, + 13 May 2021 02:34:15 GMT\"0x8D915B799B9CFC4\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainer775b16a0Sun, + 25 Apr 2021 23:57:06 GMT\"0x8D90845D4B76C02\"unlockedavailable$account-encryption-keyfalsefalsefalsecontaineraa031289Thu, + 22 Apr 2021 00:45:42 GMT\"0x8D90527F51A7A7E\"unlockedavailable$account-encryption-keyfalsefalsefalsecontainerfca91462Thu, + 13 May 2021 02:42:35 GMT\"0x8D915B8C3DB6562\"unlockedavailable$account-encryption-keyfalsefalsefalseexistingfca91462Thu, + 13 May 2021 02:41:54 GMT\"0x8D915B8ABBFADE0\"unlockedavailable$account-encryption-keyfalsefalsefalsefge775b16a0Sun, + 25 Apr 2021 23:58:46 GMT\"0x8D90846101C0D39\"unlockedavailable$account-encryption-keyfalsefalsefalsefsdaa031289Thu, + 22 Apr 2021 00:47:47 GMT\"0x8D905283FDD92F0\"unlockedavailable$account-encryption-keyfalsefalsefalsetestcontMon, + 19 Apr 2021 23:48:23 GMT\"0x8D9038D9E67A498\"unlockedavailable$account-encryption-keyfalsefalsefalseutcontainer8ad716e9Wed, + 12 May 2021 21:13:57 GMT\"0x8D9158ADB3F30CD\"unlockedavailable$account-encryption-keyfalsefalsefalseutcontainerbd9a17d3Mon, + 10 May 2021 20:09:32 GMT\"0x8D913EF86535D1B\"unlockedavailable$account-encryption-keyfalsefalsefalseutcontainerd6f71856Mon, + 10 May 2021 20:08:58 GMT\"0x8D913EF726C52A7\"unlockedavailable$account-encryption-keyfalsefalsefalseutqqcontainerb38317dfTue, + 27 Apr 2021 20:47:09 GMT\"0x8D909BDA06D37D0\"unlockedavailable$account-encryption-keyfalsefalsefalseutqqcontainere29c188bTue, + 11 May 2021 21:05:20 GMT\"0x8D914C07C6B5234\"unlockedavailable$account-encryption-keyfalsefalsefalse" headers: content-type: application/xml - date: Fri, 08 May 2020 17:40:21 GMT + date: Thu, 13 May 2021 03:22:55 GMT server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked - x-ms-version: '2019-12-12' - status: - code: 200 - message: OK - url: https://emilyeuap.blob.core.windows.net/?include=deleted&comp=list -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:41:50 GMT - x-ms-deleted-container-name: - - acontainer993a1225 - x-ms-deleted-container-version: - - 01D6255E4418FAAD - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredctn0?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:41:50 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' - status: - code: 201 - message: Created - url: https://emilyeuap.blob.core.windows.net/restoredctn0?restype=container&comp=undelete -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:41:59 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restoredctn0?restype=container - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:41:59 GMT - etag: '"0x8D7F37716C2C7DA"' - last-modified: Fri, 08 May 2020 17:41:50 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-version: '2019-12-12' - status: - code: 200 - message: OK - url: https://emilyeuap.blob.core.windows.net/restoredctn0?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:20 GMT - x-ms-deleted-container-name: - - acontainer993a1225 - x-ms-deleted-container-version: - - 01D6255EB01C64AE - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredctn1?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:20 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' - status: - code: 201 - message: Created - url: https://emilyeuap.blob.core.windows.net/restoredctn1?restype=container&comp=undelete -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:23 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restoredctn1?restype=container - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:22 GMT - etag: '"0x8D7F37728D0B5D9"' - last-modified: Fri, 08 May 2020 17:42:20 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-version: '2019-12-12' - status: - code: 200 - message: OK - url: https://emilyeuap.blob.core.windows.net/restoredctn1?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:30 GMT - x-ms-deleted-container-name: - - acontainer993a1225 - x-ms-deleted-container-version: - - 01D6255F0742A762 - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredctn2?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:29 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' - status: - code: 201 - message: Created - url: https://emilyeuap.blob.core.windows.net/restoredctn2?restype=container&comp=undelete -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:32 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restoredctn2?restype=container - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:32 GMT - etag: '"0x8D7F3772E62EE4B"' - last-modified: Fri, 08 May 2020 17:42:30 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-version: '2019-12-12' + x-ms-version: '2020-08-04' status: code: 200 message: OK - url: https://emilyeuap.blob.core.windows.net/restoredctn2?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:36 GMT - x-ms-deleted-container-name: - - acontainer993a1225 - x-ms-deleted-container-version: - - 01D6255F6D8D6859 - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredctn3?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:36 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' - status: - code: 201 - message: Created - url: https://emilyeuap.blob.core.windows.net/restoredctn3?restype=container&comp=undelete + url: https://tamerperf.blob.core.windows.net/?comp=list&include=deleted - request: body: null headers: + Accept: + - application/xml User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:38 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restoredctn3?restype=container - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:37 GMT - etag: '"0x8D7F3773247E93D"' - last-modified: Fri, 08 May 2020 17:42:36 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-version: '2019-12-12' - status: - code: 200 - message: OK - url: https://emilyeuap.blob.core.windows.net/restoredctn3?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:39 GMT - x-ms-deleted-container-name: - - acontainer993a1225 - x-ms-deleted-container-version: - - 01D6255F84CBAA4E - x-ms-version: - - '2019-12-12' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredctn4?restype=container&comp=undelete - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:39 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' - status: - code: 201 - message: Created - url: https://emilyeuap.blob.core.windows.net/restoredctn4?restype=container&comp=undelete -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) - x-ms-date: - - Fri, 08 May 2020 17:42:41 GMT - x-ms-version: - - '2019-12-12' - method: GET - uri: https://storagename.blob.core.windows.net/restoredctn4?restype=container - response: - body: - string: '' - headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:40 GMT - etag: '"0x8D7F37734265233"' - last-modified: Fri, 08 May 2020 17:42:39 GMT - server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-version: '2019-12-12' - status: - code: 200 - message: OK - url: https://emilyeuap.blob.core.windows.net/restoredctn4?restype=container -- request: - body: null - headers: - User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 17:42:42 GMT + - Thu, 13 May 2021 03:22:56 GMT x-ms-deleted-container-name: - acontainer993a1225 x-ms-deleted-container-version: - - 01D6255FBE47ACF6 + - 01D747A72C5FA014 x-ms-version: - - '2019-12-12' + - '2020-08-04' method: PUT - uri: https://storagename.blob.core.windows.net/restoredctn5?restype=container&comp=undelete + uri: https://storagename.blob.core.windows.net/acontainer993a1225?restype=container&comp=undelete response: body: string: '' headers: content-length: '0' - date: Fri, 08 May 2020 17:42:42 GMT + date: Thu, 13 May 2021 03:22:55 GMT server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-version: '2019-12-12' + x-ms-version: '2020-08-04' status: code: 201 message: Created - url: https://emilyeuap.blob.core.windows.net/restoredctn5?restype=container&comp=undelete + url: https://tamerperf.blob.core.windows.net/acontainer993a1225?restype=container&comp=undelete - request: body: null headers: + Accept: + - application/xml User-Agent: - - azsdk-python-storage-blob/12.3.2 Python/3.7.3 (Windows-10-10.0.18362-SP0) + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Fri, 08 May 2020 17:42:43 GMT + - Thu, 13 May 2021 03:22:56 GMT x-ms-version: - - '2019-12-12' + - '2020-08-04' method: GET - uri: https://storagename.blob.core.windows.net/restoredctn5?restype=container + uri: https://storagename.blob.core.windows.net/acontainer993a1225?restype=container response: body: string: '' headers: - content-length: '0' - date: Fri, 08 May 2020 17:42:43 GMT - etag: '"0x8D7F37735CD7452"' - last-modified: Fri, 08 May 2020 17:42:42 GMT + date: Thu, 13 May 2021 03:22:55 GMT + etag: '"0x8D915BE66C902ED"' + last-modified: Thu, 13 May 2021 03:22:56 GMT server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: chunked x-ms-default-encryption-scope: $account-encryption-key x-ms-deny-encryption-scope-override: 'false' x-ms-has-immutability-policy: 'false' x-ms-has-legal-hold: 'false' x-ms-lease-state: available x-ms-lease-status: unlocked - x-ms-version: '2019-12-12' + x-ms-version: '2020-08-04' status: code: 200 message: OK - url: https://emilyeuap.blob.core.windows.net/restoredctn5?restype=container + url: https://tamerperf.blob.core.windows.net/acontainer993a1225?restype=container version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/test_container.py b/sdk/storage/azure-storage-blob/tests/test_container.py index 4608f7a7bc17..0b5000f208c0 100644 --- a/sdk/storage/azure-storage-blob/tests/test_container.py +++ b/sdk/storage/azure-storage-blob/tests/test_container.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- import sys +import time from datetime import datetime, timedelta from time import sleep @@ -795,8 +796,7 @@ def test_delete_container_with_lease_id(self, resource_group, location, storage_ @pytest.mark.playback_test_only @GlobalStorageAccountPreparer() def test_undelete_container(self, resource_group, location, storage_account, storage_account_key): - # container soft delete should enabled by SRP call or use armclient, so make this test as playback only. - + # TODO: container soft delete should enabled by SRP call or use ARM, so make this test as playback only. bsc = BlobServiceClient(self.account_url(storage_account, "blob"), storage_account_key) container_client = self._create_container(bsc) @@ -809,49 +809,20 @@ def test_undelete_container(self, resource_group, location, storage_account, sto container_list = list(bsc.list_containers(include_deleted=True)) self.assertTrue(len(container_list) >= 1) - restored_version = 0 for container in container_list: # find the deleted container and restore it if container.deleted and container.name == container_client.container_name: - restored_ctn_client = bsc.undelete_container(container.name, container.version, - new_name="restored" + str(restored_version)) - restored_version += 1 + restored_ctn_client = bsc.undelete_container(container.name, container.version) # to make sure the deleted container is restored props = restored_ctn_client.get_container_properties() self.assertIsNotNone(props) - @pytest.mark.playback_test_only - @GlobalStorageAccountPreparer() - def test_restore_to_existing_container(self, resource_group, location, storage_account, storage_account_key): - # container soft delete should enabled by SRP call or use armclient, so make this test as playback only. - - bsc = BlobServiceClient(self.account_url(storage_account, "blob"), storage_account_key) - # get an existing container - existing_container_client = self._create_container(bsc, prefix="existing") - container_client = self._create_container(bsc) - - # Act - container_client.delete_container() - # to make sure the container deleted - with self.assertRaises(ResourceNotFoundError): - container_client.get_container_properties() - - container_list = list(bsc.list_containers(include_deleted=True)) - self.assertTrue(len(container_list) >= 1) - - for container in container_list: - # find the deleted container and restore it - if container.deleted and container.name == container_client.container_name: - with self.assertRaises(HttpResponseError): - bsc.undelete_container(container.name, container.version, - new_name=existing_container_client.container_name) - @pytest.mark.live_test_only # sas token is dynamically generated @pytest.mark.playback_test_only # we need container soft delete enabled account @GlobalStorageAccountPreparer() def test_restore_with_sas(self, resource_group, location, storage_account, storage_account_key): - # container soft delete should enabled by SRP call or use armclient, so make this test as playback only. + # TODO: container soft delete should enabled by SRP call or use ARM, so make this test as playback only. token = generate_account_sas( storage_account.name, storage_account_key, @@ -873,9 +844,7 @@ def test_restore_with_sas(self, resource_group, location, storage_account, stora for container in container_list: # find the deleted container and restore it if container.deleted and container.name == container_client.container_name: - restored_ctn_client = bsc.undelete_container(container.name, container.version, - new_name="restored" + str(restored_version)) - restored_version += 1 + restored_ctn_client = bsc.undelete_container(container.name, container.version) # to make sure the deleted container is restored props = restored_ctn_client.get_container_properties() diff --git a/sdk/storage/azure-storage-blob/tests/test_container_async.py b/sdk/storage/azure-storage-blob/tests/test_container_async.py index c6d60e99ddd9..6b2642b84196 100644 --- a/sdk/storage/azure-storage-blob/tests/test_container_async.py +++ b/sdk/storage/azure-storage-blob/tests/test_container_async.py @@ -5,6 +5,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- +import time from time import sleep import pytest @@ -869,8 +870,7 @@ async def test_delete_container_with_lease_id(self, resource_group, location, st @GlobalStorageAccountPreparer() @AsyncStorageTestCase.await_prepared_test async def test_undelete_container(self, resource_group, location, storage_account, storage_account_key): - # container soft delete should enabled by SRP call or use armclient, so make this test as playback only. - pytest.skip('This will be added back along with STG74 features') + # TODO: container soft delete should enabled by SRP call or use ARM, so make this test as playback only. bsc = BlobServiceClient(self.account_url(storage_account, "blob"), storage_account_key) container_client = await self._create_container(bsc) @@ -885,48 +885,15 @@ async def test_undelete_container(self, resource_group, location, storage_accoun container_list.append(c) self.assertTrue(len(container_list) >= 1) - restored_version = 0 for container in container_list: # find the deleted container and restore it if container.deleted and container.name == container_client.container_name: - restored_ctn_client = await bsc.undelete_container(container.name, container.version, - new_name="restoredctn" + str(restored_version)) - restored_version += 1 + restored_ctn_client = await bsc.undelete_container(container.name, container.version) # to make sure the deleted container is restored props = await restored_ctn_client.get_container_properties() self.assertIsNotNone(props) - @pytest.mark.playback_test_only - @GlobalStorageAccountPreparer() - @AsyncStorageTestCase.await_prepared_test - async def test_restore_to_existing_container(self, resource_group, location, storage_account, storage_account_key): - pytest.skip('This will be added back along with STG74 features') - # container soft delete should enabled by SRP call or use armclient, so make this test as playback only. - - bsc = BlobServiceClient(self.account_url(storage_account, "blob"), storage_account_key) - # get an existing container - existing_container_client = await self._create_container(bsc, prefix="existing") - container_client = await self._create_container(bsc) - - # Act - await container_client.delete_container() - # to make sure the container deleted - with self.assertRaises(ResourceNotFoundError): - await container_client.get_container_properties() - - container_list = list() - async for c in bsc.list_containers(include_deleted=True): - container_list.append(c) - self.assertTrue(len(container_list) >= 1) - - for container in container_list: - # find the deleted container and restore it - if container.deleted and container.name == container_client.container_name: - with self.assertRaises(HttpResponseError): - await bsc.undelete_container(container.name, container.version, - new_name=existing_container_client.container_name) - @GlobalStorageAccountPreparer() @AsyncStorageTestCase.await_prepared_test async def test_list_names(self, resource_group, location, storage_account, storage_account_key): diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_data_lake_service_client.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_data_lake_service_client.py index 5aa17894baf0..211df05827c2 100644 --- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_data_lake_service_client.py +++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_data_lake_service_client.py @@ -294,9 +294,6 @@ def undelete_file_system(self, name, deleted_version, **kwargs): Specifies the name of the deleted filesystem to restore. :param str deleted_version: Specifies the version of the deleted filesystem to restore. - :keyword str new_name: - The new name for the deleted filesystem to be restored to. - If not specified "name" will be used as the restored filesystem name. :keyword int timeout: The timeout parameter is expressed in seconds. :rtype: ~azure.storage.filedatalake.FileSystemClient diff --git a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/aio/_data_lake_service_client_async.py b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/aio/_data_lake_service_client_async.py index da01081e2342..76493e89c5b6 100644 --- a/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/aio/_data_lake_service_client_async.py +++ b/sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/aio/_data_lake_service_client_async.py @@ -244,9 +244,6 @@ async def undelete_file_system(self, name, deleted_version, **kwargs): Specifies the name of the deleted filesystem to restore. :param str deleted_version: Specifies the version of the deleted filesystem to restore. - :keyword str new_name: - The new name for the deleted filesystem to be restored to. - If not specified "name" will be used as the restored filesystem name. :keyword int timeout: The timeout parameter is expressed in seconds. :rtype: ~azure.storage.filedatalake.FileSystemClient diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_restore_to_existing_file_system.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_restore_to_existing_file_system.yaml deleted file mode 100644 index 6d8e34fa3a3c..000000000000 --- a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_restore_to_existing_file_system.yaml +++ /dev/null @@ -1,319 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - e5ff238f-64f6-11eb-8f9b-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 01:35:14 GMT - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/existing254311624?restype=container - response: - body: - string: '' - headers: - Content-Length: - - '0' - Date: - - Tue, 02 Feb 2021 01:35:15 GMT - ETag: - - '"0x8D8C71ACA8011D2"' - Last-Modified: - - Tue, 02 Feb 2021 01:35:15 GMT - Server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: - - 04537828-b01e-00dc-0503-f96002000000 - x-ms-version: - - '2020-04-08' - status: - code: 201 - message: Created -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - e67b7f94-64f6-11eb-b0b4-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 01:35:15 GMT - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/filesystem254311624?restype=container - response: - body: - string: '' - headers: - Content-Length: - - '0' - Date: - - Tue, 02 Feb 2021 01:35:15 GMT - ETag: - - '"0x8D8C71ACAAA36C8"' - Last-Modified: - - Tue, 02 Feb 2021 01:35:15 GMT - Server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: - - 0453793e-b01e-00dc-7e03-f96002000000 - x-ms-version: - - '2020-04-08' - status: - code: 201 - message: Created -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - e6a3546e-64f6-11eb-9406-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 01:35:15 GMT - x-ms-version: - - '2020-04-08' - method: DELETE - uri: https://storagename.blob.core.windows.net/filesystem254311624?restype=container - response: - body: - string: '' - headers: - Content-Length: - - '0' - Date: - - Tue, 02 Feb 2021 01:35:15 GMT - Server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: - - 04537a10-b01e-00dc-3703-f96002000000 - x-ms-version: - - '2020-04-08' - status: - code: 202 - message: Accepted -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - e6ca89e7-64f6-11eb-8116-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 01:35:16 GMT - x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/filesystem254311624?restype=container - response: - body: - string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:04537b15-b01e-00dc-2003-f96002000000\nTime:2021-02-02T01:35:16.1368815Z" - headers: - Content-Length: - - '225' - Content-Type: - - application/xml - Date: - - Tue, 02 Feb 2021 01:35:15 GMT - Server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: - - ContainerNotFound - x-ms-request-id: - - 04537b15-b01e-00dc-2003-f96002000000 - x-ms-version: - - '2020-04-08' - status: - code: 404 - message: The specified container does not exist. -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - e6f14bc1-64f6-11eb-839c-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 01:35:16 GMT - x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/?comp=list&include=deleted - response: - body: - string: "\uFEFFexisting254311624Tue, - 02 Feb 2021 01:35:15 GMT\"0x8D8C71ACA8011D2\"unlockedavailable$account-encryption-keyfalsefalsefalsefilcxcdnvsxcesys175f5116atrue01D6F6A0314E9488Sat, - 30 Jan 2021 00:38:13 GMT\"0x8D8C4B753C56913\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:15 GMT3filcxcdsxcesys175f5116atrue01D6F69EDA93DBBASat, - 30 Jan 2021 00:28:38 GMT\"0x8D8C4B5FD0A8288\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:28:38 GMT3filcxcxcesys175f5116atrue01D6F69E94CC30CDSat, - 30 Jan 2021 00:26:41 GMT\"0x8D8C4B5B74314B8\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:16 GMT3filessfgew75f5116atrue01D6F69D22040FCESat, - 30 Jan 2021 00:16:19 GMT\"0x8D8C4B4447B0328\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:18:22 GMT3filesys175f5116atrue01D6F69BE495951CSat, - 30 Jan 2021 00:07:26 GMT\"0x8D8C4B3070C883F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:32 GMT3filesys75f5116atrue01D6F69B95D1800ASat, - 30 Jan 2021 00:05:14 GMT\"0x8D8C4B2B8486C99\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:24 GMT3filesys75f5116atrue01D6F8F232563195Mon, - 01 Feb 2021 23:30:16 GMT\"0x8D8C70954CCC24A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:30:16 GMT6filesystem175f5116atrue01D6F425B15C30B0Tue, - 26 Jan 2021 20:56:18 GMT\"0x8D8C23CD3D2A095\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 20:56:18 GMT0filesystem254311624true01D6F903A8344A52Tue, - 02 Feb 2021 01:35:15 GMT\"0x8D8C71ACAAA36C8\"lockedleasedfixed$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:35:15 GMT7filesystem275f5116atrue01D6F426474ECD99Tue, - 26 Jan 2021 21:00:29 GMT\"0x8D8C23D69C52786\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 21:00:30 GMT0filesystem275f5116atrue01D6F4265E1ACE96Tue, - 26 Jan 2021 21:01:07 GMT\"0x8D8C23D80917D53\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:30 GMT3filesystem8e7c0a7etrue01D6F44707744B9EWed, - 27 Jan 2021 00:54:55 GMT\"0x8D8C25E29EAFAEE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:18 GMT3filmcxncxcdndsvsxcesys175f5116atrue01D6F6A0ABD10C88Sat, - 30 Jan 2021 00:41:39 GMT\"0x8D8C4B7CE47C1CD\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:41:39 GMT3filmncxcdndsvsxcesys175f5116atrue01D6F6A07CBEC3CCSat, - 30 Jan 2021 00:40:20 GMT\"0x8D8C4B79F355F2F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:40:21 GMT3filmncxcdnvsxcesys175f5116atrue01D6F6A041C633BASat, - 30 Jan 2021 00:38:41 GMT\"0x8D8C4B7643CD5CF\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:38:42 GMT3filurtdesystem75f5116atrue01D6F69AB4E4BD0BFri, - 29 Jan 2021 23:58:57 GMT\"0x8D8C4B1D75B2E99\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 29 Jan 2021 23:58:57 GMT3fs141b81006true01D6F4EE87D66711Wed, - 27 Jan 2021 20:53:57 GMT\"0x8D8C305AA4CEEF6\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:16 GMT3fs175f5116atrue01D6F69B47B7267ESat, - 30 Jan 2021 00:03:03 GMT\"0x8D8C4B26A2DD1E9\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:03:04 GMT3fs341b81006true01D6F4F0B1060E67Wed, - 27 Jan 2021 21:09:25 GMT\"0x8D8C307D37CB1FE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:26 GMT3fs41b81006true01D6F4EE35D82B82Wed, - 27 Jan 2021 20:51:39 GMT\"0x8D8C305584EC8E2\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:22 GMT3restored0true01D6F8E50988873FMon, - 01 Feb 2021 21:56:04 GMT\"0x8D8C6FC2BFF86B7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:15 GMT6restored1true01D6F8E525045EF5Mon, - 01 Feb 2021 21:56:50 GMT\"0x8D8C6FC477B5D19\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:17 GMT6restoredfilesystem75f5116a0true01D6F8F27BAD1D74Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E241EE7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:17 GMT6restoredfilesystem75f5116a0true01D6F8F2E932F8F0Mon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BA9E8F6\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:55 GMT6restoredfilesystem75f5116a0true01D6F8F38E3D749AMon, - 01 Feb 2021 23:40:00 GMT\"0x8D8C70AB0B45C7F\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:08 GMT6restoredfilesystem75f5116a0true01D6F8F4CF045569Mon, - 01 Feb 2021 23:48:58 GMT\"0x8D8C70BF17B490E\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 00:37:58 GMT6restoredfilesystem75f5116a0Tue, - 02 Feb 2021 00:44:41 GMT\"0x8D8C713BA05A9BC\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredfilesystem75f5116a1true01D6F8F27BC62852Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E3D2A0A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:15 GMT6restoredfilesystem75f5116a1true01D6F8F2E94C2ADCMon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BC31B26\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:56 GMT6restoredfilesystem75f5116a1true01D6F8F3983A11ABMon, - 01 Feb 2021 23:40:16 GMT\"0x8D8C70ABAB11582\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:06 GMT6restoredfilesystem75f5116a1Tue, - 02 Feb 2021 00:44:53 GMT\"0x8D8C713C111B556\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredfilesystem75f5116a2true01D6F8F27BDFF69BMon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E56D188\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:11 GMT6restoredfilesystem75f5116a3true01D6F8F27BF86518Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E6F4042\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:13 GMT6testingtamertrue01D6F4250554AFFCTue, - 26 Jan 2021 20:51:57 GMT\"0x8D8C23C38CE1730\"unlockedexpiredcontainer$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:28 GMT3" - headers: - Content-Type: - - application/xml - Date: - - Tue, 02 Feb 2021 01:35:16 GMT - Server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - Transfer-Encoding: - - chunked - x-ms-request-id: - - 0b97f966-001e-0084-6a03-f9b85d000000 - x-ms-version: - - '2020-04-08' - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '0' - User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 03db6f54-64f7-11eb-8547-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 01:36:04 GMT - x-ms-deleted-container-name: - - filesystem254311624 - x-ms-deleted-container-version: - - 01D6F903A8344A52 - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/existing254311624?restype=container&comp=undelete - response: - body: - string: "\uFEFF\nContainerAlreadyExistsThe - specified container already exists.\nRequestId:0b987135-001e-0084-2003-f9b85d000000\nTime:2021-02-02T01:36:05.0943347Z" - headers: - Content-Length: - - '231' - Content-Type: - - application/xml - Date: - - Tue, 02 Feb 2021 01:36:04 GMT - Server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: - - ContainerAlreadyExists - x-ms-request-id: - - 0b987135-001e-0084-2003-f9b85d000000 - x-ms-version: - - '2020-04-08' - status: - code: 409 - message: The specified container already exists. -version: 1 diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_undelete_file_system.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_undelete_file_system.yaml index afc786c75bc1..55776e49b3ec 100644 --- a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_undelete_file_system.yaml +++ b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_undelete_file_system.yaml @@ -11,33 +11,29 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 9a5edcf7-64ef-11eb-9169-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 00:43:01 GMT + - Thu, 13 May 2021 02:18:01 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: PUT - uri: https://storagename.blob.core.windows.net/filesystem75f5116a?restype=container + uri: https://storagename.blob.core.windows.net/testfs75f5116a?restype=container response: body: string: '' headers: - Content-Length: + content-length: - '0' - Date: - - Tue, 02 Feb 2021 00:43:04 GMT - ETag: - - '"0x8D8C7137F31F1F8"' - Last-Modified: - - Tue, 02 Feb 2021 00:43:02 GMT - Server: + date: + - Thu, 13 May 2021 02:18:00 GMT + etag: + - '"0x8D915B555007A06"' + last-modified: + - Thu, 13 May 2021 02:18:00 GMT + server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: - - c890cdb1-201e-0093-31fc-f81156000000 x-ms-version: - - '2020-04-08' + - '2020-08-04' status: code: 201 message: Created @@ -53,29 +49,25 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 9c8d9e73-64ef-11eb-94e6-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 00:43:05 GMT + - Thu, 13 May 2021 02:18:01 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: DELETE - uri: https://storagename.blob.core.windows.net/filesystem75f5116a?restype=container + uri: https://storagename.blob.core.windows.net/testfs75f5116a?restype=container response: body: string: '' headers: - Content-Length: + content-length: - '0' - Date: - - Tue, 02 Feb 2021 00:43:04 GMT - Server: + date: + - Thu, 13 May 2021 02:18:00 GMT + server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: - - c890d487-201e-0093-6ffc-f81156000000 x-ms-version: - - '2020-04-08' + - '2020-08-04' status: code: 202 message: Accepted @@ -89,34 +81,30 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 9cc0b4ac-64ef-11eb-8114-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 00:43:05 GMT + - Thu, 13 May 2021 02:18:41 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: GET - uri: https://storagename.blob.core.windows.net/filesystem75f5116a?restype=container + uri: https://storagename.blob.core.windows.net/testfs75f5116a?restype=container response: body: string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:c890d571-201e-0093-2bfc-f81156000000\nTime:2021-02-02T00:43:05.5532742Z" + specified container does not exist.\nRequestId:c2e99ef2-b01e-000a-3d9e-473b5a000000\nTime:2021-05-13T02:18:41.1647521Z" headers: - Content-Length: + content-length: - '225' - Content-Type: + content-type: - application/xml - Date: - - Tue, 02 Feb 2021 00:43:04 GMT - Server: + date: + - Thu, 13 May 2021 02:18:40 GMT + server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 x-ms-error-code: - ContainerNotFound - x-ms-request-id: - - c890d571-201e-0093-2bfc-f81156000000 x-ms-version: - - '2020-04-08' + - '2020-08-04' status: code: 404 message: The specified container does not exist. @@ -130,99 +118,53 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 9cfa236b-64ef-11eb-b034-c8348e5fffbc + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 00:43:05 GMT + - Thu, 13 May 2021 02:18:41 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: GET uri: https://storagename.blob.core.windows.net/?comp=list&include=deleted response: body: string: "\uFEFFfilcxcdnvsxcesys175f5116atrue01D6F6A0314E9488Sat, - 30 Jan 2021 00:38:13 GMT\"0x8D8C4B753C56913\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:15 GMT4filcxcdsxcesys175f5116atrue01D6F69EDA93DBBASat, - 30 Jan 2021 00:28:38 GMT\"0x8D8C4B5FD0A8288\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:28:38 GMT4filcxcxcesys175f5116atrue01D6F69E94CC30CDSat, - 30 Jan 2021 00:26:41 GMT\"0x8D8C4B5B74314B8\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:16 GMT4filessfgew75f5116atrue01D6F69D22040FCESat, - 30 Jan 2021 00:16:19 GMT\"0x8D8C4B4447B0328\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:18:22 GMT4filesys175f5116atrue01D6F69BE495951CSat, - 30 Jan 2021 00:07:26 GMT\"0x8D8C4B3070C883F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:32 GMT4filesys75f5116atrue01D6F69B95D1800ASat, - 30 Jan 2021 00:05:14 GMT\"0x8D8C4B2B8486C99\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:24 GMT4filesys75f5116atrue01D6F8F232563195Mon, - 01 Feb 2021 23:30:16 GMT\"0x8D8C70954CCC24A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:30:16 GMT6filesystem175f5116atrue01D6F425B15C30B0Tue, - 26 Jan 2021 20:56:18 GMT\"0x8D8C23CD3D2A095\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 20:56:18 GMT0filesystem275f5116atrue01D6F426474ECD99Tue, - 26 Jan 2021 21:00:29 GMT\"0x8D8C23D69C52786\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 21:00:30 GMT0filesystem275f5116atrue01D6F4265E1ACE96Tue, - 26 Jan 2021 21:01:07 GMT\"0x8D8C23D80917D53\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:30 GMT4filesystem75f5116atrue01D6F8F46C9F8125Mon, - 01 Feb 2021 23:46:13 GMT\"0x8D8C70B8F15C6B7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:46:13 GMT6filesystem75f5116atrue01D6F8FC5CBB8973Tue, - 02 Feb 2021 00:43:02 GMT\"0x8D8C7137F31F1F8\"lockedleasedfixed$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 00:43:05 GMT7filesystem8e7c0a7etrue01D6F44707744B9EWed, - 27 Jan 2021 00:54:55 GMT\"0x8D8C25E29EAFAEE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:18 GMT4filmcxncxcdndsvsxcesys175f5116atrue01D6F6A0ABD10C88Sat, - 30 Jan 2021 00:41:39 GMT\"0x8D8C4B7CE47C1CD\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:41:39 GMT4filmncxcdndsvsxcesys175f5116atrue01D6F6A07CBEC3CCSat, - 30 Jan 2021 00:40:20 GMT\"0x8D8C4B79F355F2F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:40:21 GMT4filmncxcdnvsxcesys175f5116atrue01D6F6A041C633BASat, - 30 Jan 2021 00:38:41 GMT\"0x8D8C4B7643CD5CF\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:38:42 GMT4filurtdesystem75f5116atrue01D6F69AB4E4BD0BFri, - 29 Jan 2021 23:58:57 GMT\"0x8D8C4B1D75B2E99\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 29 Jan 2021 23:58:57 GMT3fs141b81006true01D6F4EE87D66711Wed, - 27 Jan 2021 20:53:57 GMT\"0x8D8C305AA4CEEF6\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:16 GMT4fs175f5116atrue01D6F69B47B7267ESat, - 30 Jan 2021 00:03:03 GMT\"0x8D8C4B26A2DD1E9\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:03:04 GMT3fs341b81006true01D6F4F0B1060E67Wed, - 27 Jan 2021 21:09:25 GMT\"0x8D8C307D37CB1FE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:26 GMT4fs41b81006true01D6F4EE35D82B82Wed, - 27 Jan 2021 20:51:39 GMT\"0x8D8C305584EC8E2\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:22 GMT4restored0true01D6F8E50988873FMon, - 01 Feb 2021 21:56:04 GMT\"0x8D8C6FC2BFF86B7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:15 GMT6restored1true01D6F8E525045EF5Mon, - 01 Feb 2021 21:56:50 GMT\"0x8D8C6FC477B5D19\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:17 GMT6restoredfilesystem75f5116a0true01D6F8F27BAD1D74Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E241EE7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:17 GMT6restoredfilesystem75f5116a0true01D6F8F2E932F8F0Mon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BA9E8F6\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:55 GMT6restoredfilesystem75f5116a0true01D6F8F38E3D749AMon, - 01 Feb 2021 23:40:00 GMT\"0x8D8C70AB0B45C7F\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:08 GMT6restoredfilesystem75f5116a0true01D6F8F4CF045569Mon, - 01 Feb 2021 23:48:58 GMT\"0x8D8C70BF17B490E\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 00:37:58 GMT7restoredfilesystem75f5116a1true01D6F8F27BC62852Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E3D2A0A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:15 GMT6restoredfilesystem75f5116a1true01D6F8F2E94C2ADCMon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BC31B26\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:56 GMT6restoredfilesystem75f5116a1true01D6F8F3983A11ABMon, - 01 Feb 2021 23:40:16 GMT\"0x8D8C70ABAB11582\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:06 GMT6restoredfilesystem75f5116a2true01D6F8F27BDFF69BMon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E56D188\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:11 GMT6restoredfilesystem75f5116a3true01D6F8F27BF86518Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E6F4042\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:13 GMT6testingtamertrue01D6F4250554AFFCTue, - 26 Jan 2021 20:51:57 GMT\"0x8D8C23C38CE1730\"unlockedexpiredcontainer$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:28 GMT4filesystem41b81006true01D7454F48DD4DD9Mon, + 10 May 2021 03:48:05 GMT\"0x8D913666B540D09\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, + 10 May 2021 03:48:07 GMT4filesystem75f5116atrue01D7478261A661F7Wed, + 12 May 2021 22:58:54 GMT\"0x8D91599841CF2F3\"unlockedexpired$account-encryption-keyfalsefalsefalseWed, + 12 May 2021 22:58:54 GMT6tbvestbfdv1rtu275f5116atrue01D7479E2190A2D5Thu, + 13 May 2021 02:17:32 GMT\"0x8D915B5440794C7\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:17:32 GMT7tbvestbv1rtu275f5116atrue01D7479D6034CCFFThu, + 13 May 2021 02:12:08 GMT\"0x8D915B482AB5A9C\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:12:08 GMT7test12375f5116atrue01D7479C575FDC16Thu, + 13 May 2021 02:04:43 GMT\"0x8D915B379D6E378\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:05:29 GMT7test1275f5116atrue01D7479CB60E4A94Thu, + 13 May 2021 02:07:22 GMT\"0x8D915B3D884DCF7\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:07:22 GMT7test175f5116atrue01D7479CA1A9993EThu, + 13 May 2021 02:06:48 GMT\"0x8D915B3C4201FD3\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:06:48 GMT7test1rtu275f5116atrue01D7479CF6C16F08Thu, + 13 May 2021 02:09:11 GMT\"0x8D915B41937C25A\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:09:11 GMT7test75f5116atrue01D747842A8A6A45Wed, + 12 May 2021 23:11:40 GMT\"0x8D9159B4D00ECBC\"unlockedexpired$account-encryption-keyfalsefalsefalseWed, + 12 May 2021 23:11:41 GMT6test75f5116atrue01D747847186849FWed, + 12 May 2021 23:13:39 GMT\"0x8D9159B93FD51C8\"unlockedexpired$account-encryption-keyfalsefalsefalseWed, + 12 May 2021 23:13:46 GMT6testbv1rtu275f5116atrue01D7479D39E9AF65Thu, + 13 May 2021 02:11:03 GMT\"0x8D915B45C605132\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:11:03 GMT7testfs75f5116atrue01D7479E3289C488Thu, + 13 May 2021 02:18:00 GMT\"0x8D915B555007A06\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:18:01 GMT7" headers: - Content-Type: + content-type: - application/xml - Date: - - Tue, 02 Feb 2021 00:43:05 GMT - Server: + date: + - Thu, 13 May 2021 02:18:41 GMT + server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - Transfer-Encoding: + transfer-encoding: - chunked - x-ms-request-id: - - ecb6a8d1-801e-00c7-78fc-f85e01000000 x-ms-version: - - '2020-04-08' + - '2020-08-04' status: code: 200 message: OK @@ -238,33 +180,29 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - d4a3bdde-64ef-11eb-b1d2-c8348e5fffbc + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 00:44:39 GMT + - Thu, 13 May 2021 02:18:42 GMT x-ms-deleted-container-name: - - filesystem75f5116a + - testfs75f5116a x-ms-deleted-container-version: - - 01D6F8F46C9F8125 + - 01D7479E3289C488 x-ms-version: - - '2020-04-08' + - '2020-08-04' method: PUT - uri: https://storagename.blob.core.windows.net/restoredfilesystem75f5116a0?restype=container&comp=undelete + uri: https://storagename.blob.core.windows.net/testfs75f5116a?restype=container&comp=undelete response: body: string: '' headers: - Content-Length: + content-length: - '0' - Date: - - Tue, 02 Feb 2021 00:44:41 GMT - Server: + date: + - Thu, 13 May 2021 02:18:41 GMT + server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: - - ecb79474-801e-00c7-7ffc-f85e01000000 x-ms-version: - - '2020-04-08' + - '2020-08-04' status: code: 201 message: Created @@ -278,28 +216,26 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - d731bcd6-64ef-11eb-944a-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 00:44:43 GMT + - Thu, 13 May 2021 02:18:42 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: GET - uri: https://storagename.blob.core.windows.net/restoredfilesystem75f5116a0?restype=container + uri: https://storagename.blob.core.windows.net/testfs75f5116a?restype=container response: body: string: '' headers: - Content-Length: + content-length: - '0' - Date: - - Tue, 02 Feb 2021 00:44:42 GMT - ETag: - - '"0x8D8C713BA05A9BC"' - Last-Modified: - - Tue, 02 Feb 2021 00:44:41 GMT - Server: + date: + - Thu, 13 May 2021 02:18:41 GMT + etag: + - '"0x8D915B56D3A090E"' + last-modified: + - Thu, 13 May 2021 02:18:41 GMT + server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 x-ms-default-encryption-scope: - $account-encryption-key @@ -313,10 +249,8 @@ interactions: - available x-ms-lease-status: - unlocked - x-ms-request-id: - - c891adf3-201e-0093-7cfc-f81156000000 x-ms-version: - - '2020-04-08' + - '2020-08-04' status: code: 200 message: OK @@ -332,86 +266,26 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - dcde5296-64ef-11eb-b208-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 00:44:53 GMT - x-ms-deleted-container-name: - - filesystem75f5116a - x-ms-deleted-container-version: - - 01D6F8FC5CBB8973 - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredfilesystem75f5116a1?restype=container&comp=undelete - response: - body: - string: '' - headers: - Content-Length: - - '0' - Date: - - Tue, 02 Feb 2021 00:44:53 GMT - Server: - - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: - - ecb7b667-801e-00c7-35fc-f85e01000000 - x-ms-version: - - '2020-04-08' - status: - code: 201 - message: Created -- request: - body: null - headers: - Accept: - - application/xml - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - de5438e4-64ef-11eb-b583-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 00:44:55 GMT + - Thu, 13 May 2021 02:18:42 GMT x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/restoredfilesystem75f5116a1?restype=container + - '2020-08-04' + method: DELETE + uri: https://storagename.blob.core.windows.net/testfs75f5116a?restype=container response: body: string: '' headers: - Content-Length: + content-length: - '0' - Date: - - Tue, 02 Feb 2021 00:44:54 GMT - ETag: - - '"0x8D8C713C111B556"' - Last-Modified: - - Tue, 02 Feb 2021 00:44:53 GMT - Server: + date: + - Thu, 13 May 2021 02:18:41 GMT + server: - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: - - $account-encryption-key - x-ms-deny-encryption-scope-override: - - 'false' - x-ms-has-immutability-policy: - - 'false' - x-ms-has-legal-hold: - - 'false' - x-ms-lease-state: - - available - x-ms-lease-status: - - unlocked - x-ms-request-id: - - c891c722-201e-0093-17fc-f81156000000 x-ms-version: - - '2020-04-08' + - '2020-08-04' status: - code: 200 - message: OK + code: 202 + message: Accepted version: 1 diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_restore_to_existing_file_system.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_restore_to_existing_file_system.yaml deleted file mode 100644 index 90584845f784..000000000000 --- a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_restore_to_existing_file_system.yaml +++ /dev/null @@ -1,264 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 90bb52db-6500-11eb-bee7-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:44:26 GMT - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/existinge16f18a1?restype=container - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:44:27 GMT - ETag: '"0x8D8C72474D7CF76"' - Last-Modified: Tue, 02 Feb 2021 02:44:26 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: 5c02b686-801e-001c-1d0d-f9983c000000 - x-ms-version: '2020-04-08' - status: - code: 201 - message: Created - url: https://storagename.blob.core.windows.net/existinge16f18a1?restype=container -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 91d337fc-6500-11eb-bb2a-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:44:28 GMT - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/filesysteme16f18a1?restype=container - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:44:28 GMT - ETag: '"0x8D8C72475DF5D69"' - Last-Modified: Tue, 02 Feb 2021 02:44:28 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: 5c02baeb-801e-001c-030d-f9983c000000 - x-ms-version: '2020-04-08' - status: - code: 201 - message: Created - url: https://storagename.blob.core.windows.net/filesysteme16f18a1?restype=container -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 91d92b6b-6500-11eb-9900-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:44:28 GMT - x-ms-version: - - '2020-04-08' - method: DELETE - uri: https://storagename.blob.core.windows.net/filesysteme16f18a1?restype=container - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:44:28 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: 5c02bb09-801e-001c-1d0d-f9983c000000 - x-ms-version: '2020-04-08' - status: - code: 202 - message: Accepted - url: https://storagename.blob.core.windows.net/filesysteme16f18a1?restype=container -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 91dc389b-6500-11eb-9667-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:44:28 GMT - x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/filesysteme16f18a1?restype=container - response: - body: - string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:5c02bb11-801e-001c-250d-f9983c000000\nTime:2021-02-02T02:44:28.3848411Z" - headers: - Content-Length: '225' - Content-Type: application/xml - Date: Tue, 02 Feb 2021 02:44:28 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: ContainerNotFound - x-ms-request-id: 5c02bb11-801e-001c-250d-f9983c000000 - x-ms-version: '2020-04-08' - status: - code: 404 - message: The specified container does not exist. - url: https://storagename.blob.core.windows.net/filesysteme16f18a1?restype=container -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 91df45f9-6500-11eb-a2b0-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:44:28 GMT - x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/?comp=list&include=deleted - response: - body: - string: "\uFEFFexisting254311624true01D6F903A80961E1Tue, - 02 Feb 2021 01:35:15 GMT\"0x8D8C71ACA8011D2\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:36:12 GMT6existinge16f18a1Tue, - 02 Feb 2021 02:44:26 GMT\"0x8D8C72474D7CF76\"unlockedavailable$account-encryption-keyfalsefalsefalsefilcxcdnvsxcesys175f5116atrue01D6F6A0314E9488Sat, - 30 Jan 2021 00:38:13 GMT\"0x8D8C4B753C56913\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:15 GMT3filcxcdsxcesys175f5116atrue01D6F69EDA93DBBASat, - 30 Jan 2021 00:28:38 GMT\"0x8D8C4B5FD0A8288\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:28:38 GMT3filcxcxcesys175f5116atrue01D6F69E94CC30CDSat, - 30 Jan 2021 00:26:41 GMT\"0x8D8C4B5B74314B8\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:16 GMT3filessfgew75f5116atrue01D6F69D22040FCESat, - 30 Jan 2021 00:16:19 GMT\"0x8D8C4B4447B0328\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:18:22 GMT3filesys175f5116atrue01D6F69BE495951CSat, - 30 Jan 2021 00:07:26 GMT\"0x8D8C4B3070C883F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:32 GMT3filesys75f5116atrue01D6F69B95D1800ASat, - 30 Jan 2021 00:05:14 GMT\"0x8D8C4B2B8486C99\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:24 GMT3filesys75f5116atrue01D6F8F232563195Mon, - 01 Feb 2021 23:30:16 GMT\"0x8D8C70954CCC24A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:30:16 GMT6filesystem175f5116atrue01D6F425B15C30B0Tue, - 26 Jan 2021 20:56:18 GMT\"0x8D8C23CD3D2A095\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 20:56:18 GMT0filesystem254311624true01D6F903A8344A52Tue, - 02 Feb 2021 01:35:15 GMT\"0x8D8C71ACAAA36C8\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:35:15 GMT6filesystem275f5116atrue01D6F426474ECD99Tue, - 26 Jan 2021 21:00:29 GMT\"0x8D8C23D69C52786\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 21:00:30 GMT0filesystem275f5116atrue01D6F4265E1ACE96Tue, - 26 Jan 2021 21:01:07 GMT\"0x8D8C23D80917D53\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:30 GMT3filesystem8e7c0a7etrue01D6F44707744B9EWed, - 27 Jan 2021 00:54:55 GMT\"0x8D8C25E29EAFAEE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:18 GMT3filesysteme16f18a1true01D6F90D5368A55ETue, - 02 Feb 2021 02:44:28 GMT\"0x8D8C72475DF5D69\"lockedleasedfixed$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 02:44:28 GMT7filmcxncxcdndsvsxcesys175f5116atrue01D6F6A0ABD10C88Sat, - 30 Jan 2021 00:41:39 GMT\"0x8D8C4B7CE47C1CD\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:41:39 GMT3filmncxcdndsvsxcesys175f5116atrue01D6F6A07CBEC3CCSat, - 30 Jan 2021 00:40:20 GMT\"0x8D8C4B79F355F2F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:40:21 GMT3filmncxcdnvsxcesys175f5116atrue01D6F6A041C633BASat, - 30 Jan 2021 00:38:41 GMT\"0x8D8C4B7643CD5CF\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:38:42 GMT3filurtdesystem75f5116atrue01D6F69AB4E4BD0BFri, - 29 Jan 2021 23:58:57 GMT\"0x8D8C4B1D75B2E99\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 29 Jan 2021 23:58:57 GMT3fs141b81006true01D6F4EE87D66711Wed, - 27 Jan 2021 20:53:57 GMT\"0x8D8C305AA4CEEF6\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:16 GMT3fs175f5116atrue01D6F69B47B7267ESat, - 30 Jan 2021 00:03:03 GMT\"0x8D8C4B26A2DD1E9\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:03:04 GMT3fs341b81006true01D6F4F0B1060E67Wed, - 27 Jan 2021 21:09:25 GMT\"0x8D8C307D37CB1FE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:26 GMT3fs41b81006true01D6F4EE35D82B82Wed, - 27 Jan 2021 20:51:39 GMT\"0x8D8C305584EC8E2\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:22 GMT3restored0true01D6F8E50988873FMon, - 01 Feb 2021 21:56:04 GMT\"0x8D8C6FC2BFF86B7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:15 GMT6restored1true01D6F8E525045EF5Mon, - 01 Feb 2021 21:56:50 GMT\"0x8D8C6FC477B5D19\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:17 GMT6restoredfilesystem75f5116a0true01D6F8F27BAD1D74Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E241EE7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:17 GMT6restoredfilesystem75f5116a0true01D6F8F2E932F8F0Mon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BA9E8F6\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:55 GMT6restoredfilesystem75f5116a0true01D6F8F38E3D749AMon, - 01 Feb 2021 23:40:00 GMT\"0x8D8C70AB0B45C7F\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:08 GMT6restoredfilesystem75f5116a0true01D6F8F4CF045569Mon, - 01 Feb 2021 23:48:58 GMT\"0x8D8C70BF17B490E\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 00:37:58 GMT6restoredfilesystem75f5116a0true01D6F8FC978E9014Tue, - 02 Feb 2021 00:44:41 GMT\"0x8D8C713BA05A9BC\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:41:20 GMT6restoredfilesystem75f5116a1true01D6F8F27BC62852Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E3D2A0A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:15 GMT6restoredfilesystem75f5116a1true01D6F8F2E94C2ADCMon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BC31B26\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:56 GMT6restoredfilesystem75f5116a1true01D6F8F3983A11ABMon, - 01 Feb 2021 23:40:16 GMT\"0x8D8C70ABAB11582\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:06 GMT6restoredfilesystem75f5116a1true01D6F8FC9E9AAEE8Tue, - 02 Feb 2021 00:44:53 GMT\"0x8D8C713C111B556\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:41:22 GMT6restoredfilesystem75f5116a2true01D6F8F27BDFF69BMon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E56D188\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:11 GMT6restoredfilesystem75f5116a3true01D6F8F27BF86518Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E6F4042\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:13 GMT6restoredfilesysteme7d413e70Tue, - 02 Feb 2021 02:41:46 GMT\"0x8D8C72415A16165\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredfilesysteme7d413e71Tue, - 02 Feb 2021 02:41:56 GMT\"0x8D8C7241B59EDEB\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredfilesysteme7d413e72Tue, - 02 Feb 2021 02:42:43 GMT\"0x8D8C7243773301A\"unlockedavailable$account-encryption-keyfalsefalsefalserestoredfilesysteme7d413e73Tue, - 02 Feb 2021 02:42:51 GMT\"0x8D8C7243BE039A2\"unlockedavailable$account-encryption-keyfalsefalsefalsetestingtamertrue01D6F4250554AFFCTue, - 26 Jan 2021 20:51:57 GMT\"0x8D8C23C38CE1730\"unlockedexpiredcontainer$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:28 GMT3" - headers: - Content-Type: application/xml - Date: Tue, 02 Feb 2021 02:44:28 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - Transfer-Encoding: chunked - x-ms-request-id: 5c02bb24-801e-001c-350d-f9983c000000 - x-ms-version: '2020-04-08' - status: - code: 200 - message: OK - url: https://storagename.blob.core.windows.net/?comp=list&include=deleted -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 91e75c3f-6500-11eb-ab1e-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:44:28 GMT - x-ms-deleted-container-name: - - filesysteme16f18a1 - x-ms-deleted-container-version: - - 01D6F90D5368A55E - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/existinge16f18a1?restype=container&comp=undelete - response: - body: - string: "\uFEFF\nContainerAlreadyExistsThe - specified container already exists.\nRequestId:5c02bb4e-801e-001c-5d0d-f9983c000000\nTime:2021-02-02T02:44:30.2591832Z" - headers: - Content-Length: '231' - Content-Type: application/xml - Date: Tue, 02 Feb 2021 02:44:29 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-error-code: ContainerAlreadyExists - x-ms-request-id: 5c02bb4e-801e-001c-5d0d-f9983c000000 - x-ms-version: '2020-04-08' - status: - code: 409 - message: The specified container already exists. - url: https://storagename.blob.core.windows.net/existinge16f18a1?restype=container&comp=undelete -version: 1 diff --git a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_undelete_file_system.yaml b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_undelete_file_system.yaml index 8713bcf502e9..8526f8657739 100644 --- a/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_undelete_file_system.yaml +++ b/sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_undelete_file_system.yaml @@ -5,468 +5,219 @@ interactions: Accept: - application/xml User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 08f2e5ed-6500-11eb-8b17-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 02:40:38 GMT + - Thu, 13 May 2021 02:21:21 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: PUT uri: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container response: body: string: '' headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:40:39 GMT - ETag: '"0x8D8C723ED170314"' - Last-Modified: Tue, 02 Feb 2021 02:40:38 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: 88aaa930-101e-0098-0d0c-f9ea3d000000 - x-ms-version: '2020-04-08' + content-length: '0' + date: Thu, 13 May 2021 02:21:20 GMT + etag: '"0x8D915B5CC7E7CB8"' + last-modified: Thu, 13 May 2021 02:21:21 GMT + server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-version: '2020-08-04' status: code: 201 message: Created - url: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container + url: https://tamerhnsprod.blob.core.windows.net/filesysteme7d413e7?restype=container - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 09463fce-6500-11eb-b28a-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 02:40:39 GMT + - Thu, 13 May 2021 02:21:22 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: DELETE uri: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container response: body: string: '' headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:40:39 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: 88aaaab4-101e-0098-6e0c-f9ea3d000000 - x-ms-version: '2020-04-08' + content-length: '0' + date: Thu, 13 May 2021 02:21:21 GMT + server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-version: '2020-08-04' status: code: 202 message: Accepted - url: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container + url: https://tamerhnsprod.blob.core.windows.net/filesysteme7d413e7?restype=container - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 094f908b-6500-11eb-ad49-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 02:40:39 GMT + - Thu, 13 May 2021 02:22:02 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: GET uri: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container response: body: string: "\uFEFFContainerNotFoundThe - specified container does not exist.\nRequestId:88aaaae5-101e-0098-1e0c-f9ea3d000000\nTime:2021-02-02T02:40:39.2999562Z" + specified container does not exist.\nRequestId:a02bc363-701e-0067-4f9e-478f11000000\nTime:2021-05-13T02:22:01.4873819Z" headers: - Content-Length: '225' - Content-Type: application/xml - Date: Tue, 02 Feb 2021 02:40:39 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + content-length: '225' + content-type: application/xml + date: Thu, 13 May 2021 02:22:00 GMT + server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 x-ms-error-code: ContainerNotFound - x-ms-request-id: 88aaaae5-101e-0098-1e0c-f9ea3d000000 - x-ms-version: '2020-04-08' + x-ms-version: '2020-08-04' status: code: 404 message: The specified container does not exist. - url: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container + url: https://tamerhnsprod.blob.core.windows.net/filesysteme7d413e7?restype=container - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 0955dd97-6500-11eb-a256-c8348e5fffbc + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 02:40:39 GMT + - Thu, 13 May 2021 02:22:02 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: GET uri: https://storagename.blob.core.windows.net/?comp=list&include=deleted response: body: string: "\uFEFFexisting254311624true01D6F903A80961E1Tue, - 02 Feb 2021 01:35:15 GMT\"0x8D8C71ACA8011D2\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:36:12 GMT6filcxcdnvsxcesys175f5116atrue01D6F6A0314E9488Sat, - 30 Jan 2021 00:38:13 GMT\"0x8D8C4B753C56913\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:15 GMT3filcxcdsxcesys175f5116atrue01D6F69EDA93DBBASat, - 30 Jan 2021 00:28:38 GMT\"0x8D8C4B5FD0A8288\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:28:38 GMT3filcxcxcesys175f5116atrue01D6F69E94CC30CDSat, - 30 Jan 2021 00:26:41 GMT\"0x8D8C4B5B74314B8\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:44:16 GMT3filessfgew75f5116atrue01D6F69D22040FCESat, - 30 Jan 2021 00:16:19 GMT\"0x8D8C4B4447B0328\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:18:22 GMT3filesys175f5116atrue01D6F69BE495951CSat, - 30 Jan 2021 00:07:26 GMT\"0x8D8C4B3070C883F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:32 GMT3filesys75f5116atrue01D6F69B95D1800ASat, - 30 Jan 2021 00:05:14 GMT\"0x8D8C4B2B8486C99\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:24 GMT3filesys75f5116atrue01D6F8F232563195Mon, - 01 Feb 2021 23:30:16 GMT\"0x8D8C70954CCC24A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:30:16 GMT6filesystem175f5116atrue01D6F425B15C30B0Tue, - 26 Jan 2021 20:56:18 GMT\"0x8D8C23CD3D2A095\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 20:56:18 GMT0filesystem254311624true01D6F903A8344A52Tue, - 02 Feb 2021 01:35:15 GMT\"0x8D8C71ACAAA36C8\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:35:15 GMT6filesystem275f5116atrue01D6F426474ECD99Tue, - 26 Jan 2021 21:00:29 GMT\"0x8D8C23D69C52786\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 26 Jan 2021 21:00:30 GMT0filesystem275f5116atrue01D6F4265E1ACE96Tue, - 26 Jan 2021 21:01:07 GMT\"0x8D8C23D80917D53\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:30 GMT3filesystem8e7c0a7etrue01D6F44707744B9EWed, - 27 Jan 2021 00:54:55 GMT\"0x8D8C25E29EAFAEE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:18 GMT3filesysteme7d413e7true01D6F90449CEA056Tue, - 02 Feb 2021 01:39:46 GMT\"0x8D8C71B6C4588F6\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:41:18 GMT6filesysteme7d413e7true01D6F90C09D6DBCBTue, - 02 Feb 2021 02:35:15 GMT\"0x8D8C7232C3A9B12\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 02:35:15 GMT7filesysteme7d413e7true01D6F90C4481DDB8Tue, - 02 Feb 2021 02:36:53 GMT\"0x8D8C72366F89010\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 02:37:29 GMT7filesysteme7d413e7true01D6F90CCAA0D182Tue, - 02 Feb 2021 02:40:38 GMT\"0x8D8C723ED170314\"lockedleasedfixed$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 02:40:39 GMT7filmcxncxcdndsvsxcesys175f5116atrue01D6F6A0ABD10C88Sat, - 30 Jan 2021 00:41:39 GMT\"0x8D8C4B7CE47C1CD\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:41:39 GMT3filmncxcdndsvsxcesys175f5116atrue01D6F6A07CBEC3CCSat, - 30 Jan 2021 00:40:20 GMT\"0x8D8C4B79F355F2F\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:40:21 GMT3filmncxcdnvsxcesys175f5116atrue01D6F6A041C633BASat, - 30 Jan 2021 00:38:41 GMT\"0x8D8C4B7643CD5CF\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:38:42 GMT3filurtdesystem75f5116atrue01D6F69AB4E4BD0BFri, - 29 Jan 2021 23:58:57 GMT\"0x8D8C4B1D75B2E99\"unlockedexpired$account-encryption-keyfalsefalsefalseFri, - 29 Jan 2021 23:58:57 GMT3fs141b81006true01D6F4EE87D66711Wed, - 27 Jan 2021 20:53:57 GMT\"0x8D8C305AA4CEEF6\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:16 GMT3fs175f5116atrue01D6F69B47B7267ESat, - 30 Jan 2021 00:03:03 GMT\"0x8D8C4B26A2DD1E9\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:03:04 GMT3fs341b81006true01D6F4F0B1060E67Wed, - 27 Jan 2021 21:09:25 GMT\"0x8D8C307D37CB1FE\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:26 GMT3fs41b81006true01D6F4EE35D82B82Wed, - 27 Jan 2021 20:51:39 GMT\"0x8D8C305584EC8E2\"unlockedexpired$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:22 GMT3restored0true01D6F8E50988873FMon, - 01 Feb 2021 21:56:04 GMT\"0x8D8C6FC2BFF86B7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:15 GMT6restored1true01D6F8E525045EF5Mon, - 01 Feb 2021 21:56:50 GMT\"0x8D8C6FC477B5D19\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:31:17 GMT6restoredfilesystem75f5116a0true01D6F8F27BAD1D74Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E241EE7\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:17 GMT6restoredfilesystem75f5116a0true01D6F8F2E932F8F0Mon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BA9E8F6\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:55 GMT6restoredfilesystem75f5116a0true01D6F8F38E3D749AMon, - 01 Feb 2021 23:40:00 GMT\"0x8D8C70AB0B45C7F\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:08 GMT6restoredfilesystem75f5116a0true01D6F8F4CF045569Mon, - 01 Feb 2021 23:48:58 GMT\"0x8D8C70BF17B490E\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 00:37:58 GMT6restoredfilesystem75f5116a0true01D6F8FC978E9014Tue, - 02 Feb 2021 00:44:41 GMT\"0x8D8C713BA05A9BC\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:41:20 GMT6restoredfilesystem75f5116a1true01D6F8F27BC62852Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E3D2A0A\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:15 GMT6restoredfilesystem75f5116a1true01D6F8F2E94C2ADCMon, - 01 Feb 2021 23:35:23 GMT\"0x8D8C70A0BC31B26\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:36:56 GMT6restoredfilesystem75f5116a1true01D6F8F3983A11ABMon, - 01 Feb 2021 23:40:16 GMT\"0x8D8C70ABAB11582\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:43:06 GMT6restoredfilesystem75f5116a1true01D6F8FC9E9AAEE8Tue, - 02 Feb 2021 00:44:53 GMT\"0x8D8C713C111B556\"unlockedexpired$account-encryption-keyfalsefalsefalseTue, - 02 Feb 2021 01:41:22 GMT6restoredfilesystem75f5116a2true01D6F8F27BDFF69BMon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E56D188\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:11 GMT6restoredfilesystem75f5116a3true01D6F8F27BF86518Mon, - 01 Feb 2021 23:32:19 GMT\"0x8D8C7099E6F4042\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, - 01 Feb 2021 23:34:13 GMT6testingtamertrue01D6F4250554AFFCTue, - 26 Jan 2021 20:51:57 GMT\"0x8D8C23C38CE1730\"unlockedexpiredcontainer$account-encryption-keyfalsefalsefalseSat, - 30 Jan 2021 00:14:28 GMT3filesystem41b81006true01D7454F48DD4DD9Mon, + 10 May 2021 03:48:05 GMT\"0x8D913666B540D09\"unlockedexpired$account-encryption-keyfalsefalsefalseMon, + 10 May 2021 03:48:07 GMT4filesystem75f5116atrue01D7478261A661F7Wed, + 12 May 2021 22:58:54 GMT\"0x8D91599841CF2F3\"unlockedexpired$account-encryption-keyfalsefalsefalseWed, + 12 May 2021 22:58:54 GMT6filesysteme7d413e7true01D7479EAA07C2FFThu, + 13 May 2021 02:21:21 GMT\"0x8D915B5CC7E7CB8\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:21:21 GMT7tbvestbfdv1rtu275f5116atrue01D7479E2190A2D5Thu, + 13 May 2021 02:17:32 GMT\"0x8D915B5440794C7\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:17:32 GMT7tbvestbv1rtu275f5116atrue01D7479D6034CCFFThu, + 13 May 2021 02:12:08 GMT\"0x8D915B482AB5A9C\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:12:08 GMT7test12375f5116atrue01D7479C575FDC16Thu, + 13 May 2021 02:04:43 GMT\"0x8D915B379D6E378\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:05:29 GMT7test1275f5116atrue01D7479CB60E4A94Thu, + 13 May 2021 02:07:22 GMT\"0x8D915B3D884DCF7\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:07:22 GMT7test175f5116atrue01D7479CA1A9993EThu, + 13 May 2021 02:06:48 GMT\"0x8D915B3C4201FD3\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:06:48 GMT7test1rtu275f5116atrue01D7479CF6C16F08Thu, + 13 May 2021 02:09:11 GMT\"0x8D915B41937C25A\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:09:11 GMT7test75f5116atrue01D747842A8A6A45Wed, + 12 May 2021 23:11:40 GMT\"0x8D9159B4D00ECBC\"unlockedexpired$account-encryption-keyfalsefalsefalseWed, + 12 May 2021 23:11:41 GMT6test75f5116atrue01D747847186849FWed, + 12 May 2021 23:13:39 GMT\"0x8D9159B93FD51C8\"unlockedexpired$account-encryption-keyfalsefalsefalseWed, + 12 May 2021 23:13:46 GMT6testbv1rtu275f5116atrue01D7479D39E9AF65Thu, + 13 May 2021 02:11:03 GMT\"0x8D915B45C605132\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:11:03 GMT7testfs75f5116atrue01D7479E4AC313E4Thu, + 13 May 2021 02:18:41 GMT\"0x8D915B56D3A090E\"unlockedexpired$account-encryption-keyfalsefalsefalseThu, + 13 May 2021 02:18:41 GMT7" headers: - Content-Type: application/xml - Date: Tue, 02 Feb 2021 02:40:39 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - Transfer-Encoding: chunked - x-ms-request-id: 88aaab07-101e-0098-3d0c-f9ea3d000000 - x-ms-version: '2020-04-08' + content-type: application/xml + date: Thu, 13 May 2021 02:22:00 GMT + server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + transfer-encoding: chunked + x-ms-version: '2020-08-04' status: code: 200 message: OK - url: https://storagename.blob.core.windows.net/?comp=list&include=deleted + url: https://tamerhnsprod.blob.core.windows.net/?comp=list&include=deleted - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 313339cc-6500-11eb-9ca9-c8348e5fffbc + - azsdk-python-storage-blob/12.9.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 02:41:46 GMT + - Thu, 13 May 2021 02:22:02 GMT x-ms-deleted-container-name: - filesysteme7d413e7 x-ms-deleted-container-version: - - 01D6F90449CEA056 + - 01D7479EAA07C2FF x-ms-version: - - '2020-04-08' + - '2020-08-04' method: PUT - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e70?restype=container&comp=undelete + uri: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container&comp=undelete response: body: string: '' headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:41:46 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: a8decba5-a01e-000b-170c-f93137000000 - x-ms-version: '2020-04-08' + content-length: '0' + date: Thu, 13 May 2021 02:22:00 GMT + server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-version: '2020-08-04' status: code: 201 message: Created - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e70?restype=container&comp=undelete + url: https://tamerhnsprod.blob.core.windows.net/filesysteme7d413e7?restype=container&comp=undelete - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 335089b6-6500-11eb-b6c5-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 02:41:50 GMT + - Thu, 13 May 2021 02:22:02 GMT x-ms-version: - - '2020-04-08' + - '2020-08-04' method: GET - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e70?restype=container - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:41:49 GMT - ETag: '"0x8D8C72415A16165"' - Last-Modified: Tue, 02 Feb 2021 02:41:46 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-request-id: a8ded693-a01e-000b-5a0c-f93137000000 - x-ms-version: '2020-04-08' - status: - code: 200 - message: OK - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e70?restype=container -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 374a71f4-6500-11eb-bb1f-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:41:56 GMT - x-ms-deleted-container-name: - - filesysteme7d413e7 - x-ms-deleted-container-version: - - 01D6F90C09D6DBCB - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e71?restype=container&comp=undelete - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:41:55 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: a8deeb62-a01e-000b-070c-f93137000000 - x-ms-version: '2020-04-08' - status: - code: 201 - message: Created - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e71?restype=container&comp=undelete -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 3885e5d2-6500-11eb-aafe-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:41:58 GMT - x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e71?restype=container - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:41:57 GMT - ETag: '"0x8D8C7241B59EDEB"' - Last-Modified: Tue, 02 Feb 2021 02:41:56 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-request-id: a8def19a-a01e-000b-7c0c-f93137000000 - x-ms-version: '2020-04-08' - status: - code: 200 - message: OK - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e71?restype=container -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 5276aaba-6500-11eb-a8a5-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:42:42 GMT - x-ms-deleted-container-name: - - filesysteme7d413e7 - x-ms-deleted-container-version: - - 01D6F90C4481DDB8 - x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e72?restype=container&comp=undelete - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:42:43 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: 908b27fb-601e-0014-7f0d-f98233000000 - x-ms-version: '2020-04-08' - status: - code: 201 - message: Created - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e72?restype=container&comp=undelete -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 54b75787-6500-11eb-adf4-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:42:46 GMT - x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e72?restype=container + uri: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container response: body: string: '' headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:42:45 GMT - ETag: '"0x8D8C7243773301A"' - Last-Modified: Tue, 02 Feb 2021 02:42:43 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + content-length: '0' + date: Thu, 13 May 2021 02:22:00 GMT + etag: '"0x8D915B5E47166EA"' + last-modified: Thu, 13 May 2021 02:22:01 GMT + server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 x-ms-default-encryption-scope: $account-encryption-key x-ms-deny-encryption-scope-override: 'false' x-ms-has-immutability-policy: 'false' x-ms-has-legal-hold: 'false' x-ms-lease-state: available x-ms-lease-status: unlocked - x-ms-request-id: 908b2cea-601e-0014-3d0d-f98233000000 - x-ms-version: '2020-04-08' + x-ms-version: '2020-08-04' status: code: 200 message: OK - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e72?restype=container + url: https://tamerhnsprod.blob.core.windows.net/filesysteme7d413e7?restype=container - request: body: null headers: Accept: - application/xml User-Agent: - - azsdk-python-storage-blob/12.7.0 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 57cf16ed-6500-11eb-b352-c8348e5fffbc + - azsdk-python-storage-dfs/12.4.0b1 Python/3.8.5 (Windows-10-10.0.19041-SP0) x-ms-date: - - Tue, 02 Feb 2021 02:42:51 GMT - x-ms-deleted-container-name: - - filesysteme7d413e7 - x-ms-deleted-container-version: - - 01D6F90CCAA0D182 + - Thu, 13 May 2021 02:22:02 GMT x-ms-version: - - '2020-04-08' - method: PUT - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e73?restype=container&comp=undelete - response: - body: - string: '' - headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:42:50 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-request-id: 908b3552-601e-0014-260d-f98233000000 - x-ms-version: '2020-04-08' - status: - code: 201 - message: Created - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e73?restype=container&comp=undelete -- request: - body: null - headers: - Accept: - - application/xml - User-Agent: - - azsdk-python-storage-dfs/12.2.1 Python/3.8.5 (Windows-10-10.0.19041-SP0) - x-ms-client-request-id: - - 593867de-6500-11eb-8fc7-c8348e5fffbc - x-ms-date: - - Tue, 02 Feb 2021 02:42:53 GMT - x-ms-version: - - '2020-04-08' - method: GET - uri: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e73?restype=container + - '2020-08-04' + method: DELETE + uri: https://storagename.blob.core.windows.net/filesysteme7d413e7?restype=container response: body: string: '' headers: - Content-Length: '0' - Date: Tue, 02 Feb 2021 02:42:53 GMT - ETag: '"0x8D8C7243BE039A2"' - Last-Modified: Tue, 02 Feb 2021 02:42:51 GMT - Server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 - x-ms-default-encryption-scope: $account-encryption-key - x-ms-deny-encryption-scope-override: 'false' - x-ms-has-immutability-policy: 'false' - x-ms-has-legal-hold: 'false' - x-ms-lease-state: available - x-ms-lease-status: unlocked - x-ms-request-id: 908b3911-601e-0014-4d0d-f98233000000 - x-ms-version: '2020-04-08' + content-length: '0' + date: Thu, 13 May 2021 02:22:00 GMT + server: Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-version: '2020-08-04' status: - code: 200 - message: OK - url: https://storagename.blob.core.windows.net/restoredfilesysteme7d413e73?restype=container + code: 202 + message: Accepted + url: https://tamerhnsprod.blob.core.windows.net/filesysteme7d413e7?restype=container version: 1 diff --git a/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py b/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py index 1137f5754e96..bab7de604726 100644 --- a/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py +++ b/sdk/storage/azure-storage-file-datalake/tests/test_file_system.py @@ -5,6 +5,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- +import time import unittest from datetime import datetime, timedelta import pytest @@ -201,11 +202,11 @@ def test_rename_file_system_with_source_lease(self, datalake_storage_account_nam @DataLakePreparer() def test_undelete_file_system(self, datalake_storage_account_name, datalake_storage_account_key): - # Needs soft delete enabled account. + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return self._setUp(datalake_storage_account_name, datalake_storage_account_key) - name = self._get_file_system_reference() + name = self._get_file_system_reference("testfs") filesystem_client = self.dsc.create_file_system(name) # Act @@ -217,48 +218,18 @@ def test_undelete_file_system(self, datalake_storage_account_name, datalake_stor filesystem_list = list(self.dsc.list_file_systems(include_deleted=True)) self.assertTrue(len(filesystem_list) >= 1) - restored_version = 0 for filesystem in filesystem_list: # find the deleted filesystem and restore it if filesystem.deleted and filesystem.name == filesystem_client.file_system_name: - restored_fs_client = self.dsc.undelete_file_system(filesystem.name, filesystem.deleted_version, - new_name="restored" + name + str(restored_version)) - restored_version += 1 + restored_fs_client = self.dsc.undelete_file_system(filesystem.name, filesystem.deleted_version) # to make sure the deleted filesystem is restored props = restored_fs_client.get_file_system_properties() self.assertIsNotNone(props) - @DataLakePreparer() - def test_restore_to_existing_file_system(self, datalake_storage_account_name, datalake_storage_account_key): - # Needs soft delete enabled account. - if not self.is_playback(): - return - self._setUp(datalake_storage_account_name, datalake_storage_account_key) - # get an existing filesystem - existing_name = self._get_file_system_reference(prefix="existing2") - name = self._get_file_system_reference(prefix="filesystem2") - existing_filesystem_client = self.dsc.create_file_system(existing_name) - filesystem_client = self.dsc.create_file_system(name) - - # Act - filesystem_client.delete_file_system() - # to make sure the filesystem deleted - with self.assertRaises(ResourceNotFoundError): - filesystem_client.get_file_system_properties() - - filesystem_list = list(self.dsc.list_file_systems(include_deleted=True)) - self.assertTrue(len(filesystem_list) >= 1) - - for filesystem in filesystem_list: - # find the deleted filesystem and restore it - if filesystem.deleted and filesystem.name == filesystem_client.file_system_name: - with self.assertRaises(HttpResponseError): - self.dsc.undelete_file_system(filesystem.name, filesystem.deleted_version, - new_name=existing_filesystem_client.file_system_name) - @DataLakePreparer() def test_restore_file_system_with_sas(self, datalake_storage_account_name, datalake_storage_account_key): + # TODO: Needs soft delete enabled account in ARM template. pytest.skip( "We are generating a SAS token therefore play only live but we also need a soft delete enabled account.") self._setUp(datalake_storage_account_name, datalake_storage_account_key) @@ -284,9 +255,7 @@ def test_restore_file_system_with_sas(self, datalake_storage_account_name, datal for filesystem in filesystem_list: # find the deleted filesystem and restore it if filesystem.deleted and filesystem.name == filesystem_client.file_system_name: - restored_fs_client = dsc.undelete_file_system(filesystem.name, filesystem.deleted_version, - new_name="restored" + name + str(restored_version)) - restored_version += 1 + restored_fs_client = dsc.undelete_file_system(filesystem.name, filesystem.deleted_version) # to make sure the deleted filesystem is restored props = restored_fs_client.get_file_system_properties() @@ -416,6 +385,7 @@ def test_list_paths(self, datalake_storage_account_name, datalake_storage_accoun @DataLakePreparer() def test_get_deleted_paths(self, datalake_storage_account_name, datalake_storage_account_key): + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return self._setUp(datalake_storage_account_name, datalake_storage_account_key) @@ -604,9 +574,10 @@ def test_file_system_sessions_closes_properly(self, datalake_storage_account_nam @DataLakePreparer() def test_undelete_dir_with_version_id(self, datalake_storage_account_name, datalake_storage_account_key): - self._setUp(datalake_storage_account_name, datalake_storage_account_key) + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return + self._setUp(datalake_storage_account_name, datalake_storage_account_key) file_system_client = self._create_file_system("fs") dir_path = 'dir10' dir_client = file_system_client.create_directory(dir_path) @@ -619,9 +590,10 @@ def test_undelete_dir_with_version_id(self, datalake_storage_account_name, datal @DataLakePreparer() def test_undelete_file_with_version_id(self, datalake_storage_account_name, datalake_storage_account_key): - self._setUp(datalake_storage_account_name, datalake_storage_account_key) + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return + self._setUp(datalake_storage_account_name, datalake_storage_account_key) file_system_client = self._create_file_system("fs1") file_path = 'dir10/fileŇ' dir_client = file_system_client.create_file(file_path) diff --git a/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py b/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py index 2b31480e2662..54869a5e5e7f 100644 --- a/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py +++ b/sdk/storage/azure-storage-file-datalake/tests/test_file_system_async.py @@ -5,6 +5,7 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- +import time import unittest import asyncio import uuid @@ -218,7 +219,7 @@ async def test_rename_file_system_with_source_lease( @DataLakePreparer() async def test_undelete_file_system(self, datalake_storage_account_name, datalake_storage_account_key): - # Needs soft delete enabled account. + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return self._setUp(datalake_storage_account_name, datalake_storage_account_key) @@ -235,52 +236,18 @@ async def test_undelete_file_system(self, datalake_storage_account_name, datalak filesystem_list.append(fs) self.assertTrue(len(filesystem_list) >= 1) - restored_version = 0 for filesystem in filesystem_list: # find the deleted filesystem and restore it if filesystem.deleted and filesystem.name == filesystem_client.file_system_name: - restored_fs_client = await self.dsc.undelete_file_system(filesystem.name, - filesystem.deleted_version, - new_name="restored" + - name + str(restored_version)) - restored_version += 1 + restored_fs_client = await self.dsc.undelete_file_system(filesystem.name, filesystem.deleted_version) # to make sure the deleted filesystem is restored props = await restored_fs_client.get_file_system_properties() self.assertIsNotNone(props) - @DataLakePreparer() - async def test_restore_to_existing_file_system(self, datalake_storage_account_name, datalake_storage_account_key): - # Needs soft delete enabled account. - if not self.is_playback(): - return - self._setUp(datalake_storage_account_name, datalake_storage_account_key) - # get an existing filesystem - existing_name = self._get_file_system_reference(prefix="existing") - name = self._get_file_system_reference(prefix="filesystem") - existing_filesystem_client = await self.dsc.create_file_system(existing_name) - filesystem_client = await self.dsc.create_file_system(name) - - # Act - await filesystem_client.delete_file_system() - # to make sure the filesystem deleted - with self.assertRaises(ResourceNotFoundError): - await filesystem_client.get_file_system_properties() - - filesystem_list = [] - async for fs in self.dsc.list_file_systems(include_deleted=True): - filesystem_list.append(fs) - self.assertTrue(len(filesystem_list) >= 1) - - for filesystem in filesystem_list: - # find the deleted filesystem and restore it - if filesystem.deleted and filesystem.name == filesystem_client.file_system_name: - with self.assertRaises(HttpResponseError): - await self.dsc.undelete_file_system(filesystem.name, filesystem.deleted_version, - new_name=existing_filesystem_client.file_system_name) - @DataLakePreparer() async def test_restore_file_system_with_sas(self, datalake_storage_account_name, datalake_storage_account_key): + # TODO: Needs soft delete enabled account in ARM template. pytest.skip( "We are generating a SAS token therefore play only live but we also need a soft delete enabled account.") self._setUp(datalake_storage_account_name, datalake_storage_account_key) @@ -304,13 +271,10 @@ async def test_restore_file_system_with_sas(self, datalake_storage_account_name, filesystem_list.append(fs) self.assertTrue(len(filesystem_list) >= 1) - restored_version = 0 for filesystem in filesystem_list: # find the deleted filesystem and restore it if filesystem.deleted and filesystem.name == filesystem_client.file_system_name: - restored_fs_client = await dsc.undelete_file_system(filesystem.name, filesystem.deleted_version, - new_name="restored" + name + str(restored_version)) - restored_version += 1 + restored_fs_client = await dsc.undelete_file_system(filesystem.name, filesystem.deleted_version) # to make sure the deleted filesystem is restored props = await restored_fs_client.get_file_system_properties() @@ -576,6 +540,7 @@ async def test_list_paths_pages_correctly(self, datalake_storage_account_name, d @DataLakePreparer() async def test_get_deleted_paths(self, datalake_storage_account_name, datalake_storage_account_key): + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return self._setUp(datalake_storage_account_name, datalake_storage_account_key) @@ -757,9 +722,10 @@ async def test_file_system_sessions_closes_properly_async( @DataLakePreparer() async def test_undelete_dir_with_version_id(self, datalake_storage_account_name, datalake_storage_account_key): - self._setUp(datalake_storage_account_name, datalake_storage_account_key) + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return + self._setUp(datalake_storage_account_name, datalake_storage_account_key) file_system_client = await self._create_file_system("fs") dir_path = 'dir10' dir_client = await file_system_client.create_directory(dir_path) @@ -772,9 +738,10 @@ async def test_undelete_dir_with_version_id(self, datalake_storage_account_name, @DataLakePreparer() async def test_undelete_file_with_version_id(self, datalake_storage_account_name, datalake_storage_account_key): - self._setUp(datalake_storage_account_name, datalake_storage_account_key) + # TODO: Needs soft delete enabled account in ARM template. if not self.is_playback(): return + self._setUp(datalake_storage_account_name, datalake_storage_account_key) file_system_client = await self._create_file_system("fs") file_path = 'dir10/fileŇ' dir_client = await file_system_client.create_file(file_path)