Help/Param string updates

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

@@ -402,7 +402,7 @@
   - name: Create an IoT Hub with the standard pricing tier S1 and 4 partitions, in the 'westus' region, with tags.
     text: >
         az iot hub create --resource-group MyResourceGroup --name MyIotHub --location westus --tags a=b c=d
-  - name: Create an IoT Hub with a system-assigned identity, and assign a role and scope to a storage account for the created system identity.
+  - name: Create an IoT Hub with a system-assigned managed identity, and assign a role and scope to a storage account for the created identity.
     text: >
         az iot hub create --resource-group MyResourceGroup --name MyIotHub --location westus --assign-identity [system] --role "Storage Blob Data Contributor" --scopes {resourceId}
 """
@@ -438,12 +438,12 @@
 
 helps['iot hub identity assign'] = """
 type: command
-short-summary: Assign identities to an IoT Hub
+short-summary: Assign managed identities to an IoT Hub
 examples:
-  - name: Assign a user-assigned identity to an IoT Hub
+  - name: Assign a user-assigned managed identity to an IoT Hub
     text: >
         az iot hub identity assign --name MyIoTHub --resource-group MyResourceGroup --identities {resourceId}
-  - name: Assign a system-assigned identity to an IoT Hub and assign a role to that identity.
+  - name: Assign a system-assigned managed identity to an IoT Hub and assign a role to that identity.
     text: >
         az iot hub identity assign --name MyIoTHub --resource-group MyResourceGroup --identities [system] --role "Storage Blob Data Contributor" --scopes {resourceId}
 """
@@ -459,12 +459,12 @@
 
 helps['iot hub identity remove'] = """
 type: command
-short-summary: Remove identities from an IoT Hub
+short-summary: Remove managed identities from an IoT Hub
 examples:
-  - name: Remove a user-assigned identity to an IoT Hub
+  - name: Remove a user-assigned managed identity from an IoT Hub
     text: >
         az iot hub identity remove --name MyIoTHub --resource-group MyResourceGroup --identities {resourceId}
-  - name: Remove a system-assigned identity from an IoT Hub.
+  - name: Remove a system-assigned managed identity from an IoT Hub.
     text: >
         az iot hub identity remove --name MyIoTHub --resource-group MyResourceGroup --identities [system]
 """
@@ -694,7 +694,7 @@
         --endpoint-subscription-id {SubscriptionId} --connection-string {ConnectionString} \\
         --container-name {ContainerName} --batch-frequency 100 --chunk-size 100 \\
         --ff {iothub}-{partition}-{YYYY}-{MM}-{DD}-{HH}-{mm}
-  - name: Add a new identity-based EventHub endpoint named "EventHubIdentity" and authenticate using a user-assigned identity
+  - name: Add a new identity-based EventHub endpoint named "EventHubIdentity" and authenticate using a user-assigned managed identity
     text: >
         az iot hub routing-endpoint create --resource-group MyResourceGroup --hub-name MyIotHub --endpoint-name EventHubIdentity --endpoint-type eventhub --endpoint-resource-group {ResourceGroup} --endpoint-subscription-id {SubscriptionId} --auth-type identityBased --identity {userIdentityResourceId} --endpoint-uri {EventHubEndpointUri} --entity-path {EntityPath}
 """
@@ -820,7 +820,7 @@
   - name: Update the IoT Hub feedback queue settings
     text: >
         az iot hub update --name MyIoTHub --feedback-max-delivery-count 20 --feedback-lock-duration 100 --feedback-ttl 4
-  - name: Update the IoT Hub file upload settings
+  - name: Update the IoT Hub file upload settings, and assign a managed identity to user for file upload)
     text: >
         az iot hub update -n MyIoTHub --fileupload-sas-ttl 5 --fileupload-storage-auth-type identityBased --fileupload-storage-identity [system]
   - name: Update the IoT Hub file upload notification settings

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

@@ -181,23 +181,23 @@ def load_arguments(self, _):  # pylint: disable=too-many-statements
         c.argument('fileupload_storage_identity',
                    options_list=['--fileupload-storage-identity', '--fsi'],
                    help="The managed identity to use for file upload authentication. Use '[system]' to "
-                        "refer to the system-assigned identity or a resource ID to refer to a user-assigned identity.")
+                        "refer to the system-assigned managed identity or a resource ID to refer to a user-assigned managed identity.")
         c.argument('min_tls_version', options_list=['--min-tls-version', '--mintls'],
                    type=str, help='Specify the minimum TLS version to support for this hub. Can be set to'
                                   ' "1.2" to have clients that use a TLS version below 1.2 to be rejected.')
         c.argument('tags', tags_type)
         c.argument('identities', options_list=['--assign-identity'],
-                   nargs='*', help="Accepts system or user assigned identities separated by spaces. Use '[system]'"
+                   nargs='*', help="Accepts system or user-assigned managed identities separated by spaces. Use '[system]'"
                    " to refer to the system-assigned identity or a resource ID to refer to a user-assigned identity.")
         c.argument('identity_role', options_list=['--role'],
-                   help="Role to assign to the hub's system-assigned identity")
+                   help="Role to assign to the hub's system-assigned managed identity")
         c.argument('identity_scopes', options_list=['--scopes'], nargs='*',
                    help="Space separated list of scopes to assign the role (--role) "
                    "for the system-assigned managed identity.")
 
     with self.argument_context('iot hub identity') as c:
         c.argument('identities', options_list=['--identities'],
-                   nargs='*', help="Accepts system or user assigned identities separated by spaces. Use '[system]'"
+                   nargs='*', help="Accepts system or user-assigned managed identities separated by spaces. Use '[system]'"
                    " to refer to the system-assigned identity or a resource ID to refer to a user-assigned identity.")
 
     for subgroup in ['consumer-group', 'policy', 'certificate', 'routing-endpoint', 'route']:

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

@@ -465,7 +465,7 @@ def iot_hub_create(cmd, client, hub_name, resource_group_name, location=None,
                                         tags=tags)
     hub_description.identity = _build_identity(identities) if identities else None
     if bool(identity_role) ^ bool(identity_scopes):
-        raise CLIError('At least one scope (--scopes) and one role (--role) required for system-managed identity role assignment')
+        raise CLIError('At least one scope (--scopes) and one role (--role) required for system-assigned managed identity role assignment')
 
     def identity_assignment(lro):
         try: