Merge pull request #338 from zezha-msft/wastore_master_0.36.0

Wastore master to Azure master 0.36.0

Author: zezha-msft

ChangeLog.md

@@ -2,6 +2,14 @@
 
 > See [BreakingChanges](BreakingChanges.md) for a detailed list of API breaks.
 
+## Version 0.36.0:
+
+### Blob:
+- For Standard Storage Accounts only, added support for getting and setting the tier on an individual block blob.
+
+### Table:
+- Fixed bug where inserting entity with an empty sting as RowKey or PartitionKey raised error.
+
 ## Version 0.35.1:
 
 ### Blob:

azure/storage/_constants.py

@@ -15,7 +15,7 @@
 import platform
 
 __author__ = 'Microsoft Corp. <[email protected]>'
-__version__ = '0.35.1'
+__version__ = '0.36.0'
 
 # x-ms-version for storage service.
 X_MS_VERSION = '2017-04-17'

azure/storage/_deserialization.py

@@ -58,8 +58,9 @@ def _get_download_size(start_range, end_range, resource_size):
     'content-range': (None, 'content_range', _to_str),
     'x-ms-blob-sequence-number': (None, 'page_blob_sequence_number', _int_to_str),
     'x-ms-blob-committed-block-count': (None, 'append_blob_committed_block_count', _int_to_str),
-    'x-ms-access-tier': (None, 'blob_tier', _to_upper_str),
+    'x-ms-access-tier': (None, 'blob_tier', _to_str),
     'x-ms-access-tier-inferred': (None, 'blob_tier_inferred', _bool),
+    'x-ms-archive-status': (None, 'rehydration_status', _to_str),
     'x-ms-share-quota': (None, 'quota', _int_to_str),
     'x-ms-server-encrypted': (None, 'server_encrypted', _bool),
     'content-type': ('content_settings', 'content_type', _to_str),
@@ -114,6 +115,8 @@ def _parse_properties(response, result_class):
                 attr = getattr(props, info[0])
                 setattr(attr, info[1], info[2](value))
 
+    if hasattr(props, 'blob_type') and props.blob_type == 'PageBlob' and hasattr(props, 'blob_tier') and props.blob_tier is not None:
+        props.blob_tier = _to_upper_str(props.blob_tier)
     return props
 
 def _parse_length_from_content_range(content_range):

azure/storage/blob/_deserialization.py

@@ -233,7 +233,8 @@ def _convert_xml_to_containers(response):
     'CopyProgress': ('copy', 'progress', _to_str),
     'CopyCompletionTime': ('copy', 'completion_time', _to_str),
     'CopyStatusDescription': ('copy', 'status_description', _to_str),
-    'AccessTier': (None, 'blob_tier', _to_str)
+    'AccessTier': (None, 'blob_tier', _to_str),
+    'ArchiveStatus': (None, 'rehydration_status', _to_str)
 }
 
 def _convert_xml_to_blob_list(response):
@@ -268,7 +269,7 @@ def _convert_xml_to_blob_list(response):
             <CopyProgress>bytes copied/bytes total</CopyProgress>
             <CopyCompletionTime>datetime</CopyCompletionTime>
             <CopyStatusDescription>error string</CopyStatusDescription>
-            <AccessTier>P4 | P6 | P10 | P20 | P30 | P40 | P50 | P60</AccessTier>
+            <AccessTier>P4 | P6 | P10 | P20 | P30 | P40 | P50 | P60 | Archive | Cool | Hot</AccessTier>
           </Properties>
           <Metadata>   
             <Name>value</Name>
@@ -315,7 +316,6 @@ def _convert_xml_to_blob_list(response):
                     attr = getattr(blob.properties, info[0])
                     setattr(attr, info[1], info[2](property_element.text))
 
-
         # Metadata
         metadata_root_element = blob_element.find('Metadata')
         if metadata_root_element is not None:

azure/storage/blob/baseblobservice.py

@@ -277,14 +277,14 @@ def generate_account_shared_access_signature(self, resource_types, permission,
             been specified in an associated stored access policy. Azure will always 
             convert values to UTC. If a date is passed in without timezone info, it 
             is assumed to be UTC.
-        :type expiry: date or str
+        :type expiry: datetime.datetime or str
         :param start:
             The time at which the shared access signature becomes valid. If 
             omitted, start time for this call is assumed to be the time when the 
             storage service receives the request. Azure will always convert values 
             to UTC. If a date is passed in without timezone info, it is assumed to 
             be UTC.
-        :type start: date or str
+        :type start: datetime.datetime or str
         :param str ip:
             Specifies an IP address or a range of IP addresses from which to accept requests.
             If the IP address from which the request originates does not match the IP address
@@ -330,14 +330,14 @@ def generate_container_shared_access_signature(self, container_name,
             been specified in an associated stored access policy. Azure will always 
             convert values to UTC. If a date is passed in without timezone info, it 
             is assumed to be UTC.
-        :type expiry: date or str
+        :type expiry: datetime.datetime or str
         :param start:
             The time at which the shared access signature becomes valid. If 
             omitted, start time for this call is assumed to be the time when the 
             storage service receives the request. Azure will always convert values 
             to UTC. If a date is passed in without timezone info, it is assumed to 
             be UTC.
-        :type start: date or str
+        :type start: datetime.datetime or str
         :param str id:
             A unique value up to 64 characters in length that correlates to a 
             stored access policy. To create a stored access policy, use 
@@ -417,14 +417,14 @@ def generate_blob_shared_access_signature(
             been specified in an associated stored access policy. Azure will always 
             convert values to UTC. If a date is passed in without timezone info, it 
             is assumed to be UTC.
-        :type expiry: date or str
+        :type expiry: datetime.datetime or str
         :param start:
             The time at which the shared access signature becomes valid. If 
             omitted, start time for this call is assumed to be the time when the 
             storage service receives the request. Azure will always convert values 
             to UTC. If a date is passed in without timezone info, it is assumed to 
             be UTC.
-        :type start: date or str
+        :type start: datetime.datetime or str
         :param str id:
             A unique value up to 64 characters in length that correlates to a 
             stored access policy. To create a stored access policy, use :func:`~set_container_acl`.

azure/storage/blob/blockblobservice.py

@@ -790,6 +790,41 @@ def create_blob_from_text(
                 if_none_match=if_none_match,
                 timeout=timeout)
 
+    def set_standard_blob_tier(
+        self, container_name, blob_name, standard_blob_tier, timeout=None):
+        '''
+        Sets the block blob tiers on the blob. This API is only supported for block blobs on standard storage accounts.
+
+        :param str container_name:
+            Name of existing container.
+        :param str blob_name:
+            Name of blob to update.
+        :param StandardBlobTier standard_blob_tier:
+            A standard blob tier value to set the blob to. For this version of the library,
+            this is only applicable to block blobs on standard storage accounts.
+        :param int timeout:
+            The timeout parameter is expressed in seconds. This method may make
+            multiple calls to the Azure service and the timeout will apply to
+            each call individually.
+        '''
+        _validate_not_none('container_name', container_name)
+        _validate_not_none('blob_name', blob_name)
+        _validate_not_none('standard_blob_tier', standard_blob_tier)
+
+        request = HTTPRequest()
+        request.method = 'PUT'
+        request.host_locations = self._get_host_locations()
+        request.path = _get_path(container_name, blob_name)
+        request.query = {
+            'comp': 'tier',
+            'timeout': _int_to_str(timeout),
+        }
+        request.headers = {
+            'x-ms-access-tier': _to_str(standard_blob_tier)
+        }
+
+        self._perform_request(request)
+
     #-----Helper methods------------------------------------
     def _put_blob(self, container_name, blob_name, blob, content_settings=None,
                   metadata=None, validate_content=False, lease_id=None, if_modified_since=None,

azure/storage/blob/models.py

@@ -239,9 +239,10 @@ class LeaseProperties(object):
     
     :ivar str status:
         The lease status of the blob.
+        Possible values: locked|unlocked
     :ivar str state:
         Lease state of the blob.
-        Possible values: pending|success|aborted|failed
+        Possible values: available|leased|expired|breaking|broken
     :ivar str duration:
         When a blob is leased, specifies whether the lease is of infinite or fixed duration.
     '''
@@ -713,4 +714,18 @@ class PremiumPageBlobTier(object):
     ''' P50 Tier '''
 
     P60 = 'P60'
-    ''' P60 Tier '''
+    ''' P60 Tier '''
+
+class StandardBlobTier(object):
+    '''
+    Specifies the blob tier to set the blob to. This is only applicable for block blobs on standard storage accounts.
+    '''
+
+    Archive = 'Archive'
+    ''' Archive '''
+
+    Cool = 'Cool'
+    ''' Cool '''
+
+    Hot = 'Hot'
+    ''' Hot '''

azure/storage/blob/pageblobservice.py

@@ -1135,7 +1135,7 @@ def set_premium_page_blob_tier(
             Name of existing container.
         :param str blob_name:
             Name of blob to update.
-        :param premium_page_blob_tier:
+        :param PremiumPageBlobTier premium_page_blob_tier:
             A page blob tier value to set the blob to. The tier correlates to the size of the
             blob and number of allowed IOPS. This is only applicable to page blobs on
             premium storage accounts.

azure/storage/cloudstorageaccount.py

@@ -162,14 +162,14 @@ def generate_shared_access_signature(self, services, resource_types,
             been specified in an associated stored access policy. Azure will always 
             convert values to UTC. If a date is passed in without timezone info, it 
             is assumed to be UTC.
-        :type expiry: date or str
+        :type expiry: datetime.datetime or str
         :param start:
             The time at which the shared access signature becomes valid. If 
             omitted, start time for this call is assumed to be the time when the 
             storage service receives the request. Azure will always convert values 
             to UTC. If a date is passed in without timezone info, it is assumed to 
             be UTC.
-        :type start: date or str
+        :type start: datetime.datetime or str
         :param str ip:
             Specifies an IP address or a range of IP addresses from which to accept requests.
             If the IP address from which the request originates does not match the IP address

azure/storage/file/fileservice.py

@@ -242,14 +242,14 @@ def generate_account_shared_access_signature(self, resource_types, permission,
             been specified in an associated stored access policy. Azure will always 
             convert values to UTC. If a date is passed in without timezone info, it 
             is assumed to be UTC.
-        :type expiry: date or str
+        :type expiry: datetime.datetime or str
         :param start:
             The time at which the shared access signature becomes valid. If 
             omitted, start time for this call is assumed to be the time when the 
             storage service receives the request. Azure will always convert values 
             to UTC. If a date is passed in without timezone info, it is assumed to 
             be UTC.
-        :type start: date or str
+        :type start: datetime.datetime or str
         :param str ip:
             Specifies an IP address or a range of IP addresses from which to accept requests.
             If the IP address from which the request originates does not match the IP address
@@ -302,14 +302,14 @@ def generate_share_shared_access_signature(self, share_name,
             been specified in an associated stored access policy. Azure will always 
             convert values to UTC. If a date is passed in without timezone info, it 
             is assumed to be UTC.
-        :type expiry: date or str
+        :type expiry: datetime.datetime or str
         :param start:
             The time at which the shared access signature becomes valid. If 
             omitted, start time for this call is assumed to be the time when the 
             storage service receives the request. Azure will always convert values 
             to UTC. If a date is passed in without timezone info, it is assumed to 
             be UTC.
-        :type start: date or str
+        :type start: datetime.datetime or str
         :param str id:
             A unique value up to 64 characters in length that correlates to a 
             stored access policy. To create a stored access policy, use :func:`~set_share_acl`.
@@ -400,14 +400,14 @@ def generate_file_shared_access_signature(self, share_name,
             been specified in an associated stored access policy. Azure will always 
             convert values to UTC. If a date is passed in without timezone info, it 
             is assumed to be UTC.
-        :type expiry: date or str
+        :type expiry: datetime.datetime or str
         :param start:
             The time at which the shared access signature becomes valid. If 
             omitted, start time for this call is assumed to be the time when the 
             storage service receives the request. Azure will always convert values 
             to UTC. If a date is passed in without timezone info, it is assumed to 
             be UTC.
-        :type start: date or str
+        :type start: datetime.datetime or str
         :param str id:
             A unique value up to 64 characters in length that correlates to a 
             stored access policy. To create a stored access policy, use