[Key Vault] Update unnecessary version-specific testing decorators (Azure#30019)

Author: mccoyp

sdk/keyvault/azure-keyvault-administration/tests/test_settings_client.py

@@ -4,18 +4,19 @@
 # ------------------------------------
 import pytest
 
-from azure.keyvault.administration import ApiVersion, KeyVaultSetting, KeyVaultSettingsClient, KeyVaultSettingType
+from azure.keyvault.administration import KeyVaultSetting, KeyVaultSettingsClient, KeyVaultSettingType
+from azure.keyvault.administration._internal.client_base import DEFAULT_VERSION
 
 from devtools_testutils import recorded_by_proxy
 
 from _shared.test_case import KeyVaultTestCase
 from _test_case import KeyVaultSettingsClientPreparer, get_decorator
 
-only_7_4 = get_decorator(api_versions=[ApiVersion.V7_4])
+only_latest = get_decorator(api_versions=[DEFAULT_VERSION])
 
 
 class TestSettings(KeyVaultTestCase):
-    @pytest.mark.parametrize("api_version", only_7_4)
+    @pytest.mark.parametrize("api_version", only_latest)
     @KeyVaultSettingsClientPreparer()
     @recorded_by_proxy
     def test_list_settings(self, client: KeyVaultSettingsClient, **kwargs):
@@ -24,7 +25,7 @@ def test_list_settings(self, client: KeyVaultSettingsClient, **kwargs):
         for setting in default_settings:
             assert setting.name and setting.setting_type and setting.value is not None
 
-    @pytest.mark.parametrize("api_version", only_7_4)
+    @pytest.mark.parametrize("api_version", only_latest)
     @KeyVaultSettingsClientPreparer()
     @recorded_by_proxy
     def test_update_settings(self, client: KeyVaultSettingsClient, **kwargs):

sdk/keyvault/azure-keyvault-administration/tests/test_settings_client_async.py

@@ -3,19 +3,20 @@
 # Licensed under the MIT License.
 # ------------------------------------
 import pytest
-from azure.keyvault.administration import ApiVersion, KeyVaultSetting, KeyVaultSettingType
+from azure.keyvault.administration import KeyVaultSetting, KeyVaultSettingType
 from azure.keyvault.administration.aio import KeyVaultSettingsClient
+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 _shared.test_case_async import KeyVaultTestCase
 
-only_7_4 = get_decorator(api_versions=[ApiVersion.V7_4])
+only_latest = get_decorator(api_versions=[DEFAULT_VERSION])
 
 
 class TestSettings(KeyVaultTestCase):
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version", only_7_4)
+    @pytest.mark.parametrize("api_version", only_latest)
     @KeyVaultSettingsClientPreparer()
     @recorded_by_proxy_async
     async def test_list_settings(self, client: KeyVaultSettingsClient, **kwargs):
@@ -28,7 +29,7 @@ async def test_list_settings(self, client: KeyVaultSettingsClient, **kwargs):
             assert setting.name and setting.setting_type and setting.value is not None
 
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version", only_7_4)
+    @pytest.mark.parametrize("api_version", only_latest)
     @KeyVaultSettingsClientPreparer()
     @recorded_by_proxy_async
     async def test_update_settings(self, client: KeyVaultSettingsClient, **kwargs):

sdk/keyvault/azure-keyvault-keys/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/keyvault/azure-keyvault-keys",
-  "Tag": "python/keyvault/azure-keyvault-keys_c6e71da583"
+  "Tag": "python/keyvault/azure-keyvault-keys_19356f3a5b"
 }

sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client.py

@@ -19,13 +19,7 @@
 from azure.core.exceptions import AzureError, HttpResponseError
 from azure.core.pipeline.policies import SansIOHTTPPolicy
 from azure.core.rest import HttpRequest
-from azure.keyvault.keys import (
-    ApiVersion,
-    JsonWebKey,
-    KeyCurveName,
-    KeyOperation,
-    KeyVaultKey,
-)
+from azure.keyvault.keys import JsonWebKey, KeyCurveName, KeyOperation, KeyVaultKey
 from azure.keyvault.keys.crypto import (
     CryptographyClient,
     EncryptionAlgorithm,
@@ -46,7 +40,6 @@
 NO_GET = Permissions(keys=[p.value for p in KeyPermissions if p.value != "get"])
 
 all_api_versions = get_decorator()
-only_7_4_hsm = get_decorator(only_hsm=True, api_versions=[ApiVersion.V7_4])
 only_hsm = get_decorator(only_hsm=True)
 only_vault_latest = get_decorator(only_vault=True, api_versions=[DEFAULT_VERSION])
 no_get = get_decorator(permissions=NO_GET)

sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py

@@ -13,13 +13,7 @@
 from azure.core.exceptions import AzureError, HttpResponseError
 from azure.core.pipeline.policies import SansIOHTTPPolicy
 from azure.core.rest import HttpRequest
-from azure.keyvault.keys import (
-    ApiVersion,
-    JsonWebKey,
-    KeyCurveName,
-    KeyOperation,
-    KeyVaultKey,
-)
+from azure.keyvault.keys import JsonWebKey, KeyCurveName, KeyOperation, KeyVaultKey
 from azure.keyvault.keys.crypto._providers import NoLocalCryptography, get_local_cryptography_provider
 from azure.keyvault.keys.crypto.aio import (
     CryptographyClient,
@@ -43,7 +37,6 @@
 NO_GET = Permissions(keys=[p.value for p in KeyPermissions if p.value != "get"])
 
 all_api_versions = get_decorator(is_async=True)
-only_7_4_hsm = get_decorator(only_hsm=True, api_versions=[ApiVersion.V7_4])
 only_hsm = get_decorator(only_hsm=True, is_async=True)
 only_vault_latest = get_decorator(only_vault=True, is_async=True, api_versions=[DEFAULT_VERSION])
 no_get = get_decorator(is_async=True, permissions=NO_GET)

sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py

@@ -14,7 +14,6 @@
 from azure.core.pipeline.policies import SansIOHTTPPolicy
 from azure.core.rest import HttpRequest
 from azure.keyvault.keys import (
-    ApiVersion,
     JsonWebKey,
     KeyClient,
     KeyReleasePolicy,
@@ -35,10 +34,9 @@
 
 all_api_versions = get_decorator()
 only_hsm = get_decorator(only_hsm=True)
-only_hsm_7_3 = get_decorator(only_hsm=True, api_versions=[ApiVersion.V7_3])
+only_hsm_latest = get_decorator(only_hsm=True, api_versions=[DEFAULT_VERSION])
 only_vault_latest = get_decorator(only_vault=True, api_versions=[DEFAULT_VERSION])
-only_vault_7_3 = get_decorator(only_vault=True, api_versions=[ApiVersion.V7_3])
-only_7_3 = get_decorator(api_versions=[ApiVersion.V7_3])
+only_latest = get_decorator(api_versions=[DEFAULT_VERSION])
 logging_enabled = get_decorator(logging_enable=True)
 logging_disabled = get_decorator(logging_enable=False)
 
@@ -496,7 +494,7 @@ def test_logging_disabled(self, client, is_hsm, **kwargs):
 
         mock_handler.close()
 
-    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_latest)
     @KeysClientPreparer()
     @recorded_by_proxy
     def test_get_random_bytes(self, client, **kwargs):
@@ -512,7 +510,7 @@ def test_get_random_bytes(self, client, **kwargs):
             assert all(random_bytes != rb for rb in generated_random_bytes)
             generated_random_bytes.append(random_bytes)
 
-    @pytest.mark.parametrize("api_version,is_hsm",only_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_latest)
     @KeysClientPreparer()
     @recorded_by_proxy
     def test_key_release(self, client, **kwargs):
@@ -535,7 +533,7 @@ def test_key_release(self, client, **kwargs):
         release_result = client.release_key(rsa_key_name, attestation)
         assert release_result.value
 
-    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_latest)
     @KeysClientPreparer()
     @recorded_by_proxy
     def test_imported_key_release(self, client, **kwargs):
@@ -555,7 +553,7 @@ def test_imported_key_release(self, client, **kwargs):
         release_result = client.release_key(imported_key_name, attestation)
         assert release_result.value
 
-    @pytest.mark.parametrize("api_version,is_hsm",only_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_latest)
     @KeysClientPreparer()
     @recorded_by_proxy
     def test_update_release_policy(self, client, **kwargs):
@@ -600,7 +598,7 @@ def test_update_release_policy(self, client, **kwargs):
         assert claim_condition is False
 
     #Immutable policies aren't currently supported on Managed HSM
-    @pytest.mark.parametrize("api_version,is_hsm",only_vault_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_vault_latest)
     @KeysClientPreparer()
     @recorded_by_proxy
     def test_immutable_release_policy(self, client, **kwargs):
@@ -637,7 +635,7 @@ def test_immutable_release_policy(self, client, **kwargs):
         with pytest.raises(HttpResponseError):
             self._update_key_properties(client, key, new_release_policy)
 
-    @pytest.mark.parametrize("api_version,is_hsm",only_vault_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_vault_latest)
     @KeysClientPreparer()
     @recorded_by_proxy
     def test_key_rotation(self, client, **kwargs):
@@ -655,7 +653,7 @@ def test_key_rotation(self, client, **kwargs):
         assert key.key.n != rotated_key.key.n
 
     @pytest.mark.playback_test_only("Currently fails in live mode because of service regression; will be fixed soon.")
-    @pytest.mark.parametrize("api_version,is_hsm",only_vault_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_vault_latest)
     @KeysClientPreparer()
     @recorded_by_proxy
     def test_key_rotation_policy(self, client, **kwargs):

sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py

@@ -14,7 +14,6 @@
 from azure.core.pipeline.policies import SansIOHTTPPolicy
 from azure.core.rest import HttpRequest
 from azure.keyvault.keys import (
-    ApiVersion,
     JsonWebKey,
     KeyReleasePolicy,
     KeyRotationLifetimeAction,
@@ -35,10 +34,9 @@
 
 all_api_versions = get_decorator(is_async=True)
 only_hsm = get_decorator(only_hsm=True, is_async=True)
-only_hsm_7_3 = get_decorator(only_hsm=True, is_async=True, api_versions=[ApiVersion.V7_3])
+only_hsm_latest = get_decorator(only_hsm=True, is_async=True, api_versions=[DEFAULT_VERSION])
 only_vault_latest = get_decorator(only_vault=True, is_async=True, api_versions=[DEFAULT_VERSION])
-only_vault_7_3 = get_decorator(only_vault=True, is_async=True, api_versions=[ApiVersion.V7_3])
-only_7_3 = get_decorator(is_async=True, api_versions=[ApiVersion.V7_3])
+only_latest = get_decorator(is_async=True, api_versions=[DEFAULT_VERSION])
 logging_enabled = get_decorator(is_async=True, logging_enable=True)
 logging_disabled = get_decorator(is_async=True, logging_enable=False)
 
@@ -497,7 +495,7 @@ async def test_logging_disabled(self, client, is_hsm, **kwargs):
         mock_handler.close()
 
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_latest)
     @AsyncKeysClientPreparer()
     @recorded_by_proxy_async
     async def test_get_random_bytes(self, client, **kwargs):
@@ -514,7 +512,7 @@ async def test_get_random_bytes(self, client, **kwargs):
             generated_random_bytes.append(random_bytes)
 
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version,is_hsm",only_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_latest)
     @AsyncKeysClientPreparer()
     @recorded_by_proxy_async
     async def test_key_release(self, client, **kwargs):
@@ -538,7 +536,7 @@ async def test_key_release(self, client, **kwargs):
         assert release_result.value
 
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_hsm_latest)
     @AsyncKeysClientPreparer()
     @recorded_by_proxy_async
     async def test_imported_key_release(self, client, **kwargs):
@@ -559,7 +557,7 @@ async def test_imported_key_release(self, client, **kwargs):
         assert release_result.value
 
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version,is_hsm",only_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_latest)
     @AsyncKeysClientPreparer()
     @recorded_by_proxy_async
     async def test_update_release_policy(self, client, **kwargs):
@@ -605,7 +603,7 @@ async def test_update_release_policy(self, client, **kwargs):
 
     # Immutable policies aren't currently supported on Managed HSM
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version,is_hsm",only_vault_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_vault_latest)
     @AsyncKeysClientPreparer()
     @recorded_by_proxy_async
     async def test_immutable_release_policy(self, client, **kwargs):
@@ -643,7 +641,7 @@ async def test_immutable_release_policy(self, client, **kwargs):
             await self._update_key_properties(client, key, new_release_policy)
 
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version,is_hsm",only_vault_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_vault_latest)
     @AsyncKeysClientPreparer()
     @recorded_by_proxy_async
     async def test_key_rotation(self, client, **kwargs):
@@ -662,7 +660,7 @@ async def test_key_rotation(self, client, **kwargs):
 
     @pytest.mark.playback_test_only("Currently fails in live mode because of service regression; will be fixed soon.")
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_version,is_hsm",only_vault_7_3)
+    @pytest.mark.parametrize("api_version,is_hsm",only_vault_latest)
     @AsyncKeysClientPreparer()
     @recorded_by_proxy_async
     async def test_key_rotation_policy(self, client, **kwargs):

sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys.py

@@ -8,15 +8,14 @@
 import time
 
 import pytest
-from azure.keyvault.keys import ApiVersion, KeyCurveName, KeyType
+from azure.keyvault.keys import KeyType
 from devtools_testutils import recorded_by_proxy
 
 from _shared.test_case import KeyVaultTestCase
 from _test_case import KeysClientPreparer, get_decorator
 from _keys_test_case import KeysTestCase
 
 all_api_versions = get_decorator(only_vault=True)
-only_7_4_hsm = get_decorator(only_hsm=True, api_versions=[ApiVersion.V7_4])
 only_hsm = get_decorator(only_hsm=True)
 
 

sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py

@@ -6,14 +6,13 @@
 import os
 
 import pytest
-from azure.keyvault.keys import ApiVersion, KeyCurveName, KeyType
+from azure.keyvault.keys import KeyType
 from devtools_testutils.aio import recorded_by_proxy_async
 
 from _async_test_case import AsyncKeysClientPreparer, get_decorator
 from _shared.test_case_async import KeyVaultTestCase
 
 all_api_versions = get_decorator(is_async=True, only_vault=True)
-only_7_4_hsm = get_decorator(only_hsm=True, api_versions=[ApiVersion.V7_4])
 only_hsm = get_decorator(only_hsm=True, is_async=True)