[AutoPR azure-mgmt-storage] [Storage] Adding support for listing soft deleted blob containers

sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py

@@ -257,6 +257,7 @@
     ShareAccessTier,
     StorageAccountExpand,
     ListKeyExpand,
+    ListContainersInclude,
     ListSharesExpand,
     GetShareExpand,
 )
@@ -411,6 +412,7 @@
     'ShareAccessTier',
     'StorageAccountExpand',
     'ListKeyExpand',
+    'ListContainersInclude',
     'ListSharesExpand',
     'GetShareExpand',
 ]

sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models.py

@@ -250,6 +250,15 @@ class BlobContainer(AzureEntityResource):
     :vartype type: str
     :ivar etag: Resource Etag.
     :vartype etag: str
+    :ivar version: The version of the deleted blob container.
+    :vartype version: str
+    :ivar deleted: Indicates whether the blob container was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: Blob container deletion time.
+    :vartype deleted_time: datetime
+    :ivar remaining_retention_days: Remaining retention days for soft deleted
+     blob container.
+    :vartype remaining_retention_days: int
     :param default_encryption_scope: Default the container to use specified
      encryption scope for all writes.
     :type default_encryption_scope: str
@@ -305,6 +314,10 @@ class BlobContainer(AzureEntityResource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'etag': {'readonly': True},
+        'version': {'readonly': True},
+        'deleted': {'readonly': True},
+        'deleted_time': {'readonly': True},
+        'remaining_retention_days': {'readonly': True},
         'last_modified_time': {'readonly': True},
         'lease_status': {'readonly': True},
         'lease_state': {'readonly': True},
@@ -320,6 +333,10 @@ class BlobContainer(AzureEntityResource):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
+        'version': {'key': 'properties.version', 'type': 'str'},
+        'deleted': {'key': 'properties.deleted', 'type': 'bool'},
+        'deleted_time': {'key': 'properties.deletedTime', 'type': 'iso-8601'},
+        'remaining_retention_days': {'key': 'properties.remainingRetentionDays', 'type': 'int'},
         'default_encryption_scope': {'key': 'properties.defaultEncryptionScope', 'type': 'str'},
         'deny_encryption_scope_override': {'key': 'properties.denyEncryptionScopeOverride', 'type': 'bool'},
         'public_access': {'key': 'properties.publicAccess', 'type': 'PublicAccess'},
@@ -336,6 +353,10 @@ class BlobContainer(AzureEntityResource):
 
     def __init__(self, **kwargs):
         super(BlobContainer, self).__init__(**kwargs)
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
         self.default_encryption_scope = kwargs.get('default_encryption_scope', None)
         self.deny_encryption_scope_override = kwargs.get('deny_encryption_scope_override', None)
         self.public_access = kwargs.get('public_access', None)
@@ -1885,6 +1906,15 @@ class ListContainerItem(AzureEntityResource):
     :vartype type: str
     :ivar etag: Resource Etag.
     :vartype etag: str
+    :ivar version: The version of the deleted blob container.
+    :vartype version: str
+    :ivar deleted: Indicates whether the blob container was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: Blob container deletion time.
+    :vartype deleted_time: datetime
+    :ivar remaining_retention_days: Remaining retention days for soft deleted
+     blob container.
+    :vartype remaining_retention_days: int
     :param default_encryption_scope: Default the container to use specified
      encryption scope for all writes.
     :type default_encryption_scope: str
@@ -1940,6 +1970,10 @@ class ListContainerItem(AzureEntityResource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'etag': {'readonly': True},
+        'version': {'readonly': True},
+        'deleted': {'readonly': True},
+        'deleted_time': {'readonly': True},
+        'remaining_retention_days': {'readonly': True},
         'last_modified_time': {'readonly': True},
         'lease_status': {'readonly': True},
         'lease_state': {'readonly': True},
@@ -1955,6 +1989,10 @@ class ListContainerItem(AzureEntityResource):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
+        'version': {'key': 'properties.version', 'type': 'str'},
+        'deleted': {'key': 'properties.deleted', 'type': 'bool'},
+        'deleted_time': {'key': 'properties.deletedTime', 'type': 'iso-8601'},
+        'remaining_retention_days': {'key': 'properties.remainingRetentionDays', 'type': 'int'},
         'default_encryption_scope': {'key': 'properties.defaultEncryptionScope', 'type': 'str'},
         'deny_encryption_scope_override': {'key': 'properties.denyEncryptionScopeOverride', 'type': 'bool'},
         'public_access': {'key': 'properties.publicAccess', 'type': 'PublicAccess'},
@@ -1971,6 +2009,10 @@ class ListContainerItem(AzureEntityResource):
 
     def __init__(self, **kwargs):
         super(ListContainerItem, self).__init__(**kwargs)
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
         self.default_encryption_scope = kwargs.get('default_encryption_scope', None)
         self.deny_encryption_scope_override = kwargs.get('deny_encryption_scope_override', None)
         self.public_access = kwargs.get('public_access', None)

sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py

@@ -250,6 +250,15 @@ class BlobContainer(AzureEntityResource):
     :vartype type: str
     :ivar etag: Resource Etag.
     :vartype etag: str
+    :ivar version: The version of the deleted blob container.
+    :vartype version: str
+    :ivar deleted: Indicates whether the blob container was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: Blob container deletion time.
+    :vartype deleted_time: datetime
+    :ivar remaining_retention_days: Remaining retention days for soft deleted
+     blob container.
+    :vartype remaining_retention_days: int
     :param default_encryption_scope: Default the container to use specified
      encryption scope for all writes.
     :type default_encryption_scope: str
@@ -305,6 +314,10 @@ class BlobContainer(AzureEntityResource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'etag': {'readonly': True},
+        'version': {'readonly': True},
+        'deleted': {'readonly': True},
+        'deleted_time': {'readonly': True},
+        'remaining_retention_days': {'readonly': True},
         'last_modified_time': {'readonly': True},
         'lease_status': {'readonly': True},
         'lease_state': {'readonly': True},
@@ -320,6 +333,10 @@ class BlobContainer(AzureEntityResource):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
+        'version': {'key': 'properties.version', 'type': 'str'},
+        'deleted': {'key': 'properties.deleted', 'type': 'bool'},
+        'deleted_time': {'key': 'properties.deletedTime', 'type': 'iso-8601'},
+        'remaining_retention_days': {'key': 'properties.remainingRetentionDays', 'type': 'int'},
         'default_encryption_scope': {'key': 'properties.defaultEncryptionScope', 'type': 'str'},
         'deny_encryption_scope_override': {'key': 'properties.denyEncryptionScopeOverride', 'type': 'bool'},
         'public_access': {'key': 'properties.publicAccess', 'type': 'PublicAccess'},
@@ -336,6 +353,10 @@ class BlobContainer(AzureEntityResource):
 
     def __init__(self, *, default_encryption_scope: str=None, deny_encryption_scope_override: bool=None, public_access=None, metadata=None, **kwargs) -> None:
         super(BlobContainer, self).__init__(**kwargs)
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
         self.default_encryption_scope = default_encryption_scope
         self.deny_encryption_scope_override = deny_encryption_scope_override
         self.public_access = public_access
@@ -1885,6 +1906,15 @@ class ListContainerItem(AzureEntityResource):
     :vartype type: str
     :ivar etag: Resource Etag.
     :vartype etag: str
+    :ivar version: The version of the deleted blob container.
+    :vartype version: str
+    :ivar deleted: Indicates whether the blob container was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: Blob container deletion time.
+    :vartype deleted_time: datetime
+    :ivar remaining_retention_days: Remaining retention days for soft deleted
+     blob container.
+    :vartype remaining_retention_days: int
     :param default_encryption_scope: Default the container to use specified
      encryption scope for all writes.
     :type default_encryption_scope: str
@@ -1940,6 +1970,10 @@ class ListContainerItem(AzureEntityResource):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'etag': {'readonly': True},
+        'version': {'readonly': True},
+        'deleted': {'readonly': True},
+        'deleted_time': {'readonly': True},
+        'remaining_retention_days': {'readonly': True},
         'last_modified_time': {'readonly': True},
         'lease_status': {'readonly': True},
         'lease_state': {'readonly': True},
@@ -1955,6 +1989,10 @@ class ListContainerItem(AzureEntityResource):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
+        'version': {'key': 'properties.version', 'type': 'str'},
+        'deleted': {'key': 'properties.deleted', 'type': 'bool'},
+        'deleted_time': {'key': 'properties.deletedTime', 'type': 'iso-8601'},
+        'remaining_retention_days': {'key': 'properties.remainingRetentionDays', 'type': 'int'},
         'default_encryption_scope': {'key': 'properties.defaultEncryptionScope', 'type': 'str'},
         'deny_encryption_scope_override': {'key': 'properties.denyEncryptionScopeOverride', 'type': 'bool'},
         'public_access': {'key': 'properties.publicAccess', 'type': 'PublicAccess'},
@@ -1971,6 +2009,10 @@ class ListContainerItem(AzureEntityResource):
 
     def __init__(self, *, default_encryption_scope: str=None, deny_encryption_scope_override: bool=None, public_access=None, metadata=None, **kwargs) -> None:
         super(ListContainerItem, self).__init__(**kwargs)
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
         self.default_encryption_scope = default_encryption_scope
         self.deny_encryption_scope_override = deny_encryption_scope_override
         self.public_access = public_access

sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py

@@ -300,6 +300,11 @@ class ListKeyExpand(str, Enum):
     kerb = "kerb"
 
 
+class ListContainersInclude(str, Enum):
+
+    deleted = "deleted"
+
+
 class ListSharesExpand(str, Enum):
 
     deleted = "deleted"

sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_containers_operations.py

@@ -42,7 +42,7 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def list(
-            self, resource_group_name, account_name, maxpagesize=None, filter=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, maxpagesize=None, filter=None, include=None, custom_headers=None, raw=False, **operation_config):
         """Lists all containers and does not support a prefix like data plane.
         Also SRP today does not return continuation token.
 
@@ -59,6 +59,10 @@ def list(
         :param filter: Optional. When specified, only container names starting
          with the filter will be listed.
         :type filter: str
+        :param include: Optional, used to include the properties for soft
+         deleted blob containers. Possible values include: 'deleted'
+        :type include: str or
+         ~azure.mgmt.storage.v2019_06_01.models.ListContainersInclude
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -87,6 +91,8 @@ def prepare_request(next_link=None):
                     query_parameters['$maxpagesize'] = self._serialize.query("maxpagesize", maxpagesize, 'str')
                 if filter is not None:
                     query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+                if include is not None:
+                    query_parameters['$include'] = self._serialize.query("include", include, 'str')
 
             else:
                 url = next_link