[Refractor] - Resolve copilot suggestion

Author: william051200

src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py

@@ -771,7 +771,8 @@ def assign_identity(cli_ctx, getter, setter, identity_role=None, identity_scope=
 
     # create role assignment:
     if identity_scope:
-        principal_id = resource.get('identity', {}).get('principal_id')
+        principal_id = resource.get('identity', {}).get('principalId') or \
+                       resource.get('identity', {}).get('principal_id')
 
         identity_role_id = resolve_role_id(cli_ctx, identity_role, identity_scope)
         assignments_client = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_AUTHORIZATION).role_assignments

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

@@ -2611,14 +2611,15 @@ def setter(resource_group_name, vm_name, vm):
         from ._vm_utils import IdentityType
         if vm.get('identity') and vm.get('identity').get('type') == IdentityType.USER_ASSIGNED.value:
             command_args['mi_user_assigned'] = \
-                ([key for key in list(vm.get('identity', {}).get('userAssignedIdentities', {}).keys())] +
-                 ['UserAssigned'])
+                vm.get('identity', {}).get('userAssignedIdentities', {}).keys() + ['UserAssigned']
+            # NOTE: The literal 'UserAssigned' is intentionally appended as a marker for
+            # VMIdentityRemove._format_content, which uses it to apply special handling
+            # for purely user-assigned identities. It is not a real identity resource ID.
         elif vm.get('identity') and vm.get('identity').get('type') == IdentityType.SYSTEM_ASSIGNED.value:
             command_args['mi_user_assigned'] = []
             command_args['mi_system_assigned'] = 'True'
         elif vm.get('identity') and vm.get('identity').get('type') == IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED.value:
-            command_args['mi_user_assigned'] = \
-                [key for key in list(vm.get('identity', {}).get('userAssignedIdentities', {}).keys())]
+            command_args['mi_user_assigned'] = vm.get('identity', {}).get('userAssignedIdentities', {}).keys()
             command_args['mi_system_assigned'] = 'True'
         else:
             command_args['mi_user_assigned'] = []

src/azure-cli/azure/cli/command_modules/vm/operations/vm.py

@@ -197,7 +197,7 @@ def _format_content(self, content):
                 for key in list(identities.keys()):
                     identities[key] = None
 
-            if len(content.get('identity', {}).get('userAssignedIdentities', {}).keys()) < 1:
+            if not content.get('identity', {}).get('userAssignedIdentities', {}):
                 content['identity']['userAssignedIdentities'] = None
 
             return json.dumps(content)