Skip to content

{RDBMS} az postgres flexible-server identity remove: assign the correct identity type on remove #31586

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
evelyn-ys merged 6 commits into from
Jun 9, 2025
Merged

{RDBMS} az postgres flexible-server identity remove: assign the correct identity type on remove #31586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9da7786
{RDBMS} az postgres flexible-server identity remove: assign the corre…
May 30, 2025
e4fd606
Address feedback
Jun 2, 2025
7d76853
fix style
Jun 3, 2025
08b0115
fix style
Jun 3, 2025
f51e48c
fix test
Jun 4, 2025
53260a8
fix test
Jun 5, 2025
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
19 changes: 18 additions & 1 deletion src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,11 +1059,28 @@ def flexible_server_identity_remove(cmd, client, resource_group_name, server_nam
for identity in identities:
identities_map[identity] = None

system_assigned_identity = instance.identity and 'principalId' in instance.identity.additional_properties and instance.identity.additional_properties['principalId'] is not None

# if there are no user-assigned identities or all user-assigned identities are already removed
if not (instance.identity and instance.identity.user_assigned_identities) or \
all(key.lower() in [identity.lower() for identity in identities] for key in instance.identity.user_assigned_identities.keys()):
if system_assigned_identity:
# if there is system assigned identity, then set identity type to SystemAssigned
parameters = {
'identity': postgresql_flexibleservers.models.UserAssignedIdentity(
type="SystemAssigned")}
else:
# no system assigned identity, set identity type to None
parameters = {
'identity': postgresql_flexibleservers.models.UserAssignedIdentity(
type="None")}
# if there are user-assigned identities and system assigned identity, then set identity type to SystemAssigned,UserAssigned
elif system_assigned_identity:
parameters = {
'identity': postgresql_flexibleservers.models.UserAssignedIdentity(
type="None")}
user_assigned_identities=identities_map,
type="SystemAssigned,UserAssigned")}
# there is no system assigned identity, but there are user-assigned identities, then set identity type to UserAssigned
else:
parameters = {
'identity': postgresql_flexibleservers.models.UserAssignedIdentity(
Expand Down
Loading