[Blob]Generate STG75 Blob Tags

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/_azure_blob_storage.py

@@ -55,7 +55,7 @@ def __init__(self, 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 = '2020-02-10'
+        self.api_version = '2020-04-08'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/_configuration.py

@@ -40,7 +40,7 @@ def __init__(self, url, **kwargs):
         self.generate_client_request_id = True
 
         self.url = url
-        self.version = "2020-02-10"
+        self.version = "2020-04-08"
 
     def _configure(self, **kwargs):
         self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/aio/_azure_blob_storage_async.py

@@ -56,7 +56,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 = '2020-02-10'
+        self.api_version = '2020-04-08'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/aio/_configuration_async.py

@@ -41,7 +41,7 @@ def __init__(self, url, **kwargs):
         self.accept_language = None
 
         self.url = url
-        self.version = "2020-02-10"
+        self.version = "2020-04-08"
 
     def _configure(self, **kwargs):
         self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/aio/operations_async/_blob_operations_async.py

@@ -1119,7 +1119,7 @@ async def set_expiry(self, expiry_options, timeout=None, request_id=None, expire
             header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
         header_parameters['x-ms-expiry-option'] = self._serialize.header("expiry_options", expiry_options, 'str')
         if expires_on is not None:
-            header_parameters['x-ms-expiry-time'] = self._serialize.header("expires_on", expires_on, 'rfc-1123')
+            header_parameters['x-ms-expiry-time'] = self._serialize.header("expires_on", expires_on, 'str')
 
         # Construct and send request
         request = self._client.put(url, query_parameters, header_parameters)
@@ -2876,7 +2876,7 @@ async def query(self, query_request=None, snapshot=None, timeout=None, request_i
         return deserialized
     query.metadata = {'url': '/{containerName}/{blob}'}
 
-    async def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None, modified_access_conditions=None, *, cls=None, **kwargs):
+    async def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None, modified_access_conditions=None, lease_access_conditions=None, *, cls=None, **kwargs):
         """The Get Tags operation enables users to get the tags associated with a
         blob.
 
@@ -2903,6 +2903,10 @@ async def get_tags(self, timeout=None, request_id=None, snapshot=None, version_i
          operation
         :type modified_access_conditions:
          ~azure.storage.blob.models.ModifiedAccessConditions
+        :param lease_access_conditions: Additional parameters for the
+         operation
+        :type lease_access_conditions:
+         ~azure.storage.blob.models.LeaseAccessConditions
         :param callable cls: A custom type or function that will be passed the
          direct response
         :return: BlobTags or the result of cls(response)
@@ -2914,6 +2918,9 @@ async def get_tags(self, timeout=None, request_id=None, snapshot=None, version_i
         if_tags = None
         if modified_access_conditions is not None:
             if_tags = modified_access_conditions.if_tags
+        lease_id = None
+        if lease_access_conditions is not None:
+            lease_id = lease_access_conditions.lease_id
 
         comp = "tags"
 
@@ -2942,6 +2949,8 @@ async def get_tags(self, timeout=None, request_id=None, snapshot=None, version_i
             header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
         if if_tags is not None:
             header_parameters['x-ms-if-tags'] = self._serialize.header("if_tags", if_tags, 'str')
+        if lease_id is not None:
+            header_parameters['x-ms-lease-id'] = self._serialize.header("lease_id", lease_id, 'str')
 
         # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
@@ -2970,7 +2979,7 @@ async def get_tags(self, timeout=None, request_id=None, snapshot=None, version_i
         return deserialized
     get_tags.metadata = {'url': '/{containerName}/{blob}'}
 
-    async def set_tags(self, timeout=None, version_id=None, transactional_content_md5=None, transactional_content_crc64=None, request_id=None, tags=None, modified_access_conditions=None, *, cls=None, **kwargs):
+    async def set_tags(self, timeout=None, version_id=None, transactional_content_md5=None, transactional_content_crc64=None, request_id=None, tags=None, modified_access_conditions=None, lease_access_conditions=None, *, cls=None, **kwargs):
         """The Set Tags operation enables users to set tags on a blob.
 
         :param timeout: The timeout parameter is expressed in seconds. For
@@ -2998,6 +3007,10 @@ async def set_tags(self, timeout=None, version_id=None, transactional_content_md
          operation
         :type modified_access_conditions:
          ~azure.storage.blob.models.ModifiedAccessConditions
+        :param lease_access_conditions: Additional parameters for the
+         operation
+        :type lease_access_conditions:
+         ~azure.storage.blob.models.LeaseAccessConditions
         :param callable cls: A custom type or function that will be passed the
          direct response
         :return: None or the result of cls(response)
@@ -3009,6 +3022,9 @@ async def set_tags(self, timeout=None, version_id=None, transactional_content_md
         if_tags = None
         if modified_access_conditions is not None:
             if_tags = modified_access_conditions.if_tags
+        lease_id = None
+        if lease_access_conditions is not None:
+            lease_id = lease_access_conditions.lease_id
 
         comp = "tags"
 
@@ -3039,6 +3055,8 @@ async def set_tags(self, timeout=None, version_id=None, transactional_content_md
             header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
         if if_tags is not None:
             header_parameters['x-ms-if-tags'] = self._serialize.header("if_tags", if_tags, 'str')
+        if lease_id is not None:
+            header_parameters['x-ms-lease-id'] = self._serialize.header("lease_id", lease_id, 'str')
 
         # Construct body
         if tags is not None:

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/aio/operations_async/_container_operations_async.py

@@ -604,10 +604,10 @@ async def restore(self, timeout=None, request_id=None, deleted_container_name=No
          analytics logging is enabled.
         :type request_id: str
         :param deleted_container_name: Optional.  Version 2019-12-12 and
-         laster.  Specifies the name of the deleted container to restore.
+         later.  Specifies the name of the deleted container to restore.
         :type deleted_container_name: str
         :param deleted_container_version: Optional.  Version 2019-12-12 and
-         laster.  Specifies the version of the deleted container to restore.
+         later.  Specifies the version of the deleted container to restore.
         :type deleted_container_version: str
         :param callable cls: A custom type or function that will be passed the
          direct response

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_azure_blob_storage_enums.py

@@ -130,6 +130,7 @@ class StorageErrorCode(str, Enum):
     unsupported_http_verb = "UnsupportedHttpVerb"
     append_position_condition_not_met = "AppendPositionConditionNotMet"
     blob_already_exists = "BlobAlreadyExists"
+    blob_immutable_due_to_policy = "BlobImmutableDueToPolicy"
     blob_not_found = "BlobNotFound"
     blob_overwritten = "BlobOverwritten"
     blob_tier_inadequate_for_content_length = "BlobTierInadequateForContentLength"

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_models.py

@@ -1084,20 +1084,19 @@ class FilterBlobItem(Model):
     :type name: str
     :param container_name: Required.
     :type container_name: str
-    :param tag_value: Required.
-    :type tag_value: str
+    :param tags:
+    :type tags: ~azure.storage.blob.models.BlobTags
     """
 
     _validation = {
         'name': {'required': True},
         'container_name': {'required': True},
-        'tag_value': {'required': True},
     }
 
     _attribute_map = {
         'name': {'key': 'Name', 'type': 'str', 'xml': {'name': 'Name'}},
         'container_name': {'key': 'ContainerName', 'type': 'str', 'xml': {'name': 'ContainerName'}},
-        'tag_value': {'key': 'TagValue', 'type': 'str', 'xml': {'name': 'TagValue'}},
+        'tags': {'key': 'Tags', 'type': 'BlobTags', 'xml': {'name': 'Tags'}},
     }
     _xml_map = {
         'name': 'Blob'
@@ -1107,7 +1106,7 @@ def __init__(self, **kwargs):
         super(FilterBlobItem, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.container_name = kwargs.get('container_name', None)
-        self.tag_value = kwargs.get('tag_value', None)
+        self.tags = kwargs.get('tags', None)
 
 
 class FilterBlobSegment(Model):

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_models_py3.py

@@ -1084,30 +1084,29 @@ class FilterBlobItem(Model):
     :type name: str
     :param container_name: Required.
     :type container_name: str
-    :param tag_value: Required.
-    :type tag_value: str
+    :param tags:
+    :type tags: ~azure.storage.blob.models.BlobTags
     """
 
     _validation = {
         'name': {'required': True},
         'container_name': {'required': True},
-        'tag_value': {'required': True},
     }
 
     _attribute_map = {
         'name': {'key': 'Name', 'type': 'str', 'xml': {'name': 'Name'}},
         'container_name': {'key': 'ContainerName', 'type': 'str', 'xml': {'name': 'ContainerName'}},
-        'tag_value': {'key': 'TagValue', 'type': 'str', 'xml': {'name': 'TagValue'}},
+        'tags': {'key': 'Tags', 'type': 'BlobTags', 'xml': {'name': 'Tags'}},
     }
     _xml_map = {
         'name': 'Blob'
     }
 
-    def __init__(self, *, name: str, container_name: str, tag_value: str, **kwargs) -> None:
+    def __init__(self, *, name: str, container_name: str, tags=None, **kwargs) -> None:
         super(FilterBlobItem, self).__init__(**kwargs)
         self.name = name
         self.container_name = container_name
-        self.tag_value = tag_value
+        self.tags = tags
 
 
 class FilterBlobSegment(Model):

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/operations/_blob_operations.py

@@ -1118,7 +1118,7 @@ def set_expiry(self, expiry_options, timeout=None, request_id=None, expires_on=N
             header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
         header_parameters['x-ms-expiry-option'] = self._serialize.header("expiry_options", expiry_options, 'str')
         if expires_on is not None:
-            header_parameters['x-ms-expiry-time'] = self._serialize.header("expires_on", expires_on, 'rfc-1123')
+            header_parameters['x-ms-expiry-time'] = self._serialize.header("expires_on", expires_on, 'str')
 
         # Construct and send request
         request = self._client.put(url, query_parameters, header_parameters)
@@ -2874,7 +2874,7 @@ def query(self, query_request=None, snapshot=None, timeout=None, request_id=None
         return deserialized
     query.metadata = {'url': '/{containerName}/{blob}'}
 
-    def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None, modified_access_conditions=None, cls=None, **kwargs):
+    def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None, modified_access_conditions=None, lease_access_conditions=None, cls=None, **kwargs):
         """The Get Tags operation enables users to get the tags associated with a
         blob.
 
@@ -2901,6 +2901,10 @@ def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None
          operation
         :type modified_access_conditions:
          ~azure.storage.blob.models.ModifiedAccessConditions
+        :param lease_access_conditions: Additional parameters for the
+         operation
+        :type lease_access_conditions:
+         ~azure.storage.blob.models.LeaseAccessConditions
         :param callable cls: A custom type or function that will be passed the
          direct response
         :return: BlobTags or the result of cls(response)
@@ -2912,6 +2916,9 @@ def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None
         if_tags = None
         if modified_access_conditions is not None:
             if_tags = modified_access_conditions.if_tags
+        lease_id = None
+        if lease_access_conditions is not None:
+            lease_id = lease_access_conditions.lease_id
 
         comp = "tags"
 
@@ -2940,6 +2947,8 @@ def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None
             header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
         if if_tags is not None:
             header_parameters['x-ms-if-tags'] = self._serialize.header("if_tags", if_tags, 'str')
+        if lease_id is not None:
+            header_parameters['x-ms-lease-id'] = self._serialize.header("lease_id", lease_id, 'str')
 
         # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
@@ -2968,7 +2977,7 @@ def get_tags(self, timeout=None, request_id=None, snapshot=None, version_id=None
         return deserialized
     get_tags.metadata = {'url': '/{containerName}/{blob}'}
 
-    def set_tags(self, timeout=None, version_id=None, transactional_content_md5=None, transactional_content_crc64=None, request_id=None, tags=None, modified_access_conditions=None, cls=None, **kwargs):
+    def set_tags(self, timeout=None, version_id=None, transactional_content_md5=None, transactional_content_crc64=None, request_id=None, tags=None, modified_access_conditions=None, lease_access_conditions=None, cls=None, **kwargs):
         """The Set Tags operation enables users to set tags on a blob.
 
         :param timeout: The timeout parameter is expressed in seconds. For
@@ -2996,6 +3005,10 @@ def set_tags(self, timeout=None, version_id=None, transactional_content_md5=None
          operation
         :type modified_access_conditions:
          ~azure.storage.blob.models.ModifiedAccessConditions
+        :param lease_access_conditions: Additional parameters for the
+         operation
+        :type lease_access_conditions:
+         ~azure.storage.blob.models.LeaseAccessConditions
         :param callable cls: A custom type or function that will be passed the
          direct response
         :return: None or the result of cls(response)
@@ -3007,6 +3020,9 @@ def set_tags(self, timeout=None, version_id=None, transactional_content_md5=None
         if_tags = None
         if modified_access_conditions is not None:
             if_tags = modified_access_conditions.if_tags
+        lease_id = None
+        if lease_access_conditions is not None:
+            lease_id = lease_access_conditions.lease_id
 
         comp = "tags"
 
@@ -3037,6 +3053,8 @@ def set_tags(self, timeout=None, version_id=None, transactional_content_md5=None
             header_parameters['x-ms-client-request-id'] = self._serialize.header("request_id", request_id, 'str')
         if if_tags is not None:
             header_parameters['x-ms-if-tags'] = self._serialize.header("if_tags", if_tags, 'str')
+        if lease_id is not None:
+            header_parameters['x-ms-lease-id'] = self._serialize.header("lease_id", lease_id, 'str')
 
         # Construct body
         if tags is not None:

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/operations/_container_operations.py

@@ -604,10 +604,10 @@ def restore(self, timeout=None, request_id=None, deleted_container_name=None, de
          analytics logging is enabled.
         :type request_id: str
         :param deleted_container_name: Optional.  Version 2019-12-12 and
-         laster.  Specifies the name of the deleted container to restore.
+         later.  Specifies the name of the deleted container to restore.
         :type deleted_container_name: str
         :param deleted_container_version: Optional.  Version 2019-12-12 and
-         laster.  Specifies the version of the deleted container to restore.
+         later.  Specifies the version of the deleted container to restore.
         :type deleted_container_version: str
         :param callable cls: A custom type or function that will be passed the
          direct response

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/version.py

@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2020-02-10"
+VERSION = "2020-04-08"
 

sdk/storage/azure-storage-blob/azure/storage/blob/_serialize.py

@@ -36,6 +36,7 @@
     '2019-10-10',
     '2019-12-12',
     '2020-02-10',
+    '2020-04-08'
 ]
 
 

sdk/storage/azure-storage-blob/azure/storage/blob/aio/_models.py

@@ -136,6 +136,6 @@ async def _extract_data_cb(self, get_next_return):
     @staticmethod
     def _build_item(item):
         if isinstance(item, FilterBlobItem):
-            blob = FilteredBlob(name=item.name, container_name=item.container_name, tag_value=item.tag_value)  # pylint: disable=protected-access
+            blob = FilteredBlob(name=item.name, container_name=item.container_name)  # pylint: disable=protected-access
             return blob
         return item