Added handling and removed unused comments

Author: william051200

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

@@ -2055,12 +2055,6 @@ def _validate_upload_type(cmd, namespace):
         namespace.upload_type = 'Upload'
 
     if namespace.upload_type == 'UploadWithSecurityData':
-
-        # if not cmd.supported_api_version(min_api='2021-08-01', operation_group='disks'):
-        #     raise ArgumentUsageError(
-        #         "'UploadWithSecurityData' is not supported in the current profile. "
-        #         "Please upgrade your profile with 'az cloud set --profile newerProfile' and try again")
-
         if not namespace.security_type:
             raise RequiredArgumentMissingError(
                 "Please specify --security-type when the value of --upload-type is 'UploadWithSecurityData'")

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

@@ -551,38 +551,50 @@ def create_managed_disk(cmd, resource_group_name, disk_name, location=None,  # p
 
     if disk_encryption_set is not None and not is_valid_resource_id(disk_encryption_set):
         from .aaz.latest.disk_encryption_set import Show as DiskEncryptionSetShow
-        disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
-            'resource_group': resource_group_name,
-            'disk_encryption_set_name': disk_encryption_set
-        })
+        from azure.core.exceptions import HttpResponseError
+        try:
+            disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
+                'resource_group': resource_group_name,
+                'disk_encryption_set_name': disk_encryption_set
+            })
 
-        if disk_encryption_set:
-            disk_encryption_set = disk_encryption_set['id']
-        else:
+            if disk_encryption_set:
+                disk_encryption_set = disk_encryption_set['id']
+            else:
+                disk_encryption_set = None
+        except HttpResponseError:
             disk_encryption_set = None
 
     if disk_access is not None and not is_valid_resource_id(disk_access):
         from .aaz.latest.disk_access import Show as DiskAccessShow
-        disk_access = DiskAccessShow(cli_ctx=cmd.cli_ctx)(command_args={
-            'resource_group': resource_group_name,
-            'disk_access_name': disk_access
-        })
+        from azure.core.exceptions import HttpResponseError
+        try:
+            disk_access = DiskAccessShow(cli_ctx=cmd.cli_ctx)(command_args={
+                'resource_group': resource_group_name,
+                'disk_access_name': disk_access
+            })
 
-        if disk_access:
-            disk_access = disk_access['id']
-        else:
+            if disk_access:
+                disk_access = disk_access['id']
+            else:
+                disk_access = None
+        except HttpResponseError:
             disk_access = None
 
     if secure_vm_disk_encryption_set is not None and not is_valid_resource_id(secure_vm_disk_encryption_set):
         from .aaz.latest.disk_encryption_set import Show as DiskEncryptionSetShow
-        secure_vm_disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
-            'resource_group': resource_group_name,
-            'disk_encryption_set_name': secure_vm_disk_encryption_set
-        })
+        from azure.core.exceptions import HttpResponseError
+        try:
+            secure_vm_disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
+                'resource_group': resource_group_name,
+                'disk_encryption_set_name': secure_vm_disk_encryption_set
+            })
 
-        if secure_vm_disk_encryption_set:
-            secure_vm_disk_encryption_set = secure_vm_disk_encryption_set['id']
-        else:
+            if secure_vm_disk_encryption_set:
+                secure_vm_disk_encryption_set = secure_vm_disk_encryption_set['id']
+            else:
+                secure_vm_disk_encryption_set = None
+        except HttpResponseError:
             secure_vm_disk_encryption_set = None
 
     encryption = None

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

@@ -10,6 +10,7 @@
 from ..aaz.latest.disk import Update as _DiskUpdate, GrantAccess as _DiskGrantAccess, Show, UpdatePatch as _UpdatePatch
 from ..aaz.latest.disk_encryption_set import Show as DiskEncryptionSetShow
 from ..aaz.latest.disk_access import Show as DiskAccessShow
+from azure.core.exceptions import HttpResponseError
 
 logger = get_logger(__name__)
 
@@ -47,14 +48,17 @@ def pre_instance_update(self, instance):
 
             disk_encryption_set = args.disk_encryption_set
             if not is_valid_resource_id(disk_encryption_set.to_serialized_data()):
-                disk_encryption_set = DiskEncryptionSetShow(cli_ctx=self.cli_ctx)(command_args={
-                    'resource_group': args.resource_group,
-                    'disk_encryption_set_name': disk_encryption_set
-                })
-
-                if disk_encryption_set:
-                    disk_encryption_set = disk_encryption_set['id']
-                else:
+                try:
+                    disk_encryption_set = DiskEncryptionSetShow(cli_ctx=self.cli_ctx)(command_args={
+                        'resource_group': args.resource_group,
+                        'disk_encryption_set_name': disk_encryption_set
+                    })
+
+                    if disk_encryption_set:
+                        disk_encryption_set = disk_encryption_set['id']
+                    else:
+                        disk_encryption_set = None
+                except HttpResponseError:
                     disk_encryption_set = None
 
             instance.properties.encryption.disk_encryption_set_id = disk_encryption_set
@@ -66,16 +70,19 @@ def pre_instance_update(self, instance):
         if has_value(args.disk_access):
             disk_access = args.disk_access
             if not is_valid_resource_id(disk_access.to_serialized_data()):
-                disk_access = DiskAccessShow(cli_ctx=self.cli_ctx)(command_args={
-                    'resource_group': args.resource_group,
-                    'disk_access_name': disk_access
-                })
-
-                if disk_access:
-                    disk_access = disk_access['id']
-                else:
+                try:
+                    disk_access = DiskAccessShow(cli_ctx=self.cli_ctx)(command_args={
+                        'resource_group': args.resource_group,
+                        'disk_access_name': disk_access
+                    })
+
+                    if disk_access:
+                        disk_access = disk_access['id']
+                    else:
+                        disk_access = None
+                except HttpResponseError:
                     disk_access = None
-                    
+
             instance.properties.disk_access_id = disk_access