Skip to content

Commit 5d4a542

Browse files
StorageAccountResourceId parameter
1 parent 187e422 commit 5d4a542

File tree

39 files changed

+20846
-24729
lines changed

39 files changed

+20846
-24729
lines changed

src/Sql/Sql.Test/ScenarioTests/AuditPolicyTests.ps1

Lines changed: 106 additions & 132 deletions
Large diffs are not rendered by default.

src/Sql/Sql.Test/ScenarioTests/AuditingTests.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ function Test-AuditingOnDatabase
906906
Assert-Null $policy.StorageAccountName
907907
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
908908
Assert-AreEqual "Primary" $policy.StorageKeyType
909-
Assert-AreEqual 0 $policy.RetentionInDays
909+
Assert-Null $policy.RetentionInDays
910910

911911
# Verify event hub auditing policy is disabled.
912912
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
@@ -1051,7 +1051,7 @@ function Test-AuditingOnDatabase
10511051
Assert-Null $policy.StorageAccountName
10521052
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
10531053
Assert-AreEqual "Primary" $policy.StorageKeyType
1054-
Assert-AreEqual 0 $policy.RetentionInDays
1054+
Assert-Null $policy.RetentionInDays
10551055

10561056
# Verify event hub auditing policy is enabled.
10571057
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
@@ -1099,7 +1099,7 @@ function Test-AuditingOnDatabase
10991099
Assert-Null $policy.StorageAccountName
11001100
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
11011101
Assert-AreEqual "Primary" $policy.StorageKeyType
1102-
Assert-AreEqual 0 $policy.RetentionInDays
1102+
Assert-Null $policy.RetentionInDays
11031103

11041104
# Verify event hub auditing policy is enabled.
11051105
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
@@ -1138,7 +1138,7 @@ function Test-AuditingOnDatabase
11381138
Assert-Null $policy.StorageAccountName
11391139
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
11401140
Assert-AreEqual "Primary" $policy.StorageKeyType
1141-
Assert-AreEqual 0 $policy.RetentionInDays
1141+
Assert-Null $policy.RetentionInDays
11421142

11431143
# Verify log analytics auditing policy is disabled.
11441144
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -LogAnalytics
@@ -1188,7 +1188,7 @@ function Test-AuditingOnServer
11881188
Assert-AreEqual "" $policy.PredicateExpression
11891189
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
11901190
Assert-AreEqual "Primary" $policy.StorageKeyType
1191-
Assert-AreEqual 0 $policy.RetentionInDays
1191+
Assert-Null $policy.RetentionInDays
11921192

11931193
# Verify event hub auditing policy is disabled.
11941194
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
@@ -1321,7 +1321,7 @@ function Test-AuditingOnServer
13211321
Assert-Null $policy.StorageAccountName
13221322
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
13231323
Assert-AreEqual "Primary" $policy.StorageKeyType
1324-
Assert-AreEqual 0 $policy.RetentionInDays
1324+
Assert-Null $policy.RetentionInDays
13251325

13261326
# Verify event hub auditing policy is enabled.
13271327
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
@@ -1365,7 +1365,7 @@ function Test-AuditingOnServer
13651365
Assert-Null $policy.StorageAccountName
13661366
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
13671367
Assert-AreEqual "Primary" $policy.StorageKeyType
1368-
Assert-AreEqual 0 $policy.RetentionInDays
1368+
Assert-Null $policy.RetentionInDays
13691369

13701370
# Verify event hub auditing policy is enabled.
13711371
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
@@ -1401,7 +1401,7 @@ function Test-AuditingOnServer
14011401
Assert-Null $policy.StorageAccountName
14021402
Assert-AreEqual "00000000-0000-0000-0000-000000000000" $policy.StorageAccountSubscriptionId
14031403
Assert-AreEqual "Primary" $policy.StorageKeyType
1404-
Assert-AreEqual 0 $policy.RetentionInDays
1404+
Assert-Null $policy.RetentionInDays
14051405

14061406
# Verify log analytics auditing policy is disabled.
14071407
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -LogAnalytics

src/Sql/Sql.Test/ScenarioTests/Common.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@ Gets the values of the parameters used at the blob auditing tests
3131
#>
3232
function Get-SqlBlobAuditingTestEnvironmentParameters ($testSuffix)
3333
{
34+
$subscriptionId = (Get-AzContext).Subscription.Id
3435
return @{ rgname = "blob-audit-cmdlet-test-rg" + $testSuffix;
3536
serverName = "blob-audit-cmdlet-server" + $testSuffix;
3637
databaseName = "blob-audit-cmdlet-db" + $testSuffix;
3738
storageAccount = "blobaudit" + $testSuffix
3839
eventHubNamespace = "audit-cmdlet-event-hub-ns" + $testSuffix
3940
workspaceName = "audit-cmdlet-workspace" +$testSuffix
41+
storageAccountResourceId = "/subscriptions/" + $subscriptionId + "/resourceGroups/" + "blob-audit-cmdlet-test-rg" + $testSuffix + "/providers/Microsoft.Storage/storageAccounts/" + "blobaudit" + $testSuffix
4042
}
4143
}
4244

0 commit comments

Comments
 (0)