[Storage] Modified StorageRetryPolicy to skip AzureSigningError from bad storage account key

sdk/storage/azure-storage-blob/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/storage/azure-storage-blob",
-  "Tag": "python/storage/azure-storage-blob_4bb162f320"
+  "Tag": "python/storage/azure-storage-blob_a8a931c55d"
 }

sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies.py

@@ -31,7 +31,7 @@
     SansIOHTTPPolicy,
 )
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .models import LocationMode
 
@@ -542,6 +542,8 @@ def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise err
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-blob/azure/storage/blob/_shared/policies_async.py

@@ -13,7 +13,7 @@
 from azure.core.exceptions import AzureError
 from azure.core.pipeline.policies import AsyncBearerTokenCredentialPolicy, AsyncHTTPPolicy
 
-from .authentication import StorageHttpChallenge
+from .authentication import AzureSigningError, StorageHttpChallenge
 from .constants import DEFAULT_OAUTH_SCOPE
 from .policies import is_retry, StorageRetryPolicy
 
@@ -127,6 +127,8 @@ async def send(self, request):
                         continue
                 break
             except AzureError as err:
+                if isinstance(err, AzureSigningError):
+                    raise err
                 retries_remaining = self.increment(
                     retry_settings, request=request.http_request, error=err)
                 if retries_remaining:

sdk/storage/azure-storage-blob/tests/test_blob_client.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 
 import platform
+import time
 from datetime import datetime, timedelta
 
 import pytest
@@ -19,6 +20,7 @@
     VERSION,
 )
 from azure.storage.blob._shared.base_client import create_configuration
+from azure.storage.blob._shared.authentication import AzureSigningError
 
 from devtools_testutils import recorded_by_proxy
 from devtools_testutils.storage import StorageRecordedTestCase
@@ -731,4 +733,25 @@ def test_create_configuration_legacy(self, **kwargs):
         assert config.max_block_size == 4 * 1024 * 1024
         assert sdk_name in config.user_agent_policy.user_agent
 
+    @BlobPreparer()
+    @recorded_by_proxy
+    def test_bad_storage_account_key_no_retry(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = "a"
+
+        blob_client = BlobClient(
+            account_url=self.account_url(storage_account_name, "blob"),
+            container_name="foo",
+            blob_name="bar",
+            credential=storage_account_key,
+        )
+
+        start = time.time()
+        with pytest.raises(AzureSigningError) as e:
+            blob_client.get_blob_properties()
+        end = time.time()
+
+        assert "Invalid base64-encoded string" in e.value.message
+        assert end - start < 2.0
+
 # ------------------------------------------------------------------------------

sdk/storage/azure-storage-blob/tests/test_blob_client_async.py

@@ -5,6 +5,7 @@
 # --------------------------------------------------------------------------
 
 import platform
+import time
 from datetime import datetime, timedelta
 
 import pytest
@@ -20,6 +21,7 @@
     ContainerClient,
     BlobServiceClient
 )
+from azure.storage.blob._shared.authentication import AzureSigningError
 
 from devtools_testutils.aio import recorded_by_proxy_async
 from devtools_testutils.storage.aio import AsyncStorageRecordedTestCase
@@ -680,4 +682,25 @@ async def test_closing_pipeline_client_simple(self, **kwargs):
                 self.account_url(storage_account_name, "blob"), credential=storage_account_key, container_name='foo', blob_name='bar')
             await service.close()
 
+    @BlobPreparer()
+    @recorded_by_proxy_async
+    async def test_bad_storage_account_key_no_retry(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = "a"
+
+        blob_client = BlobClient(
+            account_url=self.account_url(storage_account_name, "blob"),
+            container_name="foo",
+            blob_name="bar",
+            credential=storage_account_key,
+        )
+
+        start = time.time()
+        with pytest.raises(AzureSigningError) as e:
+            await blob_client.get_blob_properties()
+        end = time.time()
+
+        assert "Invalid base64-encoded string" in e.value.message
+        assert end - start < 2.0
+
 # ------------------------------------------------------------------------------