From 439edf30a3326da1228309d3335c29b2ee4372ca Mon Sep 17 00:00:00 2001
From: william051200 <williamng0512@gmail.com>
Date: Fri, 13 Feb 2026 13:51:30 +0800
Subject: [PATCH 1/2] Clean up code

---
 .../azure/cli/command_modules/vm/custom.py    | 27 +++----------------
 .../cli/command_modules/vm/operations/vm.py   | 10 +------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/azure-cli/azure/cli/command_modules/vm/custom.py b/src/azure-cli/azure/cli/command_modules/vm/custom.py
index 639c102a747..8800762ff83 100644
--- a/src/azure-cli/azure/cli/command_modules/vm/custom.py
+++ b/src/azure-cli/azure/cli/command_modules/vm/custom.py
@@ -845,12 +845,7 @@ def create_snapshot(cmd, resource_group_name, snapshot_name, location=None, size
 def show_vm_identity(cmd, resource_group_name, vm_name):
     vm = get_vm_by_aaz(cmd, resource_group_name, vm_name)
 
-    identity = vm.get("identity", {}) if vm else None
-
-    if identity and not identity.get('userAssignedIdentities'):
-        identity['userAssignedIdentities'] = None
-
-    return identity or None
+    return vm.get("identity") if vm else None
 
 
 def show_vmss_identity(cmd, resource_group_name, vm_name):
@@ -1773,13 +1768,7 @@ def _output(self, *args, **kwargs):
                     if has_value(resource.type):
                         resource.type = AAZUndefined
 
-            result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
-            if result.get('osProfile', {}).get('secrets', []):
-                for secret in result['osProfile']['secrets']:
-                    for cert in secret.get('vaultCertificates', []):
-                        if not cert.get('certificateStore'):
-                            cert['certificateStore'] = None
-            return result
+            return self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
 
     vm = LongRunningOperation(cmd.cli_ctx)(
         SetVM(cli_ctx=cmd.cli_ctx)(command_args=vm))
@@ -2625,10 +2614,7 @@ def _remove_identities_by_aaz(cmd, resource_group_name, name, identities, getter
 
     result = LongRunningOperation(cmd.cli_ctx)(setter(resource_group_name, name, resource))
 
-    if not result:
-        return None
-
-    return result.get('identity') or None
+    return result.get('identity') if result else None
 
 
 def remove_vm_identity(cmd, resource_group_name, vm_name, identities=None):
@@ -3351,13 +3337,6 @@ def add_vm_secret(cmd, resource_group_name, vm_name, keyvault, certificate, cert
 
 def list_vm_secrets(cmd, resource_group_name, vm_name):
     vm = get_vm_by_aaz(cmd, resource_group_name, vm_name)
-
-    if vm.get('osProfile', {}).get('secrets', []):
-        for secret in vm['osProfile']['secrets']:
-            for cert in secret.get('vaultCertificates', []):
-                if not cert.get('certificateStore'):
-                    cert['certificateStore'] = None
-
     return vm.get('osProfile', {}).get('secrets', [])
 
 
diff --git a/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py b/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py
index 09f7244a3b8..06eedb0cc64 100644
--- a/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py
+++ b/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py
@@ -196,16 +196,8 @@ def _output(self, *args, **kwargs):
                 if has_value(resource.type):
                     resource.type = AAZUndefined
 
-        result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
-
-        identity = result.get('identity')
-        if not identity:
-            return result
+        return self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
 
-        if not identity.get('userAssignedIdentities'):
-            identity['userAssignedIdentities'] = None
-
-        return result
 
     class VirtualMachinesUpdate(_VMPatch.VirtualMachinesUpdate):
         # Override to solve key conflict of _schema_on_200.resources.Element.properties.type when deserializing

From ea702539112027557281092a1c67461f25c7e202 Mon Sep 17 00:00:00 2001
From: william051200 <williamng0512@gmail.com>
Date: Fri, 13 Feb 2026 15:08:10 +0800
Subject: [PATCH 2/2] Update code style

---
 src/azure-cli/azure/cli/command_modules/vm/operations/vm.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py b/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py
index 06eedb0cc64..9e3950196ac 100644
--- a/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py
+++ b/src/azure-cli/azure/cli/command_modules/vm/operations/vm.py
@@ -198,7 +198,6 @@ def _output(self, *args, **kwargs):
 
         return self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
 
-
     class VirtualMachinesUpdate(_VMPatch.VirtualMachinesUpdate):
         # Override to solve key conflict of _schema_on_200.resources.Element.properties.type when deserializing
         @classmethod