[Storage] Fix Entra ID support in Blob perf tests, update other packages (#42169)

Author: jalauzon-msft

sdk/storage/azure-storage-blob/perf-resources.bicep

@@ -1,7 +1,7 @@
 param baseName string = resourceGroup().name
 param location string = resourceGroup().location
 
-resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = {
+resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = {
   name: '${baseName}blob'
   location: location
   kind: 'BlockBlobStorage'
@@ -17,5 +17,3 @@ var connectionString = 'DefaultEndpointsProtocol=https;AccountName=${name};Accou
 output AZURE_STORAGE_ACCOUNT_NAME string = name
 output AZURE_STORAGE_ACCOUNT_KEY string = key
 output AZURE_STORAGE_CONNECTION_STRING string = connectionString
-output STANDARD_STORAGE_CONNECTION_STRING string = connectionString
-output STORAGE_CONNECTION_STRING string = connectionString

sdk/storage/azure-storage-blob/perf-tests.yml

@@ -5,8 +5,8 @@ Project: sdk/storage/azure-storage-blob
 PrimaryPackage: azure-storage-blob
 
 PackageVersions:
-- azure-core: 1.31.0
-  azure-storage-blob: 12.18.3
+- azure-core: 1.35.0
+  azure-storage-blob: 12.26.0
 - azure-core: source
   azure-storage-blob: source
 

sdk/storage/azure-storage-blob/tests/perfstress_tests/_test_base.py

@@ -34,20 +34,10 @@ def __init__(self, arguments):
 
         if not _ServiceTest.service_client or self.args.no_client_share:
             if self.args.use_entra_id:
-                tenant_id = self.get_from_env("AZURE-STORAGE-BLOB_TENANT_ID")
-                client_id = self.get_from_env("AZURE-STORAGE-BLOB_CLIENT_ID")
-                client_secret = self.get_from_env("AZURE-STORAGE-BLOB_CLIENT_SECRET")
-                sync_token_credential = SyncClientSecretCredential(
-                    tenant_id,
-                    client_id,
-                    client_secret
-                )
-                async_token_credential = AsyncClientSecretCredential(
-                    tenant_id,
-                    client_id,
-                    client_secret
-                )
                 account_name = self.get_from_env("AZURE_STORAGE_ACCOUNT_NAME")
+                sync_token_credential = self.get_credential(is_async=False)
+                async_token_credential = self.get_credential(is_async=True)
+
                 # We assume these tests will only be run on the Azure public cloud for now.
                 url = f"https://{account_name}.blob.core.windows.net"
                 _ServiceTest.service_client = SyncBlobServiceClient(account_url=url, credential=sync_token_credential, **self._client_kwargs)

sdk/storage/azure-storage-file-datalake/perf-resources.bicep

@@ -1,7 +1,7 @@
 param baseName string = resourceGroup().name
 param location string = resourceGroup().location
 
-resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = {
+resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = {
   name: '${baseName}dlake'
   location: location
   kind: 'BlockBlobStorage'
@@ -19,12 +19,4 @@ var key = storageAccount.listKeys().keys[0].value
 // EndpointSuffix is required by azure-storage-file-datalake 12.7.0 and earlier (fixed in #24779)
 var connectionString = 'DefaultEndpointsProtocol=https;AccountName=${name};AccountKey=${key};EndpointSuffix=core.windows.net'
 
-// .NET
-output DATALAKE_STORAGE_ACCOUNT_NAME string = name
-output DATALAKE_STORAGE_ACCOUNT_KEY string = key
-
-// Java, JS
-output STORAGE_CONNECTION_STRING string = connectionString
-
-// Python
 output AZURE_STORAGE_CONNECTION_STRING string = connectionString

sdk/storage/azure-storage-file-datalake/perf-tests.yml

@@ -5,8 +5,8 @@ Project: sdk/storage/azure-storage-file-datalake
 PrimaryPackage: azure-storage-file-datalake
 
 PackageVersions:
-- azure-core: 1.31.0
-  azure-storage-file-datalake: 12.18.0
+- azure-core: 1.35.0
+  azure-storage-file-datalake: 12.21.0
 - azure-core: source
   azure-storage-file-datalake: source
 

sdk/storage/azure-storage-file-share/perf-resources.bicep

@@ -1,7 +1,7 @@
 param baseName string = resourceGroup().name
 param location string = resourceGroup().location
 
-resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = {
+resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = {
   name: '${baseName}files'
   location: location
   kind: 'FileStorage'
@@ -26,5 +26,3 @@ var connectionString = 'DefaultEndpointsProtocol=https;AccountName=${name};Accou
 output AZURE_STORAGE_ACCOUNT_NAME string = name
 output AZURE_STORAGE_ACCOUNT_KEY string = key
 output AZURE_STORAGE_CONNECTION_STRING string = connectionString
-output STANDARD_STORAGE_CONNECTION_STRING string = connectionString
-output STORAGE_CONNECTION_STRING string = connectionString

sdk/storage/azure-storage-file-share/perf-tests.yml

@@ -5,8 +5,8 @@ Project: sdk/storage/azure-storage-file-share
 PrimaryPackage: azure-storage-file-share
 
 PackageVersions:
-- azure-core: 1.31.0
-  azure-storage-file-share: 12.20.0
+- azure-core: 1.35.0
+  azure-storage-file-share: 12.22.0
 - azure-core: source
   azure-storage-file-share: source
 

tools/azure-sdk-tools/devtools_testutils/perfstress_tests/_perf_stress_base.py

@@ -9,7 +9,10 @@
 import argparse
 import pstats
 import cProfile
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from azure.core.credentials import TokenCredential
 
 
 PSTATS_PRINT_DEFAULT_SORT_KEY = pstats.SortKey.TIME
@@ -218,6 +221,35 @@ def get_from_env(variable: str) -> str:
         if not value:
             raise ValueError("Undefined environment variable {}".format(variable))
         return value
+    
+    @staticmethod
+    def get_credential(is_async: bool = False) -> "TokenCredential":
+        # If AzurePipelinesCredential is detected, use it.
+        service_connection_id = os.environ.get("AZURESUBSCRIPTION_SERVICE_CONNECTION_ID")
+        client_id = os.environ.get("AZURESUBSCRIPTION_CLIENT_ID")
+        tenant_id = os.environ.get("AZURESUBSCRIPTION_TENANT_ID")
+        system_access_token = os.environ.get("SYSTEM_ACCESSTOKEN")
+        if service_connection_id and client_id and tenant_id and system_access_token:
+            if is_async:
+                from azure.identity.aio import AzurePipelinesCredential
+            else:
+                from azure.identity import AzurePipelinesCredential
+
+            return AzurePipelinesCredential(
+                tenant_id=tenant_id,
+                client_id=client_id,
+                service_connection_id=service_connection_id,
+                system_access_token=system_access_token,
+            )
+
+        # Fall back to DefaultAzureCredential
+        if is_async:
+            from azure.identity.aio import DefaultAzureCredential
+        else:
+            from azure.identity import DefaultAzureCredential
+
+        return DefaultAzureCredential(exclude_managed_identity_credential=True)
+
 
     def _save_profile(self, sync: str, output_path: Optional[str] = None) -> None:
         """