disable undelete_container

xiafu-msft · Jun 30, 2020 · 6310cbc · 6310cbc
1 parent 6ef5915
commit 6310cbc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
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
@@ -383,12 +383,6 @@ def list_containers(
         :param bool include_metadata:
             Specifies that container metadata to be returned in the response.
             The default value is `False`.
-        :keyword bool include_deleted:
-            Specifies that deleted containers to be returned in the response. This is for container restore enabled
-            account. The default value is `False`.
-
-            .. versionadded:: 12.4.0
-
         :keyword int results_per_page:
             The maximum number of container names to retrieve per API
             call. If the request does not specify the server will return up to 5,000 items.
@@ -407,9 +401,6 @@ def list_containers(
                 :caption: Listing the containers in the blob service.
         """
         include = ['metadata'] if include_metadata else []
-        include_deleted = kwargs.pop('include_deleted', None)
-        if include_deleted:
-            include.append("deleted")
 
         timeout = kwargs.pop('timeout', None)
         results_per_page = kwargs.pop('results_per_page', None)
@@ -566,7 +557,7 @@ def delete_container(
             **kwargs)
 
     @distributed_trace
-    def undelete_container(self, deleted_container_name, deleted_container_version, new_name=None, **kwargs):
+    def _undelete_container(self, deleted_container_name, deleted_container_version, new_name=None, **kwargs):
         # type: (str, str, str, **Any) -> ContainerClient
         """Restores soft-deleted container.
 

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
@@ -337,12 +337,6 @@ def list_containers(
         :param bool include_metadata:
             Specifies that container metadata to be returned in the response.
             The default value is `False`.
-        :keyword bool include_deleted:
-            Specifies that deleted containers to be returned in the response. This is for container restore enabled
-            account. The default value is `False`.
-
-            .. versionadded:: 12.4.0
-
         :keyword int results_per_page:
             The maximum number of container names to retrieve per API
             call. If the request does not specify the server will return up to 5,000 items.
@@ -361,9 +355,6 @@ def list_containers(
                 :caption: Listing the containers in the blob service.
         """
         include = ['metadata'] if include_metadata else []
-        include_deleted = kwargs.pop('include_deleted', None)
-        if include_deleted:
-            include.append("deleted")
         timeout = kwargs.pop('timeout', None)
         results_per_page = kwargs.pop('results_per_page', None)
         command = functools.partial(
@@ -519,7 +510,7 @@ async def delete_container(
             **kwargs)
 
     @distributed_trace_async
-    async def undelete_container(self, deleted_container_name, deleted_container_version, new_name=None, **kwargs):
+    async def _undelete_container(self, deleted_container_name, deleted_container_version, new_name=None, **kwargs):
         # type: (str, str, str, **Any) -> ContainerClient
         """Restores soft-deleted container.
 

diff --git a/sdk/storage/azure-storage-blob/tests/test_container.py b/sdk/storage/azure-storage-blob/tests/test_container.py
@@ -740,8 +740,8 @@ def test_undelete_container(self, resource_group, location, storage_account, sto
         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_ctn_client = bsc._undelete_container(container.name, container.version,
+                                                              new_name="restored" + str(restored_version))
                 restored_version += 1
 
                 # to make sure the deleted container is restored
@@ -771,8 +771,8 @@ def test_restore_to_existing_container(self, resource_group, location, storage_a
             # 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)
+                    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
@@ -800,8 +800,8 @@ 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_ctn_client = bsc._undelete_container(container.name, container.version,
+                                                              new_name="restored" + str(restored_version))
                 restored_version += 1
 
                 # to make sure the deleted container is restored

diff --git a/sdk/storage/azure-storage-blob/tests/test_container_async.py b/sdk/storage/azure-storage-blob/tests/test_container_async.py
@@ -804,8 +804,8 @@ async def test_undelete_container(self, resource_group, location, storage_accoun
         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_ctn_client = await bsc._undelete_container(container.name, container.version,
+                                                                    new_name="restoredctn" + str(restored_version))
                 restored_version += 1
 
                 # to make sure the deleted container is restored
@@ -838,8 +838,8 @@ async def test_restore_to_existing_container(self, resource_group, location, sto
             # 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)
+                    await bsc._undelete_container(container.name, container.version,
+                                                  new_name=existing_container_client.container_name)
 
     @GlobalStorageAccountPreparer()
     @AsyncStorageTestCase.await_prepared_test