Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/vm/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -2219,8 +2219,8 @@
examples:
- name: Enable the system assigned identity on a VM with the 'Reader' role.
text: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
- name: Enable the system assigned identity and a user assigned identity on a VM.
text: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --identities [system] myAssignedId
- name: Enable the system assigned identity and a user assigned identity on a VM with the 'Reader' role.
text: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --identities [system] myAssignedId --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
Comment thread
zhoxing-ms marked this conversation as resolved.
Outdated
"""

helps['vm identity remove'] = """
Expand Down Expand Up @@ -3309,6 +3309,8 @@
examples:
- name: Enable system assigned identity on a VMSS with the 'Owner' role.
text: az vmss identity assign -g MyResourceGroup -n MyVmss --role Owner --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
- name: Enable system assigned identity and a user assigned identity on a VMSS with the 'Owner' role.
text: az vmss identity assign -g MyResourceGroup -n MyVmss --role Owner --identities [system] myAssignedId --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
Comment thread
zhoxing-ms marked this conversation as resolved.
Outdated
- name: Enable managed service identity on a VMSS. (autogenerated)
text: |
az vmss identity assign --identities readerId writerId --name MyVmss --resource-group MyResourceGroup
Expand Down
6 changes: 5 additions & 1 deletion src/azure-cli/azure/cli/command_modules/vm/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,11 @@ def load_arguments(self, _):

for scope in ['vm identity assign', 'vmss identity assign']:
with self.argument_context(scope) as c:
c.argument('identity_role', options_list=['--role'], help="Role name or id the system assigned identity will have")
c.argument('identity_role', options_list=['--role'],
help='Role name or id the system assigned identity will have. '
'Please note that the default value "Contributor" will be removed in the breaking change '
'release of the fall, so please specify "--role" and "--scope" at the same time '
'when assigning a role to the managed identity')

with self.argument_context('vm auto-shutdown') as c:
c.argument('off', action='store_true', help='Turn off auto-shutdown for VM. Configuration will be cleared.')
Expand Down
6 changes: 6 additions & 0 deletions src/azure-cli/azure/cli/command_modules/vm/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,12 @@ def _validate_vm_vmss_msi(cmd, namespace, is_identity_assign=False):
if not namespace.identity_scope and role_is_explicitly_specified:
raise ArgumentUsageError(
"usage error: please specify --scope when assigning a role to the managed identity")
if not role_is_explicitly_specified and namespace.identity_scope:
logger.warning(
"Please note that the default value of '--role' will be removed in the breaking change release of the "
"fall. So specify '--role' and '--scope' at the same time when assigning a role to the managed "
"identity to avoid breaking your automation script when the default value of '--role' is removed."
)

# Assign managed identity
if is_identity_assign or namespace.assign_identity is not None:
Expand Down