update from inhert aaz

Author: AllyW

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/log_analytics/cluster/_create.py

@@ -62,43 +62,46 @@ def _build_arguments_schema(cls, *args, **kwargs):
         # define Arg Group "Identity"
 
         _args_schema = cls._args_schema
-        _args_schema.mi_system_assigned = AAZStrArg(
-            options=["--system-assigned", "--mi-system-assigned"],
+        _args_schema.identity_type = AAZStrArg(
+            options=["--type", "--identity-type"],
             arg_group="Identity",
-            help="Set the system managed identity.",
-            blank="True",
+            help="Type of managed service identity.",
+            default="SystemAssigned",
+            enum={"None": "None", "SystemAssigned": "SystemAssigned", "SystemAssigned,UserAssigned": "SystemAssigned,UserAssigned", "UserAssigned": "UserAssigned"},
         )
-        _args_schema.mi_user_assigned = AAZListArg(
-            options=["--user-assigned", "--mi-user-assigned"],
+        _args_schema.user_assigned_identities = AAZDictArg(
+            options=["--user-assigned", "--user-assigned-identities"],
             arg_group="Identity",
-            help="Set the user managed identities.",
-            blank=[],
+            help="The list of user identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.",
         )
 
-        mi_user_assigned = cls._args_schema.mi_user_assigned
-        mi_user_assigned.Element = AAZStrArg()
+        user_assigned_identities = cls._args_schema.user_assigned_identities
+        user_assigned_identities.Element = AAZObjectArg(
+            nullable=True,
+            blank={},
+        )
 
-        # define Arg Group "KeyVaultProperties"
+        # define Arg Group "Key Properties"
 
         _args_schema = cls._args_schema
         _args_schema.key_name = AAZStrArg(
             options=["--key-name"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="The name of the key associated with the Log Analytics cluster.",
         )
         _args_schema.key_rsa_size = AAZIntArg(
             options=["--key-rsa-size"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="Selected key minimum required size.",
         )
         _args_schema.key_vault_uri = AAZStrArg(
             options=["--key-vault-uri"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="The Key Vault uri which holds they key associated with the Log Analytics cluster.",
         )
         _args_schema.key_version = AAZStrArg(
             options=["--key-version"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="The version of the key associated with the Log Analytics cluster.",
         )
 
@@ -131,16 +134,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The cluster's billing type.",
             enum={"Cluster": "Cluster", "Workspaces": "Workspaces"},
         )
-        _args_schema.is_availability_zones_enabled = AAZBoolArg(
-            options=["--is-zone-enabled", "--is-availability-zones-enabled"],
-            arg_group="Properties",
-            help="Sets whether the cluster will support availability zones. This can be set as true only in regions where Azure Data Explorer support Availability Zones. This Property can not be modified after cluster creation. Default value is 'true' if region supports Availability Zones.",
-        )
-        _args_schema.is_double_encryption_enabled = AAZBoolArg(
-            options=["--enable-d-encrypt", "--is-double-encryption-enabled"],
-            arg_group="Properties",
-            help="Configures whether cluster will use double encryption. This Property can not be modified after cluster creation. Default value is 'true'",
-        )
         _args_schema.replication = AAZObjectArg(
             options=["--replication"],
             arg_group="Properties",
@@ -167,13 +160,14 @@ def _build_arguments_schema(cls, *args, **kwargs):
         _args_schema.sku_capacity = AAZIntArg(
             options=["--sku-capacity"],
             arg_group="Sku",
-            help="The capacity reservation level in Gigabytes for this cluster.",
+            help="The capacity of the SKU. It can be decreased only after 31 days.",
             enum={"100": 100, "1000": 1000, "10000": 10000, "200": 200, "2000": 2000, "25000": 25000, "300": 300, "400": 400, "500": 500, "5000": 5000, "50000": 50000},
         )
         _args_schema.sku_name = AAZStrArg(
             options=["--sku-name"],
             arg_group="Sku",
-            help="The SKU (tier) of a cluster.",
+            help="The name of the SKU.",
+            default="CapacityReservation",
             enum={"CapacityReservation": "CapacityReservation"},
         )
         return cls._args_schema
@@ -292,18 +286,16 @@ def content(self):
 
             identity = _builder.get(".identity")
             if identity is not None:
-                identity.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "create"}})
-                identity.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "create"}})
+                identity.set_prop("type", AAZStrType, ".identity_type", typ_kwargs={"flags": {"required": True}})
+                identity.set_prop("userAssignedIdentities", AAZDictType, ".user_assigned_identities")
 
-            user_assigned = _builder.get(".identity.userAssigned")
-            if user_assigned is not None:
-                user_assigned.set_elements(AAZStrType, ".")
+            user_assigned_identities = _builder.get(".identity.userAssignedIdentities")
+            if user_assigned_identities is not None:
+                user_assigned_identities.set_elements(AAZObjectType, ".", typ_kwargs={"nullable": True})
 
             properties = _builder.get(".properties")
             if properties is not None:
                 properties.set_prop("billingType", AAZStrType, ".billing_type")
-                properties.set_prop("isAvailabilityZonesEnabled", AAZBoolType, ".is_availability_zones_enabled")
-                properties.set_prop("isDoubleEncryptionEnabled", AAZBoolType, ".is_double_encryption_enabled")
                 properties.set_prop("keyVaultProperties", AAZObjectType)
                 properties.set_prop("replication", AAZObjectType, ".replication")
 

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/log_analytics/cluster/_update.py

@@ -61,30 +61,50 @@ def _build_arguments_schema(cls, *args, **kwargs):
 
         # define Arg Group "Identity"
 
-        # define Arg Group "KeyVaultProperties"
+        _args_schema = cls._args_schema
+        _args_schema.identity_type = AAZStrArg(
+            options=["--type", "--identity-type"],
+            arg_group="Identity",
+            help="Type of managed service identity.",
+            enum={"None": "None", "SystemAssigned": "SystemAssigned", "SystemAssigned,UserAssigned": "SystemAssigned,UserAssigned", "UserAssigned": "UserAssigned"},
+        )
+        _args_schema.user_assigned_identities = AAZDictArg(
+            options=["--user-assigned", "--user-assigned-identities"],
+            arg_group="Identity",
+            help="The list of user identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.",
+            nullable=True,
+        )
+
+        user_assigned_identities = cls._args_schema.user_assigned_identities
+        user_assigned_identities.Element = AAZObjectArg(
+            nullable=True,
+            blank={},
+        )
+
+        # define Arg Group "Key Properties"
 
         _args_schema = cls._args_schema
         _args_schema.key_name = AAZStrArg(
             options=["--key-name"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="The name of the key associated with the Log Analytics cluster.",
             nullable=True,
         )
         _args_schema.key_rsa_size = AAZIntArg(
             options=["--key-rsa-size"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="Selected key minimum required size.",
             nullable=True,
         )
         _args_schema.key_vault_uri = AAZStrArg(
             options=["--key-vault-uri"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="The Key Vault uri which holds they key associated with the Log Analytics cluster.",
             nullable=True,
         )
         _args_schema.key_version = AAZStrArg(
             options=["--key-version"],
-            arg_group="KeyVaultProperties",
+            arg_group="Key Properties",
             help="The version of the key associated with the Log Analytics cluster.",
             nullable=True,
         )
@@ -114,12 +134,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             nullable=True,
             enum={"Cluster": "Cluster", "Workspaces": "Workspaces"},
         )
-        _args_schema.is_availability_zones_enabled = AAZBoolArg(
-            options=["--is-zone-enabled", "--is-availability-zones-enabled"],
-            arg_group="Properties",
-            help="Sets whether the cluster will support availability zones. This can be set as true only in regions where Azure Data Explorer support Availability Zones. This Property can not be modified after cluster creation. Default value is 'true' if region supports Availability Zones.",
-            nullable=True,
-        )
         _args_schema.replication = AAZObjectArg(
             options=["--replication"],
             arg_group="Properties",
@@ -145,17 +159,10 @@ def _build_arguments_schema(cls, *args, **kwargs):
         _args_schema.sku_capacity = AAZIntArg(
             options=["--sku-capacity"],
             arg_group="Sku",
-            help="The capacity reservation level in Gigabytes for this cluster.",
+            help="The capacity of the SKU. It can be decreased only after 31 days.",
             nullable=True,
             enum={"100": 100, "1000": 1000, "10000": 10000, "200": 200, "2000": 2000, "25000": 25000, "300": 300, "400": 400, "500": 500, "5000": 5000, "50000": 50000},
         )
-        _args_schema.sku_name = AAZStrArg(
-            options=["--sku-name"],
-            arg_group="Sku",
-            help="The SKU (tier) of a cluster.",
-            nullable=True,
-            enum={"CapacityReservation": "CapacityReservation"},
-        )
         return cls._args_schema
 
     def _execute_operations(self):
@@ -398,10 +405,18 @@ def _update_instance(self, instance):
             _builder.set_prop("sku", AAZObjectType)
             _builder.set_prop("tags", AAZDictType, ".tags")
 
+            identity = _builder.get(".identity")
+            if identity is not None:
+                identity.set_prop("type", AAZStrType, ".identity_type", typ_kwargs={"flags": {"required": True}})
+                identity.set_prop("userAssignedIdentities", AAZDictType, ".user_assigned_identities")
+
+            user_assigned_identities = _builder.get(".identity.userAssignedIdentities")
+            if user_assigned_identities is not None:
+                user_assigned_identities.set_elements(AAZObjectType, ".", typ_kwargs={"nullable": True})
+
             properties = _builder.get(".properties")
             if properties is not None:
                 properties.set_prop("billingType", AAZStrType, ".billing_type")
-                properties.set_prop("isAvailabilityZonesEnabled", AAZBoolType, ".is_availability_zones_enabled")
                 properties.set_prop("keyVaultProperties", AAZObjectType)
                 properties.set_prop("replication", AAZObjectType, ".replication")
 
@@ -420,7 +435,6 @@ def _update_instance(self, instance):
             sku = _builder.get(".sku")
             if sku is not None:
                 sku.set_prop("capacity", AAZIntType, ".sku_capacity")
-                sku.set_prop("name", AAZStrType, ".sku_name")
 
             tags = _builder.get(".tags")
             if tags is not None: