[Key Vault] Add API version 7.2 for keys (Azure#18586)

AzureSDKAutomation · Jun 2, 2021 · 9c428ca · 9c428ca
1 parent 520ea71
commit 9c428ca
Show file tree

Hide file tree

Showing 311 changed files with 83,709 additions and 47,930 deletions.
diff --git a/...yvault-administration/tests/recordings/test_backup_client.test_selective_key_restore.yaml b/...yvault-administration/tests/recordings/test_backup_client.test_selective_key_restore.yaml
@@ -15,7 +15,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: POST
-    uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.2-preview
+    uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.2
   response:
     body:
       string: ''
@@ -58,7 +58,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: POST
-    uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.2-preview
+    uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.2
   response:
     body:
       string: '{"attributes":{"created":1612826772,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612826772},"key":{"e":"AQAB","key_ops":["wrapKey","decrypt","encrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-keya85a1290/2baac872a79e4f4d37d2fd1d360b7b38","kty":"RSA-HSM","n":"op5WXDgzSfohX67cJmBplGev8zwrI_gy7qTLCTjgw-Hb7B4AvS8q0QXoytAZic2QLfb9eaoaCClHbck0OlHjQykQdthxTX6usMXOqVfcwQ12nfQ8pJjnAZg08kyVs5hZDWjlbdInNIUwBdwwmyrEBckTh6UlolxIIsOJiUbrihv3wdv_4JnSRQm7f7lV69tNs7meqdOI-fjiOYwP8eH1hau265uRb6en9aoov0p59IWvZ-HVocak5eYjv3-8XnGL4Fr2FvwT5HTlSUmkiAGOiK2PBkyzgZLXImgZ06i1bEqPDMlUufYsKIBf3jHUpdkiorB0s7ZoXHc1PNh-AkygAw"}}'
@@ -570,7 +570,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: DELETE
-    uri: https://managedhsm/keys/selective-restore-test-keya85a1290?api-version=7.2-preview
+    uri: https://managedhsm/keys/selective-restore-test-keya85a1290?api-version=7.2
   response:
     body:
       string: '{"attributes":{"created":1612826772,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612826772},"deletedDate":1612826814,"key":{"e":"AQAB","key_ops":["wrapKey","encrypt","decrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-keya85a1290/2baac872a79e4f4d37d2fd1d360b7b38","kty":"RSA-HSM","n":"op5WXDgzSfohX67cJmBplGev8zwrI_gy7qTLCTjgw-Hb7B4AvS8q0QXoytAZic2QLfb9eaoaCClHbck0OlHjQykQdthxTX6usMXOqVfcwQ12nfQ8pJjnAZg08kyVs5hZDWjlbdInNIUwBdwwmyrEBckTh6UlolxIIsOJiUbrihv3wdv_4JnSRQm7f7lV69tNs7meqdOI-fjiOYwP8eH1hau265uRb6en9aoov0p59IWvZ-HVocak5eYjv3-8XnGL4Fr2FvwT5HTlSUmkiAGOiK2PBkyzgZLXImgZ06i1bEqPDMlUufYsKIBf3jHUpdkiorB0s7ZoXHc1PNh-AkygAw"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-keya85a1290","scheduledPurgeDate":1620602814}'
@@ -610,7 +610,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: GET
-    uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.2-preview
+    uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.2
   response:
     body:
       string: '{"attributes":{"created":1612826772,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612826772},"deletedDate":1612826814,"key":{"e":"AQAB","key_ops":["verify","sign","unwrapKey","encrypt","decrypt","wrapKey"],"kid":"https://managedhsm/keys/selective-restore-test-keya85a1290/2baac872a79e4f4d37d2fd1d360b7b38","kty":"RSA-HSM","n":"op5WXDgzSfohX67cJmBplGev8zwrI_gy7qTLCTjgw-Hb7B4AvS8q0QXoytAZic2QLfb9eaoaCClHbck0OlHjQykQdthxTX6usMXOqVfcwQ12nfQ8pJjnAZg08kyVs5hZDWjlbdInNIUwBdwwmyrEBckTh6UlolxIIsOJiUbrihv3wdv_4JnSRQm7f7lV69tNs7meqdOI-fjiOYwP8eH1hau265uRb6en9aoov0p59IWvZ-HVocak5eYjv3-8XnGL4Fr2FvwT5HTlSUmkiAGOiK2PBkyzgZLXImgZ06i1bEqPDMlUufYsKIBf3jHUpdkiorB0s7ZoXHc1PNh-AkygAw"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-keya85a1290","scheduledPurgeDate":1620602814}'
@@ -654,7 +654,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: DELETE
-    uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.2-preview
+    uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.2
   response:
     body:
       string: ''

diff --git a/...-administration/tests/recordings/test_backup_client_async.test_selective_key_restore.yaml b/...-administration/tests/recordings/test_backup_client_async.test_selective_key_restore.yaml
@@ -11,7 +11,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: POST
-    uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
+    uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.2
   response:
     body:
       string: ''
@@ -29,7 +29,7 @@ interactions:
     status:
       code: 401
       message: Unauthorized
-    url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
+    url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.2
 - request:
     body: '{"kty": "RSA"}'
     headers:
@@ -42,7 +42,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: POST
-    uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
+    uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.2
   response:
     body:
       string: '{"attributes":{"created":1612829541,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612829541},"key":{"e":"AQAB","key_ops":["wrapKey","decrypt","encrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-key20e5150d/a649e5b2c7e646ba062f308cc4736f3c","kty":"RSA-HSM","n":"oHCH2OW-TG9B0pSwDQzO-ZgNZ1mKw_pWTkXt7CdEv_VOb9qJSfaczurdEgen9wKLM8oQPdOEhZzgHZHoQW7zXVISjgTm2JADHH29aYxzu_h8EKvA6kO4eWzN_KphSr3TIn2NqtTo7QeCeTKx4bGbZejGElVmPJhq8srqq53XhuX7xZVb6-Du5Pjm1J-mlpfZR1C2r1hx049BUdz1bPBjwcVhCqXIqUwxbPex80Von26ULxHJk3TVzogSwjTreKG2NqmJBoDzAA51id4C0JxrC7bu2tHCC1OuhWcE-JN67bBtd9Vn2O1ePda2eGsdyM3_6D_aBYtAVEK-7ksEiYyFYQ"}}'
@@ -60,7 +60,7 @@ interactions:
     status:
       code: 200
       message: OK
-    url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
+    url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.2
 - request:
     body: null
     headers:
@@ -377,7 +377,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: DELETE
-    uri: https://managedhsm/keys/selective-restore-test-key20e5150d?api-version=7.2-preview
+    uri: https://managedhsm/keys/selective-restore-test-key20e5150d?api-version=7.2
   response:
     body:
       string: '{"attributes":{"created":1612829541,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612829541},"deletedDate":1612829584,"key":{"e":"AQAB","key_ops":["wrapKey","encrypt","decrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-key20e5150d/a649e5b2c7e646ba062f308cc4736f3c","kty":"RSA-HSM","n":"oHCH2OW-TG9B0pSwDQzO-ZgNZ1mKw_pWTkXt7CdEv_VOb9qJSfaczurdEgen9wKLM8oQPdOEhZzgHZHoQW7zXVISjgTm2JADHH29aYxzu_h8EKvA6kO4eWzN_KphSr3TIn2NqtTo7QeCeTKx4bGbZejGElVmPJhq8srqq53XhuX7xZVb6-Du5Pjm1J-mlpfZR1C2r1hx049BUdz1bPBjwcVhCqXIqUwxbPex80Von26ULxHJk3TVzogSwjTreKG2NqmJBoDzAA51id4C0JxrC7bu2tHCC1OuhWcE-JN67bBtd9Vn2O1ePda2eGsdyM3_6D_aBYtAVEK-7ksEiYyFYQ"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-key20e5150d","scheduledPurgeDate":1620605584}'
@@ -395,7 +395,7 @@ interactions:
     status:
       code: 200
       message: OK
-    url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d?api-version=7.2-preview
+    url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d?api-version=7.2
 - request:
     body: null
     headers:
@@ -404,7 +404,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: GET
-    uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
+    uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2
   response:
     body:
       string: '{"attributes":{"created":1612829541,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612829541},"deletedDate":1612829584,"key":{"e":"AQAB","key_ops":["verify","sign","unwrapKey","encrypt","decrypt","wrapKey"],"kid":"https://managedhsm/keys/selective-restore-test-key20e5150d/a649e5b2c7e646ba062f308cc4736f3c","kty":"RSA-HSM","n":"oHCH2OW-TG9B0pSwDQzO-ZgNZ1mKw_pWTkXt7CdEv_VOb9qJSfaczurdEgen9wKLM8oQPdOEhZzgHZHoQW7zXVISjgTm2JADHH29aYxzu_h8EKvA6kO4eWzN_KphSr3TIn2NqtTo7QeCeTKx4bGbZejGElVmPJhq8srqq53XhuX7xZVb6-Du5Pjm1J-mlpfZR1C2r1hx049BUdz1bPBjwcVhCqXIqUwxbPex80Von26ULxHJk3TVzogSwjTreKG2NqmJBoDzAA51id4C0JxrC7bu2tHCC1OuhWcE-JN67bBtd9Vn2O1ePda2eGsdyM3_6D_aBYtAVEK-7ksEiYyFYQ"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-key20e5150d","scheduledPurgeDate":1620605584}'
@@ -423,7 +423,7 @@ interactions:
     status:
       code: 200
       message: OK
-    url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
+    url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2
 - request:
     body: null
     headers:
@@ -432,7 +432,7 @@ interactions:
       User-Agent:
       - azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
     method: DELETE
-    uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
+    uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2
   response:
     body:
       string: ''
@@ -450,5 +450,5 @@ interactions:
     status:
       code: 204
       message: ''
-    url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
+    url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2
 version: 1
diff --git a/sdk/keyvault/azure-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-keyvault-keys/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Release History
 
 ## 4.4.0b5 (Unreleased)
+### Changed
+- Key Vault API version 7.2 is now the default
+
 ### Added
 - `KeyClient` has a `create_oct_key` method for creating symmetric keys
 

diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_key_vault_client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_generated/_key_vault_client.py
@@ -23,6 +23,8 @@
     # pylint: disable=unused-import,ungrouped-imports
     from typing import Any, Optional
 
+    from azure.core.pipeline.transport import HttpRequest, HttpResponse
+
 class _SDKClient(object):
     def __init__(self, *args, **kwargs):
         """This is a fake class to support current implemetation of MultiApiClientMixin."
@@ -46,7 +48,7 @@ class KeyVaultClient(KeyVaultClientOperationsMixin, MultiApiClientMixin, _SDKCli
     :type profile: azure.profiles.KnownProfiles
     """
 
-    DEFAULT_API_VERSION = '7.1'
+    DEFAULT_API_VERSION = '7.2'
     _PROFILE_TAG = "azure.keyvault.KeyVaultClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
@@ -120,7 +122,7 @@ def __init__(
         profile=KnownProfiles.default, # type: KnownProfiles
         **kwargs  # type: Any
     ):
-        if api_version == '2016-10-01' or api_version == '7.0' or api_version == '7.1' or api_version == '7.2-preview':
+        if api_version == '2016-10-01' or api_version == '7.0' or api_version == '7.1' or api_version == '7.2':
             base_url = '{vaultBaseUrl}'
         else:
             raise ValueError("API version {} is not available".format(api_version))
@@ -142,7 +144,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
            * 2016-10-01: :mod:`v2016_10_01.models<azure.keyvault.v2016_10_01.models>`
            * 7.0: :mod:`v7_0.models<azure.keyvault.v7_0.models>`
            * 7.1: :mod:`v7_1.models<azure.keyvault.v7_1.models>`
-           * 7.2-preview: :mod:`v7_2_preview.models<azure.keyvault.v7_2_preview.models>`
+           * 7.2: :mod:`v7_2.models<azure.keyvault.v7_2.models>`
         """
         if api_version == '2016-10-01':
             from .v2016_10_01 import models
@@ -153,8 +155,8 @@ def models(cls, api_version=DEFAULT_API_VERSION):
         elif api_version == '7.1':
             from .v7_1 import models
             return models
-        elif api_version == '7.2-preview':
-            from .v7_2_preview import models
+        elif api_version == '7.2':
+            from .v7_2 import models
             return models
         raise ValueError("API version {} is not available".format(api_version))