Resolve models output breaking change with azure core new function

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

@@ -46,7 +46,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/_transformers.py

@@ -485,28 +485,3 @@ def transform_certificate_issuer_admin_list(result, **command_args):
         return ret
     return result
 
-
-def transform_vault_output(result, **command_args):  # pylint: disable=unused-argument
-    from azure.mgmt.keyvault.models import Vault
-    if not result or not isinstance(result, Vault):
-        return result
-
-    from azure.cli.core.util import todict
-    output = todict(result)
-    if output.get('properties', None) and output['properties'].get('accessPolicies', None):
-        for policy in output['properties']['accessPolicies']:
-            if policy.get('permissions') and 'keysProperty' in policy['permissions']:
-                keys = policy['permissions']['keysProperty']
-                policy['permissions']['keys'] = keys
-                del policy['permissions']['keysProperty']
-    return output
-
-
-def transform_vault_list(result, **command_args):  # pylint: disable=unused-argument
-    if not result:
-        return result
-    output = []
-    for item in result:
-        new_item = transform_vault_output(item)
-        output.append(new_item)
-    return output

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

@@ -12,7 +12,7 @@
     get_client, get_client_factory, Clients)
 
 from azure.cli.command_modules.keyvault._transformers import (
-    filter_out_managed_resources, transform_vault_output, transform_vault_list,
+    filter_out_managed_resources,
     multi_transformers, transform_key_decryption_output, keep_max_results, transform_key_list_output,
     transform_key_output, transform_key_encryption_output, transform_key_random_output,
     transform_secret_list, transform_deleted_secret_list, transform_secret_set,
@@ -70,14 +70,14 @@ def load_command_table(self, _):
     # Management Plane Commands
     with self.command_group('keyvault', mgmt_vaults_entity.command_type,
                             client_factory=mgmt_vaults_entity.client_factory) as g:
-        g.custom_command('create', 'create_vault_or_hsm', supports_no_wait=True, transform=transform_vault_output)
-        g.custom_command('recover', 'recover_vault_or_hsm', supports_no_wait=True, transform=transform_vault_output)
-        g.custom_command('list', 'list_vault_or_hsm', transform=transform_vault_list)
-        g.custom_show_command('show', 'get_vault_or_hsm', transform=transform_vault_output)
+        g.custom_command('create', 'create_vault_or_hsm', supports_no_wait=True)
+        g.custom_command('recover', 'recover_vault_or_hsm', supports_no_wait=True)
+        g.custom_command('list', 'list_vault_or_hsm')
+        g.custom_show_command('show', 'get_vault_or_hsm')
         g.custom_command('delete', 'delete_vault_or_hsm', supports_no_wait=True)
         g.custom_command('purge', 'purge_vault_or_hsm', supports_no_wait=True)
-        g.custom_command('set-policy', 'set_policy', supports_no_wait=True, transform=transform_vault_output)
-        g.custom_command('delete-policy', 'delete_policy', supports_no_wait=True, transform=transform_vault_output)
+        g.custom_command('set-policy', 'set_policy', supports_no_wait=True)
+        g.custom_command('delete-policy', 'delete_policy', supports_no_wait=True)
         g.custom_command('list-deleted', 'list_deleted_vault_or_hsm')
         g.custom_command('show-deleted', 'get_deleted_vault_or_hsm')
         g.generic_update_command(

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

@@ -43,7 +43,7 @@
 
 def _default_certificate_profile(cmd):
     def get_model(x):
-        return cmd.loader.get_models(x, resource_type=ResourceType.DATA_KEYVAULT_CERTIFICATES, mod='_generated_models')
+        return cmd.loader.get_sdk(x, resource_type=ResourceType.DATA_KEYVAULT_CERTIFICATES, mod='_generated_models')
 
     Action = get_model('Action')
     ActionType = get_model('ActionType')
@@ -354,7 +354,7 @@ def recover_vault(cmd, client, vault_name, resource_group_name, location, no_wai
     return sdk_no_wait(no_wait, client.begin_create_or_update,
                        resource_group_name=resource_group_name,
                        vault_name=vault_name,
-                       parameters=params).result()
+                       parameters=params)
 
 
 def _parse_network_acls(cmd, resource_group_name, network_acls_json, network_acls_ips, network_acls_vnets,
@@ -661,7 +661,7 @@ def create_vault(cmd, client,  # pylint: disable=too-many-locals, too-many-state
     return sdk_no_wait(no_wait, client.begin_create_or_update,
                        resource_group_name=resource_group_name,
                        vault_name=vault_name,
-                       parameters=parameters).result()
+                       parameters=parameters)
 
 
 def update_vault_setter(cmd, client, parameters, resource_group_name, vault_name, no_wait=False):
@@ -673,7 +673,7 @@ def update_vault_setter(cmd, client, parameters, resource_group_name, vault_name
                        parameters=VaultCreateOrUpdateParameters(
                            location=parameters.location,
                            tags=parameters.tags,
-                           properties=parameters.properties)).result()
+                           properties=parameters.properties))
 
 
 def update_hsm_setter(cmd, client, parameters, resource_group_name, name, no_wait=False):
@@ -840,7 +840,7 @@ def set_policy(cmd, client, resource_group_name, vault_name,
                        parameters=VaultCreateOrUpdateParameters(
                            location=vault.location,
                            tags=vault.tags,
-                           properties=vault.properties)).result()
+                           properties=vault.properties))
 
 
 def add_network_rule_for_vault_or_hsm(cmd, client, resource_group_name, vault_name=None, hsm_name=None,
@@ -909,7 +909,7 @@ def add_vault_network_rule(cmd, client, resource_group_name, vault_name, ip_addr
                        parameters=VaultCreateOrUpdateParameters(
                            location=vault.location,
                            tags=vault.tags,
-                           properties=vault.properties)).result()
+                           properties=vault.properties))
 
 
 def add_hsm_network_rule(cmd, client, resource_group_name, hsm_name,
@@ -1001,7 +1001,7 @@ def remove_vault_network_rule(cmd, client, resource_group_name, vault_name, ip_a
                        parameters=VaultCreateOrUpdateParameters(
                            location=vault.location,
                            tags=vault.tags,
-                           properties=vault.properties)).result()
+                           properties=vault.properties))
 
 
 def remove_hsm_network_rule(client, resource_group_name, hsm_name,
@@ -1079,7 +1079,7 @@ def delete_policy(cmd, client, resource_group_name, vault_name,
                        parameters=VaultCreateOrUpdateParameters(
                            location=vault.location,
                            tags=vault.tags,
-                           properties=vault.properties)).result()
+                           properties=vault.properties))
 # endregion
 
 

src/azure-cli/requirements.py3.Darwin.txt

@@ -8,7 +8,7 @@ azure-cli-core==2.78.0
 azure-cli-telemetry==1.1.0
 azure-cli==2.78.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

src/azure-cli/requirements.py3.Linux.txt

@@ -8,7 +8,7 @@ azure-cli-core==2.78.0
 azure-cli-telemetry==1.1.0
 azure-cli==2.78.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

src/azure-cli/requirements.py3.windows.txt

@@ -8,7 +8,7 @@ azure-cli-core==2.78.0
 azure-cli-telemetry==1.1.0
 azure-cli==2.78.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