Skip to content

[SQL] umi support for auditing #20750

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
isra-fel merged 6 commits into from
Jan 28, 2023
+10 −3
Merged

[SQL] umi support for auditing #20750

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
3fa7418
umi support for auditing
iliaskha Jan 26, 2023
e140533
updated changelog
iliaskha Jan 26, 2023
c823cc2
Merge branch 'main' of https://github.com/Azure/azure-powershell into…
iliaskha Jan 26, 2023
3a3e5b3
added null check
iliaskha Jan 27, 2023
4d05a85
Merge branch 'main' of https://github.com/Azure/azure-powershell into…
iliaskha Jan 27, 2023
466424f
Update ChangeLog.md
isra-fel Jan 28, 2023
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
7 changes: 5 additions & 2 deletions src/Sql/Sql/Auditing/Services/AuditingEndpointsCommunicator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,15 @@ public DiagnosticSettingsResource UpdateDiagnosticSettings(DiagnosticSettingsRes
public Guid? AssignServerIdentityIfNotAssigned(string resourceGroupName, string serverName)
{
var server = GetCurrentSqlClient().Servers.Get(resourceGroupName, serverName);
if (server.Identity == null ||
server.Identity.Type != ResourceIdentityType.SystemAssigned.ToString())
if (server.Identity == null)
{
server.Identity = ResourceIdentityHelper.GetIdentityObjectFromType(true, ResourceIdentityType.SystemAssigned.ToString(), null, null);
server = GetCurrentSqlClient().Servers.CreateOrUpdate(resourceGroupName, serverName, server);
}
else if (server.Identity.Type != null && server.Identity.Type.Contains("UserAssigned"))
{
return null;
}

return server.Identity.PrincipalId;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Sql/Sql/Auditing/Services/SqlAuditAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,10 @@ internal virtual void PolicizeStorageInfo(AuditModelType model, ProxyResource po
if (AzureCommunicator.IsStorageAccountInVNet(model.StorageAccountResourceId) || model.UseIdentity == BoolType.True)
{
Guid? principalId = Communicator.AssignServerIdentityIfNotAssigned(model.ResourceGroupName, model.ServerName);
AzureCommunicator.AssignRoleForServerIdentityOnStorageIfNotAssigned(model.StorageAccountResourceId, principalId.Value, RoleAssignmentId);
if (principalId != null)
{
AzureCommunicator.AssignRoleForServerIdentityOnStorageIfNotAssigned(model.StorageAccountResourceId, principalId.Value, RoleAssignmentId);
}
}
else
{
Expand Down
1 change: 1 addition & 0 deletions src/Sql/Sql/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-->
## Upcoming Release
* Added an optional parameter `HAReplicaCount` to `Restore-AzSqlDatabase`
* Enabled support for UserAssignedManagedIdentity in Auditing

## Version 4.2.0
* Added a parameter named `UseIdentity` for `Set-AzSqlServerAudit`, `Set-AzSqlDatabaseAudit`, `Set-AzSqlServerMSSupportAudit`
Expand Down