Undelete share

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/_azure_file_storage.py

@@ -49,7 +49,7 @@ def __init__(self, version, url, **kwargs):
         self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2019-07-07'
+        self.api_version = '2019-12-12'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/aio/_azure_file_storage_async.py

@@ -50,7 +50,7 @@ def __init__(
         self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2019-07-07'
+        self.api_version = '2019-12-12'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/aio/operations_async/_share_operations_async.py

@@ -749,3 +749,77 @@ async def get_statistics(self, timeout=None, *, cls=None, **kwargs):
 
         return deserialized
     get_statistics.metadata = {'url': '/{shareName}'}
+
+    async def restore(self, timeout=None, request_id=None, deleted_share_name=None, deleted_share_version=None, *, cls=None, **kwargs):
+        """Restores a previously deleted Share.
+
+        :param timeout: The timeout parameter is expressed in seconds. For
+         more information, see <a
+         href="https://docs.microsoft.com/en-us/rest/api/storageservices/Setting-Timeouts-for-File-Service-Operations?redirectedfrom=MSDN">Setting
+         Timeouts for File Service Operations.</a>
+        :type timeout: int
+        :param request_id: Provides a client-generated, opaque value with a 1
+         KB character limit that is recorded in the analytics logs when storage
+         analytics logging is enabled.
+        :type request_id: str
+        :param deleted_share_name: Specifies the name of the
+         preivously-deleted share.
+        :type deleted_share_name: str
+        :param deleted_share_version: Specifies the version of the
+         preivously-deleted share.
+        :type deleted_share_version: str
+        :param callable cls: A custom type or function that will be passed the
+         direct response
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises:
+         :class:`StorageErrorException<azure.storage.fileshare.models.StorageErrorException>`
+        """
+        error_map = kwargs.pop('error_map', None)
+        comp = "undelete"
+
+        # Construct URL
+        url = self.restore.metadata['url']
+        path_format_arguments = {
+            'url': self._serialize.url("self._config.url", self._config.url, 'str', skip_quote=True)
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        if timeout is not None:
+            query_parameters['timeout'] = self._serialize.query("timeout", timeout, 'int', minimum=0)
+        query_parameters['restype'] = self._serialize.query("self.restype", self.restype, 'str')
+        query_parameters['comp'] = self._serialize.query("comp", comp, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['x-ms-version'] = self._serialize.header("self._config.version", self._config.version, 'str')
+        if request_id is not None:
+            header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
+        if deleted_share_name is not None:
+            header_parameters['x-ms-deleted-share-name'] = self._serialize.header("deleted_share_name", deleted_share_name, 'str')
+        if deleted_share_version is not None:
+            header_parameters['x-ms-deleted-share-version'] = self._serialize.header("deleted_share_version", deleted_share_version, 'str')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters, header_parameters)
+        pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
+        response = pipeline_response.http_response
+
+        if response.status_code not in [201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise models.StorageErrorException(response, self._deserialize)
+
+        if cls:
+            response_headers = {
+                'ETag': self._deserialize('str', response.headers.get('ETag')),
+                'Last-Modified': self._deserialize('rfc-1123', response.headers.get('Last-Modified')),
+                'x-ms-request-id': self._deserialize('str', response.headers.get('x-ms-request-id')),
+                'x-ms-client-request-id': self._deserialize('str', response.headers.get('x-ms-client-request-id')),
+                'x-ms-version': self._deserialize('str', response.headers.get('x-ms-version')),
+                'Date': self._deserialize('rfc-1123', response.headers.get('Date')),
+                'x-ms-error-code': self._deserialize('str', response.headers.get('x-ms-error-code')),
+            }
+            return cls(response, None, response_headers)
+    restore.metadata = {'url': '/{shareName}'}

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_azure_file_storage_enums.py

@@ -97,6 +97,7 @@ class ListSharesIncludeType(str, Enum):
 
     snapshots = "snapshots"
     metadata = "metadata"
+    deleted = "deleted"
 
 
 class CopyStatusType(str, Enum):

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models.py

@@ -636,6 +636,10 @@ class ShareItem(Model):
     :type name: str
     :param snapshot:
     :type snapshot: str
+    :param deleted:
+    :type deleted: bool
+    :param version:
+    :type version: str
     :param properties: Required.
     :type properties: ~azure.storage.fileshare.models.ShareProperties
     :param metadata:
@@ -650,6 +654,8 @@ class ShareItem(Model):
     _attribute_map = {
         'name': {'key': 'Name', 'type': 'str', 'xml': {'name': 'Name'}},
         'snapshot': {'key': 'Snapshot', 'type': 'str', 'xml': {'name': 'Snapshot'}},
+        'deleted': {'key': 'Deleted', 'type': 'bool', 'xml': {'name': 'Deleted'}},
+        'version': {'key': 'Version', 'type': 'str', 'xml': {'name': 'Version'}},
         'properties': {'key': 'Properties', 'type': 'ShareProperties', 'xml': {'name': 'Properties'}},
         'metadata': {'key': 'Metadata', 'type': '{str}', 'xml': {'name': 'Metadata'}},
     }
@@ -661,6 +667,8 @@ def __init__(self, **kwargs):
         super(ShareItem, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.snapshot = kwargs.get('snapshot', None)
+        self.deleted = kwargs.get('deleted', None)
+        self.version = kwargs.get('version', None)
         self.properties = kwargs.get('properties', None)
         self.metadata = kwargs.get('metadata', None)
 
@@ -709,6 +717,10 @@ class ShareProperties(Model):
     :type provisioned_egress_mbps: int
     :param next_allowed_quota_downgrade_time:
     :type next_allowed_quota_downgrade_time: datetime
+    :param deleted_time:
+    :type deleted_time: datetime
+    :param remaining_retention_days:
+    :type remaining_retention_days: int
     """
 
     _validation = {
@@ -725,6 +737,8 @@ class ShareProperties(Model):
         'provisioned_ingress_mbps': {'key': 'ProvisionedIngressMBps', 'type': 'int', 'xml': {'name': 'ProvisionedIngressMBps'}},
         'provisioned_egress_mbps': {'key': 'ProvisionedEgressMBps', 'type': 'int', 'xml': {'name': 'ProvisionedEgressMBps'}},
         'next_allowed_quota_downgrade_time': {'key': 'NextAllowedQuotaDowngradeTime', 'type': 'rfc-1123', 'xml': {'name': 'NextAllowedQuotaDowngradeTime'}},
+        'deleted_time': {'key': 'DeletedTime', 'type': 'rfc-1123', 'xml': {'name': 'DeletedTime'}},
+        'remaining_retention_days': {'key': 'RemainingRetentionDays', 'type': 'int', 'xml': {'name': 'RemainingRetentionDays'}},
     }
     _xml_map = {
     }
@@ -738,6 +752,8 @@ def __init__(self, **kwargs):
         self.provisioned_ingress_mbps = kwargs.get('provisioned_ingress_mbps', None)
         self.provisioned_egress_mbps = kwargs.get('provisioned_egress_mbps', None)
         self.next_allowed_quota_downgrade_time = kwargs.get('next_allowed_quota_downgrade_time', None)
+        self.deleted_time = kwargs.get('deleted_time', None)
+        self.remaining_retention_days = kwargs.get('remaining_retention_days', None)
 
 
 class ShareStats(Model):

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/models/_models_py3.py

@@ -636,6 +636,10 @@ class ShareItem(Model):
     :type name: str
     :param snapshot:
     :type snapshot: str
+    :param deleted:
+    :type deleted: bool
+    :param version:
+    :type version: str
     :param properties: Required.
     :type properties: ~azure.storage.fileshare.models.ShareProperties
     :param metadata:
@@ -650,17 +654,21 @@ class ShareItem(Model):
     _attribute_map = {
         'name': {'key': 'Name', 'type': 'str', 'xml': {'name': 'Name'}},
         'snapshot': {'key': 'Snapshot', 'type': 'str', 'xml': {'name': 'Snapshot'}},
+        'deleted': {'key': 'Deleted', 'type': 'bool', 'xml': {'name': 'Deleted'}},
+        'version': {'key': 'Version', 'type': 'str', 'xml': {'name': 'Version'}},
         'properties': {'key': 'Properties', 'type': 'ShareProperties', 'xml': {'name': 'Properties'}},
         'metadata': {'key': 'Metadata', 'type': '{str}', 'xml': {'name': 'Metadata'}},
     }
     _xml_map = {
         'name': 'Share'
     }
 
-    def __init__(self, *, name: str, properties, snapshot: str=None, metadata=None, **kwargs) -> None:
+    def __init__(self, *, name: str, properties, snapshot: str=None, deleted: bool=None, version: str=None, metadata=None, **kwargs) -> None:
         super(ShareItem, self).__init__(**kwargs)
         self.name = name
         self.snapshot = snapshot
+        self.deleted = deleted
+        self.version = version
         self.properties = properties
         self.metadata = metadata
 
@@ -709,6 +717,10 @@ class ShareProperties(Model):
     :type provisioned_egress_mbps: int
     :param next_allowed_quota_downgrade_time:
     :type next_allowed_quota_downgrade_time: datetime
+    :param deleted_time:
+    :type deleted_time: datetime
+    :param remaining_retention_days:
+    :type remaining_retention_days: int
     """
 
     _validation = {
@@ -725,11 +737,13 @@ class ShareProperties(Model):
         'provisioned_ingress_mbps': {'key': 'ProvisionedIngressMBps', 'type': 'int', 'xml': {'name': 'ProvisionedIngressMBps'}},
         'provisioned_egress_mbps': {'key': 'ProvisionedEgressMBps', 'type': 'int', 'xml': {'name': 'ProvisionedEgressMBps'}},
         'next_allowed_quota_downgrade_time': {'key': 'NextAllowedQuotaDowngradeTime', 'type': 'rfc-1123', 'xml': {'name': 'NextAllowedQuotaDowngradeTime'}},
+        'deleted_time': {'key': 'DeletedTime', 'type': 'rfc-1123', 'xml': {'name': 'DeletedTime'}},
+        'remaining_retention_days': {'key': 'RemainingRetentionDays', 'type': 'int', 'xml': {'name': 'RemainingRetentionDays'}},
     }
     _xml_map = {
     }
 
-    def __init__(self, *, last_modified, etag: str, quota: int, provisioned_iops: int=None, provisioned_ingress_mbps: int=None, provisioned_egress_mbps: int=None, next_allowed_quota_downgrade_time=None, **kwargs) -> None:
+    def __init__(self, *, last_modified, etag: str, quota: int, provisioned_iops: int=None, provisioned_ingress_mbps: int=None, provisioned_egress_mbps: int=None, next_allowed_quota_downgrade_time=None, deleted_time=None, remaining_retention_days: int=None, **kwargs) -> None:
         super(ShareProperties, self).__init__(**kwargs)
         self.last_modified = last_modified
         self.etag = etag
@@ -738,6 +752,8 @@ def __init__(self, *, last_modified, etag: str, quota: int, provisioned_iops: in
         self.provisioned_ingress_mbps = provisioned_ingress_mbps
         self.provisioned_egress_mbps = provisioned_egress_mbps
         self.next_allowed_quota_downgrade_time = next_allowed_quota_downgrade_time
+        self.deleted_time = deleted_time
+        self.remaining_retention_days = remaining_retention_days
 
 
 class ShareStats(Model):

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/operations/_share_operations.py

@@ -749,3 +749,77 @@ def get_statistics(self, timeout=None, cls=None, **kwargs):
 
         return deserialized
     get_statistics.metadata = {'url': '/{shareName}'}
+
+    def restore(self, timeout=None, request_id=None, deleted_share_name=None, deleted_share_version=None, cls=None, **kwargs):
+        """Restores a previously deleted Share.
+
+        :param timeout: The timeout parameter is expressed in seconds. For
+         more information, see <a
+         href="https://docs.microsoft.com/en-us/rest/api/storageservices/Setting-Timeouts-for-File-Service-Operations?redirectedfrom=MSDN">Setting
+         Timeouts for File Service Operations.</a>
+        :type timeout: int
+        :param request_id: Provides a client-generated, opaque value with a 1
+         KB character limit that is recorded in the analytics logs when storage
+         analytics logging is enabled.
+        :type request_id: str
+        :param deleted_share_name: Specifies the name of the
+         preivously-deleted share.
+        :type deleted_share_name: str
+        :param deleted_share_version: Specifies the version of the
+         preivously-deleted share.
+        :type deleted_share_version: str
+        :param callable cls: A custom type or function that will be passed the
+         direct response
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises:
+         :class:`StorageErrorException<azure.storage.fileshare.models.StorageErrorException>`
+        """
+        error_map = kwargs.pop('error_map', None)
+        comp = "undelete"
+
+        # Construct URL
+        url = self.restore.metadata['url']
+        path_format_arguments = {
+            'url': self._serialize.url("self._config.url", self._config.url, 'str', skip_quote=True)
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        if timeout is not None:
+            query_parameters['timeout'] = self._serialize.query("timeout", timeout, 'int', minimum=0)
+        query_parameters['restype'] = self._serialize.query("self.restype", self.restype, 'str')
+        query_parameters['comp'] = self._serialize.query("comp", comp, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['x-ms-version'] = self._serialize.header("self._config.version", self._config.version, 'str')
+        if request_id is not None:
+            header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
+        if deleted_share_name is not None:
+            header_parameters['x-ms-deleted-share-name'] = self._serialize.header("deleted_share_name", deleted_share_name, 'str')
+        if deleted_share_version is not None:
+            header_parameters['x-ms-deleted-share-version'] = self._serialize.header("deleted_share_version", deleted_share_version, 'str')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters, header_parameters)
+        pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
+        response = pipeline_response.http_response
+
+        if response.status_code not in [201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise models.StorageErrorException(response, self._deserialize)
+
+        if cls:
+            response_headers = {
+                'ETag': self._deserialize('str', response.headers.get('ETag')),
+                'Last-Modified': self._deserialize('rfc-1123', response.headers.get('Last-Modified')),
+                'x-ms-request-id': self._deserialize('str', response.headers.get('x-ms-request-id')),
+                'x-ms-client-request-id': self._deserialize('str', response.headers.get('x-ms-client-request-id')),
+                'x-ms-version': self._deserialize('str', response.headers.get('x-ms-version')),
+                'Date': self._deserialize('rfc-1123', response.headers.get('Date')),
+                'x-ms-error-code': self._deserialize('str', response.headers.get('x-ms-error-code')),
+            }
+            return cls(response, None, response_headers)
+    restore.metadata = {'url': '/{shareName}'}

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_generated/version.py

@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2019-07-07"
+VERSION = "2019-12-12"
 

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_models.py

@@ -275,6 +275,18 @@ class ShareProperties(DictMixin):
         share as metadata.
     :ivar str snapshot:
         Snapshot of the share.
+    :ivar bool deleted:
+        To indicate if this share is deleted or not.
+        This is a service returned value, and the value will be set when list shared including deleted ones.
+    :ivar datetime deleted:
+        To indicate the deleted time of the deleted share.
+        This is a service returned value, and the value will be set when list shared including deleted ones.
+    :ivar str version:
+        To indicate the version of deleted share.
+        This is a service returned value, and the value will be set when list shared including deleted ones.
+    :ivar int remaining_retention_days:
+        To indicate how many remaining days the deleted share will be kept.
+        This is a service returned value, and the value will be set when list shared including deleted ones.
     """
 
     def __init__(self, **kwargs):
@@ -285,6 +297,10 @@ def __init__(self, **kwargs):
         self.next_allowed_quota_downgrade_time = kwargs.get('x-ms-share-next-allowed-quota-downgrade-time')
         self.metadata = kwargs.get('metadata')
         self.snapshot = None
+        self.deleted = None
+        self.deleted_time = None
+        self.version = None
+        self.remaining_retention_days = None
         self.provisioned_egress_mbps = kwargs.get('x-ms-share-provisioned-egress-mbps')
         self.provisioned_ingress_mbps = kwargs.get('x-ms-share-provisioned-ingress-mbps')
         self.provisioned_iops = kwargs.get('x-ms-share-provisioned-iops')
@@ -299,6 +315,10 @@ def _from_generated(cls, generated):
         props.next_allowed_quota_downgrade_time = generated.properties.next_allowed_quota_downgrade_time
         props.metadata = generated.metadata
         props.snapshot = generated.snapshot
+        props.deleted = generated.deleted
+        props.deleted_time = generated.properties.deleted_time
+        props.version = generated.version
+        props.remaining_retention_days = generated.properties.remaining_retention_days
         props.provisioned_egress_mbps = generated.properties.provisioned_egress_mbps
         props.provisioned_ingress_mbps = generated.properties.provisioned_ingress_mbps
         props.provisioned_iops = generated.properties.provisioned_iops

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_serialize.py

@@ -13,7 +13,8 @@
 
 _SUPPORTED_API_VERSIONS = [
     '2019-02-02',
-    '2019-07-07'
+    '2019-07-07',
+    '2019-12-12'
 ]