azure-storage-blob 12.20.0__tar.gz → 12.20.0b1__tar.gz

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Release History
 
-## 12.20.0 (2024-05-07)
-
-### Features Added
-- Stable release of features from 12.20.0b1
-
 ## 12.20.0b1 (2024-04-16)
 
 This version and all future versions will require Python 3.8+. Python 3.7 is no longer supported.

{azure-storage-blob-12.20.0/azure_storage_blob.egg-info → azure-storage-blob-12.20.0b1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: azure-storage-blob
-Version: 12.20.0
+Version: 12.20.0b1
 Summary: Microsoft Azure Blob Storage Client Library for Python
 Home-page: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-blob
 Author: Microsoft Corporation
 Author-email: ascl@microsoft.com
 License: MIT License
 Keywords: azure,azure sdk
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/__init__.py

@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=docstring-keyword-should-match-keyword-only
-
 import os
 
 from typing import Union, Iterable, AnyStr, IO, Any, Dict  # pylint: disable=unused-import
@@ -94,11 +92,7 @@ def upload_blob_to_url(
         - except in the case of AzureSasCredential, where the conflicting SAS tokens will raise a ValueError.
         If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
         should be the storage account key.
-    :type credential:
-        ~azure.core.credentials.AzureNamedKeyCredential or
-        ~azure.core.credentials.AzureSasCredential or
-        ~azure.core.credentials.TokenCredential or
-        str or dict[str, str] or None
+    :type credential: Optional[Union[str, Dict[str, str], AzureNamedKeyCredential, AzureSasCredential, "TokenCredential"]] # pylint: disable=line-too-long
     :keyword bool overwrite:
         Whether the blob to be uploaded should overwrite the current data.
         If True, upload_blob_to_url will overwrite any existing data. If set to False, the
@@ -162,11 +156,7 @@ def download_blob_from_url(
         - except in the case of AzureSasCredential, where the conflicting SAS tokens will raise a ValueError.
         If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
         should be the storage account key.
-    :type credential:
-        ~azure.core.credentials.AzureNamedKeyCredential or
-        ~azure.core.credentials.AzureSasCredential or
-        ~azure.core.credentials.TokenCredential or
-        str or dict[str, str] or None
+    :type credential: Optional[Union[str, Dict[str, str], AzureNamedKeyCredential, AzureSasCredential, "TokenCredential"]] # pylint: disable=line-too-long
     :keyword bool overwrite:
         Whether the local file should be overwritten if it already exists. The default value is
         `False` - in which case a ValueError will be raised if the file already exists. If set to

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_blob_client.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=too-many-lines, docstring-keyword-should-match-keyword-only
+# pylint: disable=too-many-lines
 
 from functools import partial
 from io import BytesIO
@@ -237,11 +237,7 @@ class BlobClient(StorageAccountHostsMixin, StorageEncryptionMixin):  # pylint: d
             - except in the case of AzureSasCredential, where the conflicting SAS tokens will raise a ValueError.
             If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
             should be the storage account key.
-        :type credential:
-            ~azure.core.credentials.AzureNamedKeyCredential or
-            ~azure.core.credentials.AzureSasCredential or
-            ~azure.core.credentials.TokenCredential or
-            str or dict[str, str] or None
+        :type credential: Optional[Union[str, Dict[str, str], "AzureNamedKeyCredential", "AzureSasCredential", "TokenCredential"]]  # pylint: disable=line-too-long
         :param str snapshot:
             The optional blob snapshot on which to operate. This can be the snapshot ID string
             or the response returned from :func:`create_snapshot`. If specified, this will override
@@ -330,11 +326,7 @@ class BlobClient(StorageAccountHostsMixin, StorageEncryptionMixin):  # pylint: d
             Credentials provided here will take precedence over those in the connection string.
             If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
             should be the storage account key.
-        :type credential:
-            ~azure.core.credentials.AzureNamedKeyCredential or
-            ~azure.core.credentials.AzureSasCredential or
-            ~azure.core.credentials.TokenCredential or
-            str or dict[str, str] or None
+        :type credential: Optional[Union[str, Dict[str, str], "AzureNamedKeyCredential", "AzureSasCredential", "TokenCredential"]]  # pylint: disable=line-too-long
         :keyword str version_id: The version id parameter is an opaque DateTime value that, when present,
             specifies the version of the blob to operate on.
         :keyword str audience: The audience to use when requesting tokens for Azure Active Directory

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_blob_service_client.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=docstring-keyword-should-match-keyword-only
 
 import functools
 import warnings
@@ -172,11 +171,7 @@ class BlobServiceClient(StorageAccountHostsMixin, StorageEncryptionMixin):
             Credentials provided here will take precedence over those in the connection string.
             If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
             should be the storage account key.
-        :type credential:
-            ~azure.core.credentials.AzureNamedKeyCredential or
-            ~azure.core.credentials.AzureSasCredential or
-            ~azure.core.credentials.TokenCredential or
-            str or dict[str, str] or None
+        :type credential: Optional[Union[str, Dict[str, str], "AzureNamedKeyCredential", "AzureSasCredential", "TokenCredential"]]  # pylint: disable=line-too-long
         :keyword str audience: The audience to use when requesting tokens for Azure Active Directory
             authentication. Only has an effect when credential is of type TokenCredential. The value could be
             https://storage.azure.com/ (default) or https://<account>.blob.core.windows.net.

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_container_client.py

@@ -1,9 +1,9 @@
+# pylint: disable=too-many-lines
 # -------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=too-many-lines, docstring-keyword-should-match-keyword-only
 
 import functools
 import warnings
@@ -202,11 +202,7 @@ class ContainerClient(StorageAccountHostsMixin, StorageEncryptionMixin):    # py
             - except in the case of AzureSasCredential, where the conflicting SAS tokens will raise a ValueError.
             If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
             should be the storage account key.
-        :type credential:
-            ~azure.core.credentials.AzureNamedKeyCredential or
-            ~azure.core.credentials.AzureSasCredential or
-            ~azure.core.credentials.TokenCredential or
-            str or dict[str, str] or None
+        :type credential: Optional[Union[str, Dict[str, str], "AzureNamedKeyCredential", "AzureSasCredential", "TokenCredential"]] = None,  # pylint: disable=line-too-long
         :keyword str audience: The audience to use when requesting tokens for Azure Active Directory
             authentication. Only has an effect when credential is of type TokenCredential. The value could be
             https://storage.azure.com/ (default) or https://<account>.blob.core.windows.net.
@@ -255,11 +251,7 @@ class ContainerClient(StorageAccountHostsMixin, StorageEncryptionMixin):    # py
             Credentials provided here will take precedence over those in the connection string.
             If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
             should be the storage account key.
-        :type credential:
-            ~azure.core.credentials.AzureNamedKeyCredential or
-            ~azure.core.credentials.AzureSasCredential or
-            ~azure.core.credentials.TokenCredential or
-            str or dict[str, str] or None
+        :type credential: Optional[Union[str, Dict[str, str], "AzureNamedKeyCredential", "AzureSasCredential", "TokenCredential"]] = None,  # pylint: disable=line-too-long
         :keyword str audience: The audience to use when requesting tokens for Azure Active Directory
             authentication. Only has an effect when credential is of type TokenCredential. The value could be
             https://storage.azure.com/ (default) or https://<account>.blob.core.windows.net.

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_lease.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=docstring-keyword-should-match-keyword-only
 
 import uuid
 

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_shared/models.py

@@ -453,20 +453,19 @@ class AccountSasPermissions(object):
 class Services(object):
     """Specifies the services accessible with the account SAS.
 
-    :keyword bool blob:
-        Access for the `~azure.storage.blob.BlobServiceClient`. Default is False.
-    :keyword bool queue:
-        Access for the `~azure.storage.queue.QueueServiceClient`. Default is False.
-    :keyword bool fileshare:
-        Access for the `~azure.storage.fileshare.ShareServiceClient`. Default is False.
+    :param bool blob:
+        Access for the `~azure.storage.blob.BlobServiceClient`
+    :param bool queue:
+        Access for the `~azure.storage.queue.QueueServiceClient`
+    :param bool fileshare:
+        Access for the `~azure.storage.fileshare.ShareServiceClient`
     """
 
-    def __init__(
-        self, *,
-        blob: bool = False,
-        queue: bool = False,
-        fileshare: bool = False
-    ) -> None:
+    blob: bool = False
+    queue: bool = False
+    fileshare: bool = False
+
+    def __init__(self, blob: bool = False, queue: bool = False, fileshare: bool = False):
         self.blob = blob
         self.queue = queue
         self.fileshare = fileshare
@@ -494,7 +493,7 @@ class Services(object):
         res_queue = 'q' in string
         res_file = 'f' in string
 
-        parsed = cls(blob=res_blob, queue=res_queue, fileshare=res_file)
+        parsed = cls(res_blob, res_queue, res_file)
         parsed._str = string  # pylint: disable = protected-access
         return parsed
 

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_shared/shared_access_signature.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=docstring-keyword-should-match-keyword-only
 
 from datetime import date
 

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_shared_access_signature.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=docstring-keyword-should-match-keyword-only
 
 from typing import (  # pylint: disable=unused-import
     Union, Optional, Any, TYPE_CHECKING

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/_version.py

@@ -4,4 +4,4 @@
 # license information.
 # --------------------------------------------------------------------------
 
-VERSION = "12.20.0"
+VERSION = "12.20.0b1"

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/aio/__init__.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=docstring-keyword-should-match-keyword-only
 
 import os
 
@@ -32,7 +31,7 @@ async def upload_blob_to_url(
     :param data:
         The data to upload. This can be bytes, text, an iterable or a file-like object.
     :type data: bytes or str or Iterable
-    :param credential:
+   :param credential:
         The credentials with which to authenticate. This is optional if the
         blob URL already has a SAS token. The value can be a SAS token string,
         an instance of a AzureSasCredential or AzureNamedKeyCredential from azure.core.credentials,
@@ -41,11 +40,7 @@ async def upload_blob_to_url(
         - except in the case of AzureSasCredential, where the conflicting SAS tokens will raise a ValueError.
         If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
         should be the storage account key.
-    :type credential:
-        ~azure.core.credentials.AzureNamedKeyCredential or
-        ~azure.core.credentials.AzureSasCredential or
-        ~azure.core.credentials.TokenCredential or
-        str or dict[str, str] or None
+    :type credential: Optional[Union[str, Dict[str, str], AzureNamedKeyCredential, AzureSasCredential, "TokenCredential"]] # pylint: disable=line-too-long
     :keyword bool overwrite:
         Whether the blob to be uploaded should overwrite the current data.
         If True, upload_blob_to_url will overwrite any existing data. If set to False, the
@@ -69,7 +64,7 @@ async def upload_blob_to_url(
     :keyword str encoding:
         Encoding to use if text is supplied as input. Defaults to UTF-8.
     :returns: Blob-updated property dict (Etag and last modified)
-    :rtype: dict[str, Any]
+    :rtype: dict(str, Any)
     """
     async with BlobClient.from_blob_url(blob_url, credential=credential) as client:
         return await client.upload_blob(data=data, blob_type=BlobType.BlockBlob, **kwargs)
@@ -104,11 +99,7 @@ async def download_blob_from_url(
         - except in the case of AzureSasCredential, where the conflicting SAS tokens will raise a ValueError.
         If using an instance of AzureNamedKeyCredential, "name" should be the storage account name, and "key"
         should be the storage account key.
-    :type credential:
-        ~azure.core.credentials.AzureNamedKeyCredential or
-        ~azure.core.credentials.AzureSasCredential or
-        ~azure.core.credentials.TokenCredential or
-        str or dict[str, str] or None
+    :type credential: Optional[Union[str, Dict[str, str], AzureNamedKeyCredential, AzureSasCredential, "TokenCredential"]] # pylint: disable=line-too-long
     :keyword bool overwrite:
         Whether the local file should be overwritten if it already exists. The default value is
         `False` - in which case a ValueError will be raised if the file already exists. If set to

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/aio/_blob_client_async.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=too-many-lines, invalid-overridden-method, docstring-keyword-should-match-keyword-only
+# pylint: disable=too-many-lines, invalid-overridden-method
 
 import warnings
 from functools import partial

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/aio/_blob_service_client_async.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=invalid-overridden-method, docstring-keyword-should-match-keyword-only
+# pylint: disable=invalid-overridden-method
 
 import functools
 import warnings

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/aio/_container_client_async.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=too-many-lines, invalid-overridden-method, docstring-keyword-should-match-keyword-only
+# pylint: disable=too-many-lines, invalid-overridden-method
 
 import functools
 import warnings

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/azure/storage/blob/aio/_lease_async.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-# pylint: disable=invalid-overridden-method, docstring-keyword-should-match-keyword-only
+# pylint: disable=invalid-overridden-method
 
 from typing import (  # pylint: disable=unused-import
     Union, Optional, Any, IO, Iterable, AnyStr, Dict, List, Tuple,

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1/azure_storage_blob.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: azure-storage-blob
-Version: 12.20.0
+Version: 12.20.0b1
 Summary: Microsoft Azure Blob Storage Client Library for Python
 Home-page: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-blob
 Author: Microsoft Corporation
 Author-email: ascl@microsoft.com
 License: MIT License
 Keywords: azure,azure sdk
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/setup.py

@@ -56,7 +56,7 @@ setup(
     url='https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-blob',
     keywords="azure, azure sdk",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3',

{azure-storage-blob-12.20.0 → azure-storage-blob-12.20.0b1}/tests/test_cpk.py

@@ -105,7 +105,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert put_block_list_resp['etag'] is not None
         assert put_block_list_resp['last_modified'] is not None
         assert put_block_list_resp['request_server_encrypted']
-        # assert put_block_list_resp['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert put_block_list_resp['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -118,7 +118,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert blob.readall() == b'AAABBBCCC'
         assert blob.properties.etag == put_block_list_resp['etag']
         assert blob.properties.last_modified == put_block_list_resp['last_modified']
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @pytest.mark.live_test_only
@@ -149,7 +149,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert upload_response['etag'] is not None
         assert upload_response['last_modified'] is not None
         assert upload_response['request_server_encrypted']
-        # assert upload_response['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert upload_response['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -162,7 +162,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert blob.readall() == self.byte_data
         assert blob.properties.etag == upload_response['etag']
         assert blob.properties.last_modified == upload_response['last_modified']
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @pytest.mark.live_test_only
@@ -190,7 +190,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert upload_response['etag'] is not None
         assert upload_response['last_modified'] is not None
         assert upload_response['request_server_encrypted']
-        # assert upload_response['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert upload_response['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -203,7 +203,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert blob.readall() == self.byte_data
         assert blob.properties.etag == upload_response['etag']
         assert blob.properties.last_modified == upload_response['last_modified']
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @BlobPreparer()
@@ -230,7 +230,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert upload_response['etag'] is not None
         assert upload_response['last_modified'] is not None
         assert upload_response['request_server_encrypted']
-        # assert upload_response['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert upload_response['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -243,7 +243,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert blob.readall() == data
         assert blob.properties.etag == upload_response['etag']
         assert blob.properties.last_modified == upload_response['last_modified']
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @BlobPreparer()
@@ -308,7 +308,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert put_block_list_resp['etag'] is not None
         assert put_block_list_resp['last_modified'] is not None
         assert put_block_list_resp['request_server_encrypted']
-        # assert put_block_list_resp['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert put_block_list_resp['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content
         blob = destination_blob_client.download_blob(cpk=TEST_ENCRYPTION_KEY)
@@ -317,7 +317,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert blob.readall() == self.byte_data[0: 8 * 1024]
         assert blob.properties.etag == put_block_list_resp['etag']
         assert blob.properties.last_modified == put_block_list_resp['last_modified']
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @BlobPreparer()
@@ -346,7 +346,7 @@ class TestStorageCPK(StorageRecordedTestCase):
             assert append_blob_prop['etag'] is not None
             assert append_blob_prop['last_modified'] is not None
             assert append_blob_prop['request_server_encrypted']
-            # assert append_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+            assert append_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -357,7 +357,7 @@ class TestStorageCPK(StorageRecordedTestCase):
 
         # Assert content was retrieved with the cpk
         assert blob.readall() == b'AAABBBCCC'
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
 
     @BlobPreparer()
     @recorded_by_proxy
@@ -404,7 +404,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert append_blob_prop['etag'] is not None
         assert append_blob_prop['last_modified'] is not None
         assert append_blob_prop['request_server_encrypted']
-        # assert append_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert append_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -415,7 +415,7 @@ class TestStorageCPK(StorageRecordedTestCase):
 
         # Assert content was retrieved with the cpk
         assert blob.readall() == self.byte_data[0: 4 * 1024]
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @BlobPreparer()
@@ -444,7 +444,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert append_blob_prop['etag'] is not None
         assert append_blob_prop['last_modified'] is not None
         assert append_blob_prop['request_server_encrypted']
-        # assert append_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert append_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -455,7 +455,7 @@ class TestStorageCPK(StorageRecordedTestCase):
 
         # Assert content was retrieved with the cpk
         assert blob.readall() == self.byte_data
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @BlobPreparer()
@@ -486,7 +486,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert page_blob_prop['etag'] is not None
         assert page_blob_prop['last_modified'] is not None
         assert page_blob_prop['request_server_encrypted']
-        # assert page_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert page_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -499,7 +499,7 @@ class TestStorageCPK(StorageRecordedTestCase):
 
         # Assert content was retrieved with the cpk
         assert blob.readall() == self.byte_data
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @BlobPreparer()
@@ -548,7 +548,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert page_blob_prop['etag'] is not None
         assert page_blob_prop['last_modified'] is not None
         assert page_blob_prop['request_server_encrypted']
-        # assert page_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert page_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -561,7 +561,7 @@ class TestStorageCPK(StorageRecordedTestCase):
 
         # Assert content was retrieved with the cpk
         assert blob.readall() == self.byte_data
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @pytest.mark.live_test_only
@@ -590,7 +590,7 @@ class TestStorageCPK(StorageRecordedTestCase):
         assert page_blob_prop['etag'] is not None
         assert page_blob_prop['last_modified'] is not None
         assert page_blob_prop['request_server_encrypted']
-        # assert page_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
+        assert page_blob_prop['encryption_key_sha256'] == TEST_ENCRYPTION_KEY.key_hash
 
         # Act get the blob content without cpk should fail
         with pytest.raises(HttpResponseError):
@@ -601,7 +601,7 @@ class TestStorageCPK(StorageRecordedTestCase):
 
         # Assert content was retrieved with the cpk
         assert blob.readall() == self.byte_data
-        # assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob.properties.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
         self._teardown(bsc)
 
     @BlobPreparer()
@@ -633,7 +633,7 @@ class TestStorageCPK(StorageRecordedTestCase):
 
         # Assert
         assert blob_props.server_encrypted
-        # assert blob_props.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
+        assert blob_props.encryption_key_sha256 == TEST_ENCRYPTION_KEY.key_hash
 
         # Act set blob properties
         metadata = {'hello': 'world', 'number': '42', 'up': 'upval'}