diff --git a/scripts/ci/aladdin/aladdin.py b/scripts/ci/aladdin/aladdin.py
index 838ea725b0a..29956470a47 100644
--- a/scripts/ci/aladdin/aladdin.py
+++ b/scripts/ci/aladdin/aladdin.py
@@ -134,6 +134,8 @@
 parameters:
   - name: --acr
     short-summary: The FQDN of the ACR.
+  - name: --node-name
+    short-summary: The name of a specific node to perform acr pull test checks. If not specified, it will be checked on a random node.
 examples:
   - name: Validate the ACR is accessible from the AKS cluster.
     text: az aks check-acr --name MyManagedCluster --resource-group MyResourceGroup --acr myacr.azurecr.io
@@ -169,12 +171,14 @@
     These addons are available:
         - http_application_routing : configure ingress with automatic public DNS name creation.
         - monitoring               : turn on Log Analytics monitoring. Requires "--workspace-resource-id".
+                                     Requires "--enable_msi_auth_for_monitoring" for managed identity auth.
                                      If monitoring addon is enabled --no-wait argument will have no effect
         - virtual-node             : enable AKS Virtual Node. Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
         - azure-policy             : enable Azure policy. The Azure Policy add-on for AKS enables at-scale enforcements and safeguards on your clusters in a centralized, consistent manner.
                                      Learn more at aka.ms/aks/policy.
         - ingress-appgw            : enable Application Gateway Ingress Controller addon.
         - open-service-mesh        : enable Open Service Mesh addon.
+        - azure-keyvault-secrets-provider : enable Azure Keyvault Secrets Provider addon.
 parameters:
   - name: --addons -a
     type: string
@@ -182,6 +186,9 @@
   - name: --workspace-resource-id
     type: string
     short-summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data.
+  - name: --enable-msi-auth-for-monitoring
+    type: bool
+    short-summary: Enable Managed Identity Auth for Monitoring addon.
   - name: --appgw-name
     type: string
     short-summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
@@ -200,12 +207,18 @@
   - name: --enable-sgxquotehelper
     type: bool
     short-summary: Enable SGX quote helper for confcom addon.
+  - name: --enable-secret-rotation
+    type: bool
+    short-summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+  - name: --rotation-poll-interval
+    type: string
+    short-summary: Set interval of rotation poll. Use with azure-keyvault-secrets-provider addon.
 examples:
   - name: Enable Kubernetes addons. (autogenerated)
     text: az aks enable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup --subnet MySubnetName
     crafted: true
   - name: Enable ingress-appgw addon with subnet prefix.
-    text: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-cidr 10.2.0.0/16 --appgw-name gateway
+    text: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-cidr 10.225.0.0/16 --appgw-name gateway
     crafted: true
   - name: Enable open-service-mesh addon.
     text: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons open-service-mesh
@@ -233,6 +246,9 @@
   - name: --public-fqdn
     type: bool
     short-summary: Get private cluster credential with server address to be public fqdn.
+  - name: --format
+    type: string
+    short-summary: Specify the format of the returned credential. Available values are ["exec", "azure"]. Only take effect when requesting clusterUser credential of AAD clusters.
 examples:
   - name: Get access credentials for a managed Kubernetes cluster. (autogenerated)
     text: az aks get-credentials --name MyManagedCluster --resource-group MyResourceGroup
@@ -324,40 +340,6 @@
     crafted: true
 """
 
-aladdin_helps['openshift delete'] = """
-type: command
-short-summary: Delete an Azure Red Hat OpenShift 3.11 cluster.
-long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
-examples:
-  - name: Delete an Azure Red Hat OpenShift 3.11 cluster.
-    text: az openshift delete --name MyManagedOpenShiftCluster --resource-group MyResourceGroup
-    crafted: true
-"""
-
-aladdin_helps['openshift scale'] = """
-type: command
-short-summary: Scale the compute pool in an Azure Red Hat OpenShift 3.11 cluster.
-long-summary: The az openshift command is deprecated and has been replaced by az aro for ARO 4 clusters. See http://aka.ms/aro/4 for information on switching to ARO 4.
-parameters:
-  - name: --compute-count -c
-    type: int
-    short-summary: Number of nodes in the OpenShift compute pool.
-examples:
-  - name: Scale the compute pool in an Azure Red Hat OpenShift 3.11 cluster.
-    text: az openshift scale --compute-count 5 --name MyManagedOpenShiftCluster --resource-group MyResourceGroup
-    crafted: true
-"""
-
-aladdin_helps['openshift show'] = """
-type: command
-short-summary: Show the details for an Azure Red Hat OpenShift 3.11 cluster.
-long-summary: Support for existing ARO 3.11 clusters ends June 2022. Please see aka.ms/aro/4 for information on switching to ARO 4.
-examples:
-  - name: Show the details for an Azure Red Hat OpenShift 3.11 cluster.
-    text: az openshift show --name MyManagedOpenShiftCluster --resource-group MyResourceGroup
-    crafted: true
-"""
-
 aladdin_helps['advisor configuration update'] = """
 type: command
 short-summary: Update Azure Advisor configuration.
@@ -378,6 +360,16 @@
 
 
 
+aladdin_helps['apim api schema wait'] = """
+type: command
+short-summary: Place the CLI in a waiting state until a condition of an apim api schema is met.
+examples:
+  - name: Place the CLI in a waiting state until a condition of a apim api schema is met.
+    text: |
+        az apim api schema wait --created --api-id MyApi --name MyApim --schema-id schemaId -g MyResourceGroup
+    crafted: true
+"""
+
 aladdin_helps['apim api wait'] = """
 type: command
 short-summary: Place the CLI in a waiting state until a condition of an apim api is met.
@@ -433,7 +425,7 @@
 short-summary: Get the app service plans for a resource group or a set of resource groups.
 examples:
   - name: Get the app service plans for a resource group or a set of resource groups. (autogenerated)
-    text: az appservice plan show --name MyAppServicePlan   --resource-group MyResourceGroup
+    text: az appservice plan show --name MyAppServicePlan --resource-group MyResourceGroup
     crafted: true
 """
 
@@ -746,7 +738,7 @@
 
 aladdin_helps['functionapp identity remove'] = """
 type: command
-short-summary: Disable web app's managed service identity
+short-summary: Disable web app's managed identity
 examples:
   - name: Disable web app's system managed identity
     text: az functionapp identity remove --name MyFunctionApp --resource-group MyResourceGroup
@@ -755,9 +747,9 @@
 
 aladdin_helps['functionapp identity show'] = """
 type: command
-short-summary: display web app's managed service identity
+short-summary: display web app's managed identity
 examples:
-  - name: display functionapp's managed service identity (autogenerated)
+  - name: display functionapp's managed identity (autogenerated)
     text: az functionapp identity show --name MyFunctionApp --resource-group MyResourceGroup
     crafted: true
 """
@@ -882,6 +874,24 @@
     crafted: true
 """
 
+aladdin_helps['staticwebapp identity remove'] = """
+type: command
+short-summary: Disable static web app's managed identity
+examples:
+  - name: Disable static web app's system managed identity
+    text: az staticwebapp identity remove --name MyApp --resource-group MyResourceGroup
+    crafted: true
+"""
+
+aladdin_helps['staticwebapp identity show'] = """
+type: command
+short-summary: display static web app's managed identity
+examples:
+  - name: display static web app's managed identity (autogenerated)
+    text: az staticwebapp identity show --name MyApp --resource-group MyResourceGroup
+    crafted: true
+"""
+
 aladdin_helps['webapp auth show'] = """
 type: command
 short-summary: Show the authentification settings for the webapp.
@@ -1254,18 +1264,18 @@
 
 aladdin_helps['webapp identity remove'] = """
 type: command
-short-summary: Disable web app's managed service identity
+short-summary: Disable web app's managed identity
 examples:
-  - name: Disable web app's system managed service identity
+  - name: Disable web app's system managed identity
     text: az webapp identity remove --name MyWebApp --resource-group MyResourceGroup
     crafted: true
 """
 
 aladdin_helps['webapp identity show'] = """
 type: command
-short-summary: display web app's managed service identity
+short-summary: display web app's managed identity
 examples:
-  - name: display webapp's managed service identity (autogenerated)
+  - name: display webapp's managed identity (autogenerated)
     text: az webapp identity show --name MyWebapp --resource-group MyResourceGroup
     crafted: true
 """
@@ -1578,7 +1588,7 @@
 short-summary: Find out whether the virtual machine is protected or not. If protected, it returns the recovery services vault ID, otherwise it returns empty.
 examples:
   - name: Find out whether the virtual machine is protected or not. If protected, it returns the recovery services vault ID, otherwise it returns empty. (autogenerated)
-    text: az backup protection check-vm --vm-id {vm-id}
+    text: az backup protection check-vm --resource-group MyResourceGroup --vm myVM
     crafted: true
 """
 
@@ -2074,8 +2084,8 @@
 type: command
 short-summary: Changes the failover priority for the Azure Cosmos DB database account.
 examples:
-  - name: Changes the failover priority for the Azure Cosmos DB database account. (autogenerated)
-    text: az cosmosdb failover-priority-change --failover-policies regionName=failoverPriority --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
+  - name: Changes the failover priority for the Azure Cosmos DB database account.
+    text: az cosmosdb failover-priority-change --failover-policies southafricanorth=0 westus=8 northeurope=3 --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
     crafted: true
 """
 
@@ -2722,9 +2732,11 @@
 
 
 
+
+
 aladdin_helps['iot dps certificate show'] = """
 type: command
-short-summary: Show information about a particular Azure IoT Hub Device Provisioning Service certificate.
+short-summary: Show information about a particular certificate in an Azure IoT Hub Device Provisioning Service instance.
 examples:
   - name: Show information about a particular Azure IoT Hub Device Provisioning Service certificate. (autogenerated)
     text: az iot dps certificate show --certificate-name MyCertificate --dps-name MyDps --resource-group MyResourceGroup --subscription MySubscription
@@ -3138,6 +3150,9 @@
         Azure Function:
             Format:     --action azurefunction NAME FUNCTION_APP_RESOURCE_ID FUNCTION_NAME HTTP_TRIGGER_URL [usecommonalertschema]
             Example:    --action azurefunction test_function test_rsrc test_func http://trigger usecommonalertschema
+        Event Hub:
+            Format:     --action eventhub NAME SUBSCRIPTION_ID EVENT_HUB_NAME_SPACE EVENT_HUB_NAME [usecommonalertschema]
+            Example:    --action eventhub test_eventhub 5def922a-3ed4-49c1-b9fd-05ec533819a3 eventhubNameSpace testEventHubName usecommonalertschema
         Multiple actions can be specified by using more than one `--add-action` argument.
         'useaadauth', 'isglobalrunbook' and 'usecommonalertschema' are optional arguements that only need to be passed to set the respective parameter to True.
         If the 'useaadauth' argument is passed, then the OBJECT_ID and IDENTIFIER_URI values are required as well.
@@ -3200,6 +3215,9 @@
         Azure Function:
             Format:     --add-action azurefunction NAME FUNCTION_APP_RESOURCE_ID FUNCTION_NAME HTTP_TRIGGER_URL [usecommonalertschema]
             Example:    --add-action azurefunction test_function test_rsrc test_func http://trigger usecommonalertschema
+        Event Hub:
+            Format:     --action eventhub NAME SUBSCRIPTION_ID EVENT_HUB_NAME_SPACE EVENT_HUB_NAME [usecommonalertschema]
+            Example:    --action eventhub test_eventhub 5def922a-3ed4-49c1-b9fd-05ec533819a3 eventhubNameSpace testEventHubName usecommonalertschema
         Multiple actions can be specified by using more than one `--add-action` argument.
         'useaadauth', 'isglobalrunbook' and 'usecommonalertschema' are optional arguements that only need to be passed to set the respective parameter to True.
         If the 'useaadauth' argument is passed, then the OBJECT_ID and IDENTIFIER_URI values are required as well.
@@ -3251,102 +3269,6 @@
     crafted: true
 """
 
-aladdin_helps['monitor alert delete'] = """
-type: command
-short-summary: Delete an alert rule.
-examples:
-  - name: Delete an alert rule. (autogenerated)
-    text: |
-        az monitor alert delete --name MyAlertRule --resource-group MyResourceGroup
-    crafted: true
-"""
-
-aladdin_helps['monitor alert list'] = """
-type: command
-short-summary: List alert rules in a resource group.
-examples:
-  - name: List alert rules in a resource group. (autogenerated)
-    text: |
-        az monitor alert list --resource-group MyResourceGroup
-    crafted: true
-"""
-
-aladdin_helps['monitor alert list-incidents'] = """
-type: command
-short-summary: List all incidents for an alert rule.
-examples:
-  - name: List all incidents for an alert rule. (autogenerated)
-    text: |
-        az monitor alert list-incidents --resource-group MyResourceGroup --rule-name MyRule
-    crafted: true
-"""
-
-aladdin_helps['monitor alert show'] = """
-type: command
-short-summary: Show an alert rule.
-examples:
-  - name: Show an alert rule. (autogenerated)
-    text: |
-        az monitor alert show --name MyAlertRule --resource-group MyResourceGroup
-    crafted: true
-"""
-
-aladdin_helps['monitor alert update'] = """
-type: command
-short-summary: Update a classic metric-based alert rule.
-parameters:
-  - name: --description
-    short-summary: Description of the rule.
-  - name: --condition
-    short-summary: The condition which triggers the rule.
-    long-summary: >
-        The form of a condition is "METRIC {>,>=,<,<=} THRESHOLD {avg,min,max,total,last} PERIOD".
-        Values for METRIC and appropriate THRESHOLD values can be obtained from `az monitor metric` commands,
-        and PERIOD is of the form "##h##m##s".
-  - name: --add-action -a
-    short-summary: Add an action to fire when the alert is triggered.
-    long-summary: |
-        Usage:   --add-action TYPE KEY [ARG ...]
-        Email:   --add-action email bob@contoso.com ann@contoso.com
-        Webhook: --add-action webhook https://www.contoso.com/alert apiKey=value
-        Webhook: --add-action webhook https://www.contoso.com/alert?apiKey=value
-        Multiple actions can be specified by using more than one `--add-action` argument.
-  - name: --remove-action -r
-    short-summary: Remove one or more actions.
-    long-summary: |
-        Usage:   --remove-action TYPE KEY [KEY ...]
-        Email:   --remove-action email bob@contoso.com ann@contoso.com
-        Webhook: --remove-action webhook https://contoso.com/alert https://alerts.contoso.com
-  - name: --email-service-owners
-    short-summary: Email the service owners if an alert is triggered.
-  - name: --metric
-    short-summary: Name of the metric to base the rule on.
-    populator-commands:
-      - az monitor metrics list-definitions
-  - name: --operator
-    short-summary: How to compare the metric against the threshold.
-  - name: --threshold
-    short-summary: Numeric threshold at which to trigger the alert.
-  - name: --aggregation
-    short-summary: Type of aggregation to apply based on --period.
-  - name: --period
-    short-summary: >
-        Time span over which to apply --aggregation, in nDnHnMnS shorthand or full ISO8601 format.
-examples:
-  - name: Update a classic metric-based alert rule. (autogenerated)
-    text: |
-        az monitor alert update --email-service-owners true --name MyAlertRule --resource-group MyResourceGroup
-    crafted: true
-  - name: Update a classic metric-based alert rule. (autogenerated)
-    text: |
-        az monitor alert update --name MyAlertRule --remove-action email bob@contoso.com --resource-group MyResourceGroup
-    crafted: true
-  - name: Update a classic metric-based alert rule. (autogenerated)
-    text: |
-        az monitor alert update --name MyAlertRule --resource-group MyResourceGroup --set retentionPolicy.days=365
-    crafted: true
-"""
-
 aladdin_helps['monitor autoscale create'] = """
 type: command
 short-summary: Create new autoscale settings.
@@ -3471,16 +3393,6 @@
     crafted: true
 """
 
-aladdin_helps['monitor autoscale-settings update'] = """
-type: command
-short-summary: Updates an autoscale setting.
-examples:
-  - name: Updates an autoscale setting. (autogenerated)
-    text: |
-        az monitor autoscale-settings update --name MyAutoscaleSetting --resource-group MyResourceGroup --set retentionPolicy.days=365
-    crafted: true
-"""
-
 aladdin_helps['monitor diagnostic-settings update'] = """
 type: command
 short-summary: Update diagnostic settings.
@@ -3957,6 +3869,16 @@
     crafted: true
 """
 
+aladdin_helps['network application-gateway routing-rule update'] = """
+type: command
+short-summary: Update a rule.
+examples:
+  - name: Update a rule.
+    text: |
+        az network application-gateway routing-rule update --address-pool MyAddressPool --gateway-name MyAppGateway --name MyRule --resource-group MyResourceGroup
+    crafted: true
+"""
+
 aladdin_helps['network application-gateway rule update'] = """
 type: command
 short-summary: Update a rule.
@@ -3967,13 +3889,37 @@
     crafted: true
 """
 
+aladdin_helps['network application-gateway settings create'] = """
+type: command
+short-summary: Create settings.
+examples:
+  - name: Create settings. (autogenerated)
+    text: |
+        az network application-gateway settings create --gateway-name MyAppGateway --host-name MyHost --name MySettings         --port 80 --probe MyNewProbe --protocol Tcp --resource-group MyResourceGroup
+    crafted: true
+"""
+
+aladdin_helps['network application-gateway settings update'] = """
+type: command
+short-summary: Update settings.
+examples:
+  - name: Update settings.
+    text: |
+        az network application-gateway settings update --gateway-name MyAppGateway --name MySettings --probe MyNewProbe --resource-group MyResourceGroup
+    crafted: true
+  - name: Update settings to use a new port.
+    text: |
+        az network application-gateway settings update --gateway-name MyAppGateway --backend-pool-host-name true --name MySettings --port 80 --probe MyNewProbe --resource-group MyResourceGroup
+    crafted: true
+"""
+
 aladdin_helps['network application-gateway update'] = """
 type: command
 short-summary: Update an application gateway.
 examples:
   - name: Update an application gateway. (autogenerated)
     text: |
-        az network application-gateway update --name MyApplicationGateway --resource-group MyResourceGroup --set useRemoteGateways=true
+        az network application-gateway update --name MyApplicationGateway --resource-group MyResourceGroup --set sku.tier=WAF_v2
     crafted: true
 """
 
@@ -4171,7 +4117,7 @@
 type: command
 short-summary: Show a Azure bastion host machine.
 examples:
-  - name: Show a Azure bastion host machine. (autogenerated)
+  - name: Show a Azure bastion host machine.
     text: |
         az network bastion show --name MyBastionHost --resource-group MyResourceGroup
     crafted: true
@@ -5687,6 +5633,9 @@
 type: command
 short-summary: Append or overwrite an application's password or certificate credentials
 long-summary: >-
+    By default, this command clears all passwords and keys, and let graph service generate a password credential.
+
+
     The output includes credentials that you must protect. Be sure that you do not include these credentials
     in your code or check the credentials into your source control. As an alternative, consider using
     [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
@@ -5726,22 +5675,13 @@
 aladdin_helps['ad app permission admin-consent'] = """
 type: command
 short-summary: Grant Application & Delegated permissions through admin-consent.
-long-summary: You must login as a directory administrator
+long-summary: You must login as a global administrator
 examples:
   - name: Grant Application & Delegated permissions through admin-consent. (autogenerated)
     text: az ad app permission admin-consent --id 00000000-0000-0000-0000-000000000000
     crafted: true
 """
 
-aladdin_helps['ad app show'] = """
-type: command
-short-summary: Get the details of an application.
-examples:
-  - name: Get the details of an application. (autogenerated)
-    text: az ad app show --id 00000000-0000-0000-0000-000000000000
-    crafted: true
-"""
-
 aladdin_helps['ad group create'] = """
 type: command
 short-summary: Create a group in the directory.
@@ -5825,11 +5765,6 @@
     in your code or check the credentials into your source control. As an alternative, consider using
     [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
 parameters:
-  - name: --name -n
-    short-summary: Name or app ID of the service principal.
-  - name: --password -p
-    short-summary: The password used to log in.
-    long-summary: If not present and `--cert` is not specified, a random password will be generated.
   - name: --cert
     short-summary: Certificate to use for credentials.
     long-summary: When using `--keyvault,` indicates the name of the cert to use or create. Otherwise, supply a PEM or DER formatted public certificate string. Use `@{path}` to load from a file. Do not include private key info.
@@ -5842,7 +5777,7 @@
     short-summary: 'Number of years for which the credentials will be valid. Default: 1 year'
 examples:
   - name: Reset a service principal credential. (autogenerated)
-    text: az ad sp credential reset --name MyAppURIForCredential
+    text: az ad sp credential reset --id MyAppURIForCredential
     crafted: true
 """
 
@@ -5864,15 +5799,6 @@
     crafted: true
 """
 
-aladdin_helps['ad sp show'] = """
-type: command
-short-summary: Get the details of a service principal.
-examples:
-  - name: Get the details of a service principal. (autogenerated)
-    text: az ad sp show --id 00000000-0000-0000-0000-000000000000
-    crafted: true
-"""
-
 aladdin_helps['ad sp update'] = """
 type: command
 short-summary: Update a service principal
@@ -5882,24 +5808,6 @@
     crafted: true
 """
 
-aladdin_helps['ad user get-member-groups'] = """
-type: command
-short-summary: Get groups of which the user is a member
-examples:
-  - name: Get groups of which the user is a member (autogenerated)
-    text: az ad user get-member-groups --upn-or-object-id myuser@contoso.com
-    crafted: true
-"""
-
-aladdin_helps['ad user update'] = """
-type: command
-short-summary: Update Azure Active Directory users.
-examples:
-  - name: Update Azure Active Directory users. (autogenerated)
-    text: az ad user update --id 00000000-0000-0000-0000-000000000000
-    crafted: true
-"""
-
 aladdin_helps['mariadb server configuration list'] = """
 type: command
 short-summary: List the configuration values for a server.
@@ -5975,39 +5883,12 @@
     crafted: true
 """
 
-aladdin_helps['mysql flexible-server firewall-rule delete'] = """
-type: command
-short-summary: Delete a firewall rule.
-examples:
-  - name: Delete a firewall rule.
-    text: az mysql flexible-server firewall-rule delete --rule-name testRule --resource-group testGroup --name testServer
-    crafted: true
-"""
-
 aladdin_helps['mysql flexible-server firewall-rule show'] = """
 type: command
 short-summary: Get the details of a firewall rule.
 examples:
   - name: Get the details of a firewall rule.
-    text: az mysql flexible-server firewall-rule show --rule-name testRule --resource-group testGroup --name testServer
-    crafted: true
-"""
-
-aladdin_helps['mysql flexible-server parameter list'] = """
-type: command
-short-summary: List the parameter values for a flexible server.
-examples:
-  - name: List the parameter values for a flexible server.
-    text: az mysql flexible-server parameter list --resource-group testGroup --server-name servername
-    crafted: true
-"""
-
-aladdin_helps['mysql flexible-server parameter show'] = """
-type: command
-short-summary: Get the parameter for a flexible server."
-examples:
-  - name: Get the parameter for a server.W
-    text: az mysql flexible-server parameter show --name parameterName
+    text: az mysql flexible-server firewall-rule show --rule-name testRule --resource-group testGroup --name testserver
     crafted: true
 """
 
@@ -6016,7 +5897,7 @@
 short-summary: Restart a flexible server.
 examples:
   - name: Restart a flexible server.
-    text: az mysql flexible-server restart --resource-group testGroup --name testServer
+    text: az mysql flexible-server restart --resource-group testGroup --name testserver
     crafted: true
 """
 
@@ -6025,7 +5906,7 @@
 short-summary: Get the details of a flexible server.
 examples:
   - name: Get the details of a flexible server
-    text: az mysql flexible-server show --resource-group testGroup --name testServer
+    text: az mysql flexible-server show --resource-group testGroup --name testserver
     crafted: true
 """
 
@@ -6034,7 +5915,7 @@
 short-summary: Start a flexible server.
 examples:
   - name: Start a flexible server.
-    text: az mysql flexible-server start --resource-group testGroup --name testServer
+    text: az mysql flexible-server start --resource-group testGroup --name testserver
     crafted: true
 """
 
@@ -6043,7 +5924,7 @@
 short-summary: Stop a flexible server.
 examples:
   - name: Stop a flexible server.
-    text: az mysql flexible-server stop --resource-group testGroup --name testServer
+    text: az mysql flexible-server stop --resource-group testGroup --name testserver
     crafted: true
 """
 
@@ -6052,7 +5933,7 @@
 short-summary: Update a flexible server.
 examples:
   - name: Update a flexible server's tags.
-    text: az mysql flexible-server update --resource-group testGroup --name testServer --tags "k1=v1" "k2=v2"
+    text: az mysql flexible-server update --resource-group testGroup --name testserver --tags "k1=v1" "k2=v2"
     crafted: true
 """
 
@@ -6061,7 +5942,7 @@
 short-summary: Wait for the flexible server to satisfy certain conditions.
 examples:
   - name: Wait for the flexible server to satisfy certain conditions.
-    text: az mysql flexible-server wait --exists --resource-group testGroup --name testServer
+    text: az mysql flexible-server wait --exists --resource-group testGroup --name testserver
     crafted: true
 """
 
@@ -6164,87 +6045,6 @@
     crafted: true
 """
 
-aladdin_helps['postgres flexible-server firewall-rule delete'] = """
-type: command
-short-summary: Delete a firewall rule.
-examples:
-  - name: Delete a firewall rule.
-    text: az postgres flexible-server firewall-rule delete --rule-name testRule --resource-group testGroup --name testServer
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server firewall-rule show'] = """
-type: command
-short-summary: Get the details of a firewall rule.
-examples:
-  - name: Get the details of a firewall rule.
-    text: az postgres flexible-server firewall-rule show --rule-name testRule --resource-group testGroup --name testServer
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server parameter list'] = """
-type: command
-short-summary: List the parameter values for a flexible server.
-examples:
-  - name: List the parameter values for a flexible server.
-    text: az postgres flexible-server parameter list --resource-group testGroup --server-name servername
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server parameter show'] = """
-type: command
-short-summary: Get the parameter for a flexible server."
-examples:
-  - name: Get the parameter for a server.W
-    text: az postgres flexible-server parameter show --name parameterName
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server restart'] = """
-type: command
-short-summary: Restart a flexible server.
-examples:
-  - name: Restart a flexible server.
-    text: az postgres flexible-server restart --resource-group testGroup --name testServer
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server show'] = """
-type: command
-short-summary: Get the details of a flexible server.
-examples:
-  - name: Get the details of a flexible server
-    text: az postgres flexible-server show --resource-group testGroup --name testServer
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server start'] = """
-type: command
-short-summary: Start a flexible server.
-examples:
-  - name: Start a flexible server.
-    text: az postgres flexible-server start --resource-group testGroup --name testServer
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server stop'] = """
-type: command
-short-summary: Stop a flexible server.
-examples:
-  - name: Stop a flexible server.
-    text: az postgres flexible-server stop --resource-group testGroup --name testServer
-    crafted: true
-"""
-
-aladdin_helps['postgres flexible-server update'] = """
-type: command
-short-summary: Update a flexible server.
-examples:
-  - name: Reset password
-    text: az postgres flexible-server update --resource-group testGroup --name testServer -p password123
-    crafted: true
-"""
-
 aladdin_helps['postgres server configuration list'] = """
 type: command
 short-summary: List the configuration values for a server.
@@ -6340,10 +6140,87 @@
 aladdin_helps['redis create'] = """
 type: command
 short-summary: Create new Redis Cache instance.
+parameters:
+  - name: --redis-configuration
+    short-summary: A json file used to set redis-configuration settings. You may encounter parse errors if the json file is invalid.
+    long-summary: |
+        Usage: --redis-configuration @"{config_file.json}"
+
+        An example json file for configuring max-memory policies
+        [
+          {
+            "maxmemory-policy": "allkeys-lru"
+          }
+        ]
+
+        An example json file for enabling the RDB back up data persistence is
+        [
+          {
+            "rdb-storage-connection-string": "DefaultEndpointsProtocol=https;AccountName=mystorageaccount;AccountKey=myAccountKey;EndpointSuffix=core.windows.net",
+            "rdb-backup-enabled": "true",
+            "rdb-backup-frequency": "15",
+            "rdb-backup-max-snapshot-count": "1"
+          }
+        ]
+
+        An example json file for enabling the AOF back up data persistence is
+        [
+          {
+            "aof-backup-enabled": "true",
+            "aof-storage-connection-string-0": "DefaultEndpointsProtocol=https;AccountName=mystorageaccount;AccountKey=myAccountKey;EndpointSuffix=core.windows.net",
+            "aof-storage-connection-string-1": "DefaultEndpointsProtocol=https;AccountName=mystorageaccount;AccountKey=myAccountKey;EndpointSuffix=core.windows.net"
+          }
+        ]
 examples:
   - name: Create new Redis Cache instance. (autogenerated)
     text: az redis create --location westus2 --name MyRedisCache --resource-group MyResourceGroup --sku Basic --vm-size c0
     crafted: true
+  - name: Configure the multiple zones for new Premium Azure Cache for Redis
+    text: az redis create --location westus2 --name MyRedisCache --resource-group MyResourceGroup --sku Premium --vm-size p1 --zones 1 2
+    crafted: true
+  - name: Configure the memory policies for the cache.
+    text: az redis create --resource-group resourceGroupName --name cacheName --location westus2 --sku Standard --vm-size c0 --redis-configuration @"config_max-memory.json"
+    crafted: true
+  - name: Configure and enable the RDB back up data persistence for new Premium Azure Cache for Redis.
+    text: az redis create --location westus2 --name MyRedisCache --resource-group MyResourceGroup --sku Premium --vm-size p1 --redis-configuration @"config_rdb.json"
+    crafted: true
+  - name: Configure and enable the AOF back up data persistence for new Premium Azure Cache for Redis
+    text: az redis create --location westus2 --name MyRedisCache --resource-group MyResourceGroup --sku Premium --vm-size p1 --redis-configuration @"config_aof.json"
+    crafted: true
+  - name: Create a Premium Azure Cache for Redis with clustering enabled
+    text: az redis create --location westus2 --name MyRedisCache --resource-group MyResourceGroup --sku Premium --vm-size p1 --shard-count 2
+    crafted: true
+  - name: Deploying a Premium Azure Cache for Redis inside an existing Azure Virtual Network
+    text: az redis create --location westus2 --name MyRedisCache --resource-group MyResourceGroup --sku Premium --vm-size p1 --subnet-id "/subscriptions/{subid}/resourceGroups/{resourceGroupName}/providers/Microsoft.{Network|ClassicNetwork}/virtualNetworks/vnet1/subnets/subnet1"
+    crafted: true
+"""
+
+aladdin_helps['redis update'] = """
+type: command
+short-summary: Update a Redis cache.
+long-summary: Scale or update settings of a Redis cache.
+examples:
+  - name: Update the maxmemory-policy for your Azure Cache for Redis named MyRedisCache
+    text: az redis update --name MyRedisCache --resource-group MyResourceGroup --set "redisConfiguration.maxmemory-policy"="allkeys-lru"
+    crafted: true
+  - name: Disable the RDB back up data persistence for Premium Azure Cache for Redis
+    text: az redis update --name MyRedisCache --resource-group MyResourceGroup --set "redisConfiguration.rdb-backup-enabled"="false"
+    crafted: true
+  - name: Configure the RDB back up enabled data persistence for already created Premium Azure Cache for Redis
+    text: az redis update --name MyRedisCache --resource-group MyResourceGroup --set "redisConfiguration.rdb-storage-connection-string"="DefaultEndpointsProtocol=https;AccountName=mystorageaccount;AccountKey=myAccountKey;EndpointSuffix=core.windows.net" "redisConfiguration.rdb-backup-enabled"="true" "redisConfiguration.rdb-backup-frequency"="15" "redisConfiguration.rdb-backup-max-snapshot-count"="1"
+    crafted: true
+  - name: Scale an Azure Cache for Redis Instance - Update to different size (An example to scale from c0 to c1).
+    text: az redis update --name MyRedisCache --resource-group MyResourceGroup --set "sku.capacity"="2"
+    crafted: true
+  - name: Scale an Azure Cache for Redis Instance - Update to different tier (From Basic to Standard or Standard to Premium).
+    text: az redis update --name MyRedisCache --resource-group MyResourceGroup --set "sku.name"="Premium" "sku.capacity"="1" "sku.family"="P"
+    crafted: true
+  - name: Scale an Azure Cache for Redis Instance - Enable Clustering.
+    text: az redis update --name MyRedisCache --resource-group MyResourceGroup --set "shardCount"="1"
+    crafted: true
+  - name: Scale an Azure Cache for Redis Instance in/out using Redis Cluster.
+    text: az redis update --name MyRedisCache --resource-group MyResourceGroup --set "shardCount"="2"
+    crafted: true
 """
 
 aladdin_helps['relay hyco authorization-rule keys list'] = """
@@ -6369,6 +6246,7 @@
 aladdin_helps['deployment group validate'] = """
 type: command
 short-summary: Validate whether a template is valid at resource group.
+long-summary: Please specify only one of --template-file FILE | --template-uri URI | --template-spec to input the ARM template.
 parameters:
   - name: --parameters -p
     short-summary: Supply deployment parameter values.
@@ -6407,6 +6285,7 @@
 aladdin_helps['deployment mg validate'] = """
 type: command
 short-summary: Validate whether a template is valid at management group.
+long-summary: Please specify only one of --template-file FILE | --template-uri URI | --template-spec to input the ARM template.
 parameters:
   - name: --parameters -p
     short-summary: Supply deployment parameter values.
@@ -6465,6 +6344,7 @@
 aladdin_helps['deployment sub validate'] = """
 type: command
 short-summary: Validate whether a template is valid at subscription scope.
+long-summary: Please specify only one of --template-file FILE | --template-uri URI | --template-spec to input the ARM template.
 parameters:
   - name: --parameters -p
     short-summary: Supply deployment parameter values.
@@ -6501,6 +6381,7 @@
 aladdin_helps['deployment tenant validate'] = """
 type: command
 short-summary: Validate whether a template is valid at tenant scope.
+long-summary: Please specify only one of --template-file FILE | --template-uri URI | --template-spec to input the ARM template.
 parameters:
   - name: --parameters -p
     short-summary: Supply deployment parameter values.
@@ -6753,9 +6634,9 @@
 type: command
 short-summary: Show a policy set definition.
 examples:
-  - name: Show a policy set definition. (autogenerated)
+  - name: Show a policy set definition. If the policy set is scoped to a management group, then you must include the `--management-group` parameter and value.
     text: |
-        az policy set-definition show --name MyPolicySetDefinition
+        az policy set-definition show --name MyPolicySetDefinition --management-group MyManagementGroup
     crafted: true
 """
 
@@ -6939,6 +6820,8 @@
 
 
 
+
+
 aladdin_helps['sql db delete'] = """
 type: command
 short-summary: Delete a database.
@@ -6950,9 +6833,9 @@
 
 aladdin_helps['sql db list'] = """
 type: command
-short-summary: List databases a server or elastic pool.
+short-summary: List databases on a server or elastic pool.
 examples:
-  - name: List databases a server or elastic pool. (autogenerated)
+  - name: List databases on a server or elastic pool. (autogenerated)
     text: az sql db list --resource-group MyResourceGroup --server myserver
     crafted: true
 """
@@ -7364,16 +7247,14 @@
 aladdin_helps['storage blob upload'] = """
 type: command
 short-summary: Upload a file to a storage blob.
-long-summary: Creates a new blob from a file path, or updates the content of an existing blob with automatic chunking and progress notifications.
+long-summary: Create a new blob from a file path, or updates the content of an existing blob with automatic chunking and progress notifications.
 parameters:
   - name: --type -t
-    short-summary: Defaults to 'page' for *.vhd files, or 'block' otherwise.
+    short-summary: Default to 'page' for *.vhd files, or 'block' otherwise.
   - name: --maxsize-condition
     short-summary: The max length in bytes permitted for an append blob.
   - name: --validate-content
-    short-summary: Specifies that an MD5 hash shall be calculated for each chunk of the blob and verified by the service when the chunk has arrived.
-  - name: --tier
-    short-summary: A page blob tier value to set the blob to. The tier correlates to the size of the blob and number of allowed IOPS. This is only applicable to page blobs on premium storage accounts.
+    short-summary: Specify that an MD5 hash shall be calculated for each chunk of the blob and verified by the service when the chunk has arrived.
 examples:
   - name: Upload a file to a storage blob. (autogenerated)
     text: |
@@ -7397,7 +7278,7 @@
 
 aladdin_helps['storage container delete'] = """
 type: command
-short-summary: Marks the specified container for deletion.
+short-summary: Mark the specified container for deletion.
 long-summary: >
     The container and any blobs contained within it are later deleted during garbage collection.
 examples:
@@ -7505,8 +7386,6 @@
   - name: --if-exists
     type: string
     short-summary: Behavior when an entity already exists for the specified PartitionKey and RowKey.
-  - name: --timeout
-    short-summary: The server timeout, expressed in seconds.
 examples:
   - name: Insert an entity into a table. (autogenerated)
     text: |
@@ -7801,6 +7680,7 @@
 
 aladdin_helps['storage share generate-sas'] = """
 type: command
+short-summary: Generate a shared access signature for the share.
 examples:
   - name: Generate a shared access signature for the share. (autogenerated)
     text: |
@@ -8045,7 +7925,7 @@
 
 aladdin_helps['vm deallocate'] = """
 type: command
-short-summary: Deallocate a VM.
+short-summary: Deallocate a VM so that computing resources are no longer allocated (charged no longer apply). The status will change from 'Stopped' to 'Stopped (Deallocated)'.
 long-summary: 'For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/linux/capture-image'
 examples:
   - name: Deallocate a VM. (autogenerated)
@@ -8056,12 +7936,16 @@
 
 aladdin_helps['vm disk attach'] = """
 type: command
-short-summary: Attach a managed persistent disk to a VM. Please note that --ids only supports one disk.
+short-summary: Attach a managed persistent disk to a VM.
 long-summary: This allows for the preservation of data, even if the VM is reprovisioned due to maintenance or resizing.
 examples:
   - name: Attach a managed persistent disk to a VM. (autogenerated)
     text: |
-        az vm disk attach --disk $diskId --new --resource-group MyResourceGroup --size-gb 128 --sku Standard_LRS --vm-name MyVm
+        az vm disk attach --name $diskId --new --resource-group MyResourceGroup --size-gb 128 --sku Standard_LRS --vm-name MyVm
+    crafted: true
+  - name: Attach multiple managed disks to a VM.
+    text: |
+        az vm disk attach --vm-name MyVm --resource-group MyResourceGroup --sku Standard_LRS --disks diskId1 diskId2 diskId3
     crafted: true
 """
 
@@ -8237,21 +8121,6 @@
     crafted: true
 """
 
-aladdin_helps['vm run-command show'] = """
-type: command
-parameters:
-  - name: --command-id
-    type: string
-    short-summary: The command id
-    populator-commands:
-      - az vm run-command list
-examples:
-  - name: vm run-command show (autogenerated)
-    text: |
-        az vm run-command show --command-id RunShellScript --location westus2
-    crafted: true
-"""
-
 aladdin_helps['vm secret add'] = """
 type: command
 short-summary: Add a secret to a VM.
@@ -8486,21 +8355,6 @@
     crafted: true
 """
 
-aladdin_helps['vmss run-command show'] = """
-type: command
-parameters:
-  - name: --command-id
-    type: string
-    short-summary: The command id
-    populator-commands:
-      - az vmss run-command list
-examples:
-  - name: Gets specific run command for a subscription in a location. (autogenerated)
-    text: |
-        az vmss run-command show --command-id RunShellScript --location westus2 --subscription mysubscription
-    crafted: true
-"""
-
 aladdin_helps['vmss scale'] = """
 type: command
 short-summary: Change the number of VMs within a VMSS.