Skip to content

Commit d615c43

Browse files
committed
SQL Auditing fixes
- Blob auditing storage account key must be set from secondary storage account key when StorageKeyType 'Secondary' is provided. - Fixes for issue: #5046
1 parent 157b717 commit d615c43

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/ResourceManager/Sql/Commands.Sql/Auditing/Services/SqlAuditAdapter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ private BlobAuditingCreateOrUpdateParameters PolicizeBlobAuditingModel(BaseBlobA
470470
if (!IgnoreStorage && (model.AuditState == AuditStateType.Enabled))
471471
{
472472
properties.StorageEndpoint = ExtractStorageAccountName(model, storageEndpointSuffix);
473-
properties.StorageAccountAccessKey = ExtractStorageAccountKey(model.StorageAccountName);
473+
properties.StorageAccountAccessKey = ExtractStorageAccountKey(model.StorageAccountName, model.StorageKeyType);
474474
properties.IsStorageSecondaryKeyInUse = model.StorageKeyType == StorageKeyKind.Secondary;
475475
properties.StorageAccountSubscriptionId = ExtractStorageAccountSubscriptionId(model.StorageAccountName);
476476
}
@@ -485,7 +485,7 @@ private BlobAuditingCreateOrUpdateParameters PolicizeBlobAuditingModel(BaseBlobA
485485

486486
private static IList<string> ExtractAuditActionsAndGroups(BaseBlobAuditingPolicyModel model)
487487
{
488-
var dbPolicyModel = model as DatabaseBlobAuditingPolicyModel;
488+
var dbPolicyModel = model as DatabaseBlobAuditingSettingsModel;
489489
var actionsAndGroups = new List<string>();
490490
if (dbPolicyModel != null)
491491
{
@@ -635,9 +635,9 @@ private string ExtractStorageAccountKey(string storageName, BaseTableAuditingPol
635635
/// <summary>
636636
/// Extracts the storage account requested key
637637
/// </summary>
638-
private string ExtractStorageAccountKey(string storageName)
638+
private string ExtractStorageAccountKey(string storageName, StorageKeyKind storageKeyKind)
639639
{
640-
return AzureCommunicator.GetStorageKeys(storageName)[StorageKeyKind.Primary];
640+
return AzureCommunicator.GetStorageKeys(storageName)[storageKeyKind];
641641
}
642642

643643
internal void ClearStorageDetailsCache()

0 commit comments

Comments
 (0)