{Compute} az disk-encryption-set: Migrate to AAZ

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

@@ -132,10 +132,6 @@ def cf_log_analytics_data_plane(cli_ctx, _):
                            audience=cli_ctx.cloud.endpoints.log_analytics_resource_id)
 
 
-def cf_disk_encryption_set(cli_ctx, _):
-    return _compute_client_factory(cli_ctx).disk_encryption_sets
-
-
 def cf_vm_cl(cli_ctx, *_):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
     from azure.mgmt.compute import ComputeManagementClient

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

@@ -91,75 +91,11 @@
     crafted: true
 """
 
-helps['disk-encryption-set create'] = """
-type: command
-short-summary: Create a disk encryption set.
-examples:
-  - name: Create a disk encryption set.
-    text: az disk-encryption-set create --resource-group MyResourceGroup --name MyDiskEncryptionSet --key-url MyKey --source-vault MyVault
-  - name: Create a disk encryption set with a system assigned identity.
-    text: az disk-encryption-set create --resource-group MyResourceGroup --name MyDiskEncryptionSet --key-url MyKey --source-vault MyVault --mi-system-assigned
-  - name: Create a disk encryption set with a user assigned identity.
-    text: az disk-encryption-set create --resource-group MyResourceGroup --name MyDiskEncryptionSet --key-url MyKey --source-vault MyVault --mi-user-assigned myAssignedId
-  - name: Create a disk encryption set with system assigned identity and a user assigned identity.
-    text: az disk-encryption-set create --resource-group MyResourceGroup --name MyDiskEncryptionSet --key-url MyKey --source-vault MyVault --mi-system-assigned --mi-user-assigned myAssignedId
-  - name: Create a disk encryption set with multi-tenant application client id to access key vault in a different tenant.
-    text: az disk-encryption-set create --resource-group MyResourceGroup --name MyDiskEncryptionSet --key-url MyKey --source-vault MyVault --federated-client-id myFederatedClientId
-  - name: Create a disk encryption set that supports double encryption.
-    text: az disk-encryption-set create --resource-group MyResourceGroup --name MyDiskEncryptionSet --key-url MyKey --source-vault MyVault --encryption-type EncryptionAtRestWithPlatformAndCustomerKeys
-"""
-
-helps['disk-encryption-set update'] = """
-type: command
-short-summary: Update a disk encryption set.
-examples:
-  - name: Update a disk encryption set. (autogenerated)
-    text: |
-        az disk-encryption-set update --name MyDiskEncryptionSet --resource-group MyResourceGroup --key-url MyKey --source-vault MyVault
-    crafted: true
-  - name: Update multi-tenant application client id of a disk encryption set.
-    text: |
-        az disk-encryption-set update --name MyDiskEncryptionSet --resource-group MyResourceGroup --key-url MyKey --source-vault MyVault --federated-client-id myFederatedClientId
-  - name: Clear multi-tenant application client id of a disk encryption set.
-    text: |
-        az disk-encryption-set update --name MyDiskEncryptionSet --resource-group MyResourceGroup --key-url MyKey --source-vault MyVault --federated-client-id None
-"""
-
 helps['disk-encryption-set identity'] = """
 type: group
 short-summary: Manage identities of a disk encryption set.
 """
 
-helps['disk-encryption-set identity assign'] = """
-type: command
-short-summary: Add managed identities to an existing disk encryption set.
-examples:
-  - name: Add a system assigned managed identity to an existing disk encryption set.
-    text: >
-        az disk-encryption-set identity assign --name MyDiskEncryptionSet --resource-group MyResourceGroup --system-assigned
-  - name: Add a user assigned managed identity to an existing disk encryption set.
-    text: >
-        az disk-encryption-set identity assign --name MyDiskEncryptionSet --resource-group MyResourceGroup --user-assigned MyAssignedId
-  - name: Add system assigned identity and a user assigned managed identity to an existing disk encryption set.
-    text: >
-        az disk-encryption-set identity assign --name MyDiskEncryptionSet --resource-group MyResourceGroup --system-assigned --user-assigned MyAssignedId
-"""
-
-helps['disk-encryption-set identity remove'] = """
-type: command
-short-summary: Remove managed identities from an existing disk encryption set.
-examples:
-  - name: Remove a system assigned managed identity from an existing disk encryption set.
-    text: >
-        az disk-encryption-set identity remove --name MyDiskEncryptionSet --resource-group MyResourceGroup --system-assigned
-  - name: Remove a user assigned managed identity from an existing disk encryption set.
-    text: >
-        az disk-encryption-set identity remove --name MyDiskEncryptionSet --resource-group MyResourceGroup --user-assigned MyAssignedId
-  - name: Remove all user assigned managed identities from an existing disk encryption set.
-    text: >
-        az disk-encryption-set identity remove --name MyDiskEncryptionSet --resource-group MyResourceGroup --user-assigned
-"""
-
 helps['disk-encryption-set identity show'] = """
 type: command
 short-summary: Display managed identities of a disk encryption set.

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

@@ -1486,21 +1486,7 @@ def load_arguments(self, _):
                    options_list=['--enable-auto-key-rotation', '--auto-rotation'],
                    help='Enable automatic rotation of keys.')
 
-    with self.argument_context('disk-encryption-set create', operation_group='disk_encryption_sets',
-                               min_api='2022-03-02') as c:
-        c.argument('federated_client_id', help='The federated client id used in cross tenant scenario.')
-        c.argument('mi_system_assigned', arg_group='Managed Identity', arg_type=get_three_state_flag(),
-                   help='Provide this flag to use system assigned identity. Check out help for more examples')
-        c.argument('mi_user_assigned', arg_group='Managed Identity', nargs='+',
-                   help='User Assigned Identity ids to be used for disk encryption set. '
-                        'Check out help for more examples')
-
-    with self.argument_context('disk-encryption-set update', operation_group='disk_encryption_sets',
-                               min_api='2022-03-02') as c:
-        c.argument('federated_client_id', help='The federated client id used in cross tenant scenario.')
-
-    with self.argument_context('disk-encryption-set identity', operation_group='disk_encryption_sets',
-                               min_api='2022-03-02') as c:
+    with self.argument_context('disk-encryption-set identity', operation_group='disk_encryption_sets') as c:
         c.argument('mi_system_assigned', options_list=['--system-assigned'],
                    arg_group='Managed Identity', arg_type=get_three_state_flag(),
                    help='Provide this flag to use system assigned identity for disk encryption set. '

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/disk_encryption_set/__init__.py

@@ -9,8 +9,10 @@
 # flake8: noqa
 
 from .__cmd_group import *
+from ._create import *
 from ._delete import *
 from ._list import *
 from ._list_associated_resources import *
 from ._show import *
+from ._update import *
 from ._wait import *