{Keyvault} Migrate azure-mgmt-keyvault to typespec generated SDK (#32419)

Author: evelyn-ys

src/azure-cli-core/azure/cli/core/util.py

@@ -644,7 +644,7 @@ def todict(obj, post_processor=None):
     """
     from datetime import date, time, datetime, timedelta
     from enum import Enum
-    from azure.core.serialization import attribute_list
+    from azure.core.serialization import attribute_list, get_backcompat_attr_name
     if isinstance(obj, dict):
         result = {k: todict(v, post_processor) for (k, v) in obj.items()}
         return post_processor(obj, result) if post_processor else result
@@ -662,7 +662,7 @@ def todict(obj, post_processor=None):
     # azure-core provided new function `attribute_list` to list all attribute names
     # so that we don't need to use raw __dict__ directly
     if getattr(obj, "_is_model", False):
-        result = {to_camel_case(attr): todict(getattr(obj, attr), post_processor)
+        result = {to_camel_case(get_backcompat_attr_name(obj, attr)): todict(getattr(obj, attr), post_processor)
                   for attr in attribute_list(obj) if hasattr(obj, attr)}
         return post_processor(obj, result) if post_processor else result
     if hasattr(obj, '_asdict'):

src/azure-cli-core/setup.py

@@ -45,7 +45,7 @@
 DEPENDENCIES = [
     'argcomplete~=3.5.2',
     'azure-cli-telemetry==1.1.0.*',
-    'azure-core~=1.35.0',
+    'azure-core~=1.37.0',
     'azure-mgmt-core>=1.2.0,<2',
     'cryptography',
     # On Linux, the distribution (Ubuntu, Debian, etc) and version are logged in telemetry

src/azure-cli/azure/cli/command_modules/keyvault/custom.py

@@ -347,9 +347,9 @@ def recover_vault(cmd, client, vault_name, resource_group_name, location, no_wai
     tenant_id = profile.get_subscription(subscription=cmd.cli_ctx.data.get('subscription_id', None))[_TENANT_ID]
 
     params = VaultCreateOrUpdateParameters(location=location,
-                                           properties={'tenant_id': tenant_id,
+                                           properties={'tenantId': tenant_id,
                                                        'sku': Sku(name=SkuName.standard.value, family='A'),
-                                                       'create_mode': CreateMode.recover.value})
+                                                       'createMode': CreateMode.recover.value})
 
     return sdk_no_wait(no_wait, client.begin_create_or_update,
                        resource_group_name=resource_group_name,
@@ -623,7 +623,7 @@ def create_vault(cmd, client,  # pylint: disable=too-many-locals, too-many-state
     if no_self_perms or enable_rbac_authorization:
         access_policies = []
     else:
-        permissions = Permissions(keys=[KeyPermissions.all],
+        permissions = Permissions(keys_property=[KeyPermissions.all],
                                   secrets=[SecretPermissions.all],
                                   certificates=[CertificatePermissions.all],
                                   storage=[StoragePermissions.all])
@@ -820,19 +820,19 @@ def set_policy(cmd, client, resource_group_name, vault_name,
             tenant_id=vault.properties.tenant_id,
             object_id=object_id,
             application_id=application_id,
-            permissions=Permissions(keys=key_permissions,
+            permissions=Permissions(keys_property=key_permissions,
                                     secrets=secret_permissions,
                                     certificates=certificate_permissions,
                                     storage=storage_permissions)))
     else:
         # Modify existing policy.
         # If key_permissions is not set, use prev. value (similarly with secret_permissions).
-        keys = policy.permissions.keys if key_permissions is None else key_permissions
+        keys = policy.permissions.keys_property if key_permissions is None else key_permissions
         secrets = policy.permissions.secrets if secret_permissions is None else secret_permissions
         certs = policy.permissions.certificates \
             if certificate_permissions is None else certificate_permissions
         storage = policy.permissions.storage if storage_permissions is None else storage_permissions
-        policy.permissions = Permissions(keys=keys, secrets=secrets, certificates=certs, storage=storage)
+        policy.permissions = Permissions(keys_property=keys, secrets=secrets, certificates=certs, storage=storage)
 
     return sdk_no_wait(no_wait, client.begin_create_or_update,
                        resource_group_name=resource_group_name,

src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/recordings/test_hsm_private_endpoint_connection.yaml

@@ -1604,34 +1604,9 @@ def _create_keyvault(cmd,
     if no_self_perms:
         access_policies = []
     else:
-        permissions = Permissions(keys=[KeyPermissions.get,
-                                        KeyPermissions.create,
-                                        KeyPermissions.delete,
-                                        KeyPermissions.list,
-                                        KeyPermissions.update,
-                                        KeyPermissions.import_enum,
-                                        KeyPermissions.backup,
-                                        KeyPermissions.restore],
-                                  secrets=[SecretPermissions.get,
-                                           SecretPermissions.list,
-                                           SecretPermissions.set,
-                                           SecretPermissions.delete,
-                                           SecretPermissions.backup,
-                                           SecretPermissions.restore,
-                                           SecretPermissions.recover],
-                                  certificates=[CertificatePermissions.get,
-                                                CertificatePermissions.list,
-                                                CertificatePermissions.delete,
-                                                CertificatePermissions.create,
-                                                CertificatePermissions.import_enum,
-                                                CertificatePermissions.update,
-                                                CertificatePermissions.managecontacts,
-                                                CertificatePermissions.getissuers,
-                                                CertificatePermissions.listissuers,
-                                                CertificatePermissions.setissuers,
-                                                CertificatePermissions.deleteissuers,
-                                                CertificatePermissions.manageissuers,
-                                                CertificatePermissions.recover])
+        permissions = Permissions(keys_property=[KeyPermissions.all],
+                                  secrets=[SecretPermissions.all],
+                                  certificates=[CertificatePermissions.all])
 
         from azure.cli.command_modules.role.util import get_current_identity_object_id
         object_id = get_current_identity_object_id(cli_ctx)

src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_hsm_security_domain.yaml

@@ -8,7 +8,7 @@ azure-cli-core==2.81.0
 azure-cli-telemetry==1.1.0
 azure-cli==2.81.0
 azure-common==1.1.22
-azure-core==1.35.0
+azure-core==1.37.0
 azure-cosmos==3.2.0
 azure-data-tables==12.4.0
 azure-datalake-store==1.0.1
@@ -46,7 +46,7 @@ azure-mgmt-imagebuilder==1.3.0
 azure-mgmt-iotcentral==10.0.0b1
 azure-mgmt-iothub==5.0.0b1
 azure-mgmt-iothubprovisioningservices==1.1.0
-azure-mgmt-keyvault==12.1.0
+azure-mgmt-keyvault==13.0.0
 azure-mgmt-loganalytics==13.0.0b4
 azure-mgmt-managementgroups==1.0.0
 azure-mgmt-maps==2.0.0

src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_private_endpoint_connection.yaml

@@ -8,7 +8,7 @@ azure-cli-core==2.81.0
 azure-cli-telemetry==1.1.0
 azure-cli==2.81.0
 azure-common==1.1.22
-azure-core==1.35.0
+azure-core==1.37.0
 azure-cosmos==3.2.0
 azure-data-tables==12.4.0
 azure-datalake-store==1.0.1
@@ -46,7 +46,7 @@ azure-mgmt-imagebuilder==1.3.0
 azure-mgmt-iotcentral==10.0.0b1
 azure-mgmt-iothub==5.0.0b1
 azure-mgmt-iothubprovisioningservices==1.1.0
-azure-mgmt-keyvault==12.1.0
+azure-mgmt-keyvault==13.0.0
 azure-mgmt-loganalytics==13.0.0b4
 azure-mgmt-managementgroups==1.0.0
 azure-mgmt-maps==2.0.0