[Key Vault] Clean up testing utilities (#43049)

mccoyp · web-flow · commit 607213fbf56e · 2025-09-18T09:55:56.000-07:00
diff --git a/sdk/keyvault/azure-keyvault-administration/tests/_async_test_case.py b/sdk/keyvault/azure-keyvault-administration/tests/_async_test_case.py
@@ -5,9 +5,7 @@
 import os
 
 import pytest
-from azure.keyvault.administration import ApiVersion
 from azure.keyvault.administration._internal.client_base import DEFAULT_VERSION
-from azure.identity.aio import ManagedIdentityCredential
 from devtools_testutils import AzureRecordedTestCase
 
 
@@ -133,10 +131,3 @@ def create_access_control_client(self, **kwargs):
         return self.create_client_from_credential(
             KeyVaultSettingsClient, credential=credential, vault_url=self.managed_hsm_url, **kwargs
         )
-
-
-def get_decorator(**kwargs):
-    """returns a test decorator for test parameterization"""
-    versions = kwargs.pop("api_versions", None) or ApiVersion
-    params = [pytest.param(api_version) for api_version in versions]
-    return params
diff --git a/sdk/keyvault/azure-keyvault-administration/tests/_test_case.py b/sdk/keyvault/azure-keyvault-administration/tests/_test_case.py
@@ -8,7 +8,6 @@
 
 from azure.keyvault.administration import ApiVersion
 from azure.keyvault.administration._internal.client_base import DEFAULT_VERSION
-from azure.identity import ManagedIdentityCredential
 from devtools_testutils import AzureRecordedTestCase
 
 
diff --git a/sdk/keyvault/azure-keyvault-administration/tests/test_access_control_async.py b/sdk/keyvault/azure-keyvault-administration/tests/test_access_control_async.py
@@ -11,7 +11,8 @@
 from devtools_testutils import add_general_regex_sanitizer, set_bodiless_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import KeyVaultAccessControlClientPreparer, get_decorator
+from _async_test_case import KeyVaultAccessControlClientPreparer
+from _test_case import get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 from test_access_control import assert_role_definitions_equal
 
diff --git a/sdk/keyvault/azure-keyvault-administration/tests/test_backup_client_async.py b/sdk/keyvault/azure-keyvault-administration/tests/test_backup_client_async.py
@@ -10,7 +10,8 @@
 from devtools_testutils import set_bodiless_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import KeyVaultBackupClientPreparer, KeyVaultBackupClientSasPreparer, get_decorator
+from _async_test_case import KeyVaultBackupClientPreparer, KeyVaultBackupClientSasPreparer
+from _test_case import get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 
 all_api_versions = get_decorator(is_async=True)
diff --git a/sdk/keyvault/azure-keyvault-administration/tests/test_examples_administration_async.py b/sdk/keyvault/azure-keyvault-administration/tests/test_examples_administration_async.py
@@ -9,7 +9,8 @@
 from devtools_testutils import set_bodiless_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import KeyVaultBackupClientPreparer, get_decorator
+from _async_test_case import KeyVaultBackupClientPreparer
+from _test_case import get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 
 all_api_versions = get_decorator(is_async=True)
diff --git a/sdk/keyvault/azure-keyvault-administration/tests/test_settings_client_async.py b/sdk/keyvault/azure-keyvault-administration/tests/test_settings_client_async.py
@@ -8,7 +8,8 @@
 from azure.keyvault.administration._internal.client_base import DEFAULT_VERSION
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import KeyVaultSettingsClientPreparer, get_decorator
+from _async_test_case import KeyVaultSettingsClientPreparer
+from _test_case import get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 
 only_latest = get_decorator(api_versions=[DEFAULT_VERSION])
diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/_async_test_case.py b/sdk/keyvault/azure-keyvault-certificates/tests/_async_test_case.py
@@ -5,19 +5,11 @@
 
 import os
 
-from azure.keyvault.certificates import ApiVersion
 from azure.keyvault.certificates._shared.client_base import DEFAULT_VERSION
 from devtools_testutils import AzureRecordedTestCase, is_live
 import pytest
 
 
-def get_decorator(**kwargs):
-    """returns a test decorator for test parameterization"""
-    versions = kwargs.pop("api_versions", None) or ApiVersion
-    params = [pytest.param(api_version) for api_version in versions]
-    return params
-
-
 class AsyncCertificatesClientPreparer(AzureRecordedTestCase):
     def __init__(self, **kwargs) -> None:
         self.azure_keyvault_url = "https://vaultname.vault.azure.net"
diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py
@@ -35,7 +35,8 @@
 import pytest
 
 from _shared.test_case_async import KeyVaultTestCase
-from _async_test_case import get_decorator, AsyncCertificatesClientPreparer
+from _async_test_case import AsyncCertificatesClientPreparer
+from _test_case import get_decorator
 from certs import CERT_CONTENT_PASSWORD_ENCODED, CERT_CONTENT_NOT_PASSWORD_ENCODED
 
 
diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py
@@ -8,7 +8,8 @@
 import pytest
 
 from _shared.test_case_async import KeyVaultTestCase
-from _async_test_case import get_decorator, AsyncCertificatesClientPreparer
+from _async_test_case import AsyncCertificatesClientPreparer
+from _test_case import get_decorator
 from devtools_testutils.aio import recorded_by_proxy_async
 
 
diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate_async.py b/sdk/keyvault/azure-keyvault-certificates/tests/test_merge_certificate_async.py
@@ -11,7 +11,8 @@
 from devtools_testutils.aio import recorded_by_proxy_async
 from OpenSSL import crypto
 
-from _async_test_case import AsyncCertificatesClientPreparer, get_decorator
+from _async_test_case import AsyncCertificatesClientPreparer
+from _test_case import get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 
 all_api_versions = get_decorator(is_async=True)
diff --git a/sdk/keyvault/azure-keyvault-keys/tests/_async_test_case.py b/sdk/keyvault/azure-keyvault-keys/tests/_async_test_case.py
@@ -8,9 +8,7 @@
 import pytest
 from azure.core.pipeline import AsyncPipeline
 from azure.core.pipeline.transport import AioHttpTransport, HttpRequest
-from azure.keyvault.keys import KeyReleasePolicy
 from devtools_testutils import AzureRecordedTestCase
-from _test_case import HSM_SUPPORTED_VERSIONS
 
 
 async def get_attestation_token(attestation_uri):
@@ -20,41 +18,6 @@ async def get_attestation_token(attestation_uri):
         return json.loads(response.http_response.text())["token"]
 
 
-def get_decorator(only_hsm=False, only_vault=False, api_versions=None, **kwargs):
-    """returns a test decorator for test parameterization"""
-    params = [
-        pytest.param(p[0], p[1], id=p[0] + ("_mhsm" if p[1] else "_vault"))
-        for p in get_test_parameters(only_hsm, only_vault, api_versions=api_versions)
-    ]
-    return params
-
-
-def get_release_policy(attestation_uri, **kwargs):
-    release_policy_json = {
-        "anyOf": [{"anyOf": [{"claim": "sdk-test", "equals": True}], "authority": attestation_uri.rstrip("/") + "/"}],
-        "version": "1.0.0",
-    }
-    policy_string = json.dumps(release_policy_json).encode()
-    return KeyReleasePolicy(policy_string, **kwargs)
-
-
-def get_test_parameters(only_hsm=False, only_vault=False, api_versions=None):
-    """generates a list of parameter pairs for test case parameterization, where [x, y] = [api_version, is_hsm]"""
-    combinations = []
-    versions = api_versions or pytest.api_version  # pytest.api_version -> [DEFAULT_VERSION] if live, ApiVersion if not
-
-    for api_version in versions:
-        if not only_vault and api_version in HSM_SUPPORTED_VERSIONS:
-            combinations.append([api_version, True])
-        if not only_hsm:
-            combinations.append([api_version, False])
-    return combinations
-
-
-def is_public_cloud():
-    return ".microsoftonline.com" in os.getenv("AZURE_AUTHORITY_HOST", "https://login.microsoftonline.com/")
-
-
 class AsyncKeysClientPreparer(AzureRecordedTestCase):
     def __init__(self, *args, **kwargs):
         vault_playback_url = "https://vaultname.vault.azure.net"
diff --git a/sdk/keyvault/azure-keyvault-keys/tests/_test_case.py b/sdk/keyvault/azure-keyvault-keys/tests/_test_case.py
@@ -13,7 +13,7 @@
 from devtools_testutils import AzureRecordedTestCase
 
 
-HSM_SUPPORTED_VERSIONS = {ApiVersion.V7_2, ApiVersion.V7_3, ApiVersion.V7_4, ApiVersion.V7_5, ApiVersion.V7_6}
+HSM_UNSUPPORTED_VERSIONS = {ApiVersion.V2016_10_01, ApiVersion.V7_0, ApiVersion.V7_1}
 
 
 def get_attestation_token(attestation_uri):
@@ -47,7 +47,7 @@ def get_test_parameters(only_hsm=False, only_vault=False, api_versions=None):
     versions = api_versions or pytest.api_version  # pytest.api_version -> [DEFAULT_VERSION] if live, ApiVersion if not
 
     for api_version in versions:
-        if not only_vault and api_version in HSM_SUPPORTED_VERSIONS:
+        if not only_vault and api_version not in HSM_UNSUPPORTED_VERSIONS:
             combinations.append([api_version, True])
         if not only_hsm:
             combinations.append([api_version, False])
diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_challenge_auth_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_challenge_auth_async.py
@@ -24,7 +24,8 @@
 from azure.keyvault.keys.aio import KeyClient
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import AsyncKeysClientPreparer, get_decorator
+from _async_test_case import AsyncKeysClientPreparer
+from _test_case import get_decorator
 from _shared.helpers import Request, mock_response
 from _shared.helpers_async import async_validating_transport
 from _shared.test_case_async import KeyVaultTestCase
diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py
@@ -21,12 +21,12 @@
     KeyWrapAlgorithm,
     SignatureAlgorithm,
 )
-from azure.keyvault.keys._generated._serialization import Deserializer, Serializer
+from azure.keyvault.keys._generated._serialization import Deserializer
 from azure.keyvault.keys._generated.models import KeySignParameters
-from devtools_testutils import set_bodiless_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import AsyncKeysClientPreparer, get_decorator
+from _async_test_case import AsyncKeysClientPreparer
+from _test_case import get_decorator
 from _shared.helpers_async import get_completed_future
 from _shared.test_case_async import KeyVaultTestCase
 from _keys_test_case import KeysTestCase
diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py
@@ -7,7 +7,8 @@
 from devtools_testutils import set_bodiless_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import AsyncKeysClientPreparer, get_decorator
+from _async_test_case import AsyncKeysClientPreparer
+from _test_case import get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 
 all_api_versions = get_decorator(is_async=True, only_vault=True)
diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py
@@ -28,9 +28,9 @@
 import pytest
 
 from _shared.test_case_async import KeyVaultTestCase
-from _async_test_case import get_attestation_token, get_decorator, get_release_policy, is_public_cloud, AsyncKeysClientPreparer
+from _test_case import get_decorator, get_release_policy, is_public_cloud
+from _async_test_case import get_attestation_token, AsyncKeysClientPreparer
 from test_key_client import _assert_lifetime_actions_equal, _assert_rotation_policies_equal
-from devtools_testutils import set_bodiless_matcher
 from devtools_testutils.aio import recorded_by_proxy_async
 from _keys_test_case import KeysTestCase
 
diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py
@@ -9,7 +9,8 @@
 from azure.keyvault.keys import KeyType
 from devtools_testutils.aio import recorded_by_proxy_async
 
-from _async_test_case import AsyncKeysClientPreparer, get_decorator
+from _async_test_case import AsyncKeysClientPreparer
+from _test_case import get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 
 all_api_versions = get_decorator(is_async=True, only_vault=True)
diff --git a/sdk/keyvault/azure-keyvault-secrets/tests/test_samples_secrets_async.py b/sdk/keyvault/azure-keyvault-secrets/tests/test_samples_secrets_async.py
@@ -6,7 +6,7 @@
 
 
 import pytest
-from devtools_testutils import AzureRecordedTestCase, is_live
+from devtools_testutils import AzureRecordedTestCase
 from devtools_testutils.aio import recorded_by_proxy_async
 
 from _async_test_case import AsyncSecretsClientPreparer
