Skip to content

[IoT] Hotfix for user-assigned identity ARM issue on remove #18283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 1 commit into from
May 29, 2021
Merged

[IoT] Hotfix for user-assigned identity ARM issue on remove #18283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/iot/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,16 +711,18 @@ def iot_hub_identity_remove(cmd, client, hub_name, system_identity=None, user_id
if not hub_identity.user_assigned_identities[identity]:
raise ArgumentUsageError('Hub {0} is not currently using a user-assigned identity with id: {1}'.format(hub_name, identity))
del hub_identity.user_assigned_identities[identity]
if not hub_identity.user_assigned_identities:
del hub_identity.user_assigned_identities
elif isinstance(user_identities, list):
del hub_identity.user_assigned_identities

if hub_identity.type in [
IdentityType.system_assigned.value,
IdentityType.system_assigned_user_assigned.value
]:
hub_identity.type = IdentityType.system_assigned_user_assigned.value if hub_identity.user_assigned_identities else IdentityType.system_assigned.value
hub_identity.type = IdentityType.system_assigned_user_assigned.value if getattr(hub_identity, 'user_assigned_identities', None) else IdentityType.system_assigned.value
else:
hub_identity.type = IdentityType.user_assigned.value if hasattr(hub_identity, 'user_assigned_identities') else IdentityType.none.value
hub_identity.type = IdentityType.user_assigned.value if getattr(hub_identity, 'user_assigned_identities', None) else IdentityType.none.value

hub.identity = hub_identity
if not getattr(hub.identity, 'user_assigned_identities', None):
Expand Down
Loading