Skip to content

Commit ad125d9

Browse files
bashaheebashahee
committed
Merge branch 'master' into DcSupport
2 parents 3e880b1 + ce9ccd7 commit ad125d9

File tree

9 files changed

+8918
-47
lines changed

9 files changed

+8918
-47
lines changed

‎src/Sql/Sql.Test/ScenarioTests/AuditingTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,13 @@ public void TestAuditingOnServer()
197197

198198
[Fact]
199199
[Trait(Category.AcceptanceType, Category.CheckIn)]
200-
[Trait(Category.RunType, Category.LiveOnly)]
201200
public void TestNewDatabaseDiagnosticsAreCreatedOnNeed()
202201
{
203202
RunPowerShellTest("Test-NewDatabaseDiagnosticsAreCreatedOnNeed");
204203
}
205204

206205
[Fact]
207206
[Trait(Category.AcceptanceType, Category.CheckIn)]
208-
[Trait(Category.RunType, Category.LiveOnly)]
209207
public void TestNewServerDiagnosticsAreCreatedOnNeed()
210208
{
211209
RunPowerShellTest("Test-NewServerDiagnosticsAreCreatedOnNeed");

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,7 +1458,6 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
14581458

14591459
# Enable event hub auditing policy and verify it.
14601460
Set-AzSqlDatabaseAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub -EventHubAuthorizationRuleResourceId $eventHubAuthorizationRuleResourceId
1461-
Start-Sleep -s 180
14621461
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
14631462
Assert-AreEqual "Enabled" $policy.AuditState
14641463
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1482,10 +1481,8 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
14821481
# Enable a new category in existing Diagnostic Settings.
14831482
$settingsName = ($diagnostics)[0].Name
14841483
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1485-
Start-Sleep -s 180
14861484
# Enable log analytics auditing policy and verify it
14871485
Set-AzSqlDatabaseAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -LogAnalytics -WorkspaceResourceId $workspaceResourceId
1488-
Start-Sleep -s 180
14891486
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -LogAnalytics
14901487
Assert-AreEqual "Enabled" $policy.AuditState
14911488
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1507,15 +1504,13 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
15071504

15081505
# Remove old Diagnostics.
15091506
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1510-
Start-Sleep -s 180
15111507
# Verify only one diagnostic settings exists.
15121508
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
15131509
Assert-AreEqual 1 ($diagnostics).count
15141510

15151511
# Enable a new category in Diagnostic Settings.
15161512
$settingsName = ($diagnostics)[0].Name
15171513
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1518-
Start-Sleep -s 180
15191514
# Verify log analytics auditing policy is enabled.
15201515
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -LogAnalytics
15211516
Assert-AreEqual "Enabled" $policy.AuditState
@@ -1535,7 +1530,6 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
15351530

15361531
# Enable event hub auditing policy and verify it.
15371532
Set-AzSqlDatabaseAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub -EventHubAuthorizationRuleResourceId $eventHubAuthorizationRuleResourceId
1538-
Start-Sleep -s 180
15391533
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
15401534
Assert-AreEqual "Enabled" $policy.AuditState
15411535
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1557,15 +1551,13 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
15571551

15581552
# Remove old Diagnostics.
15591553
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1560-
Start-Sleep -s 180
15611554
# Verify only one diagnostic settings exist.
15621555
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
15631556
Assert-AreEqual 1 ($diagnostics).count
15641557

15651558
# Enable a new category in Diagnostic Settings
15661559
$settingsName = ($diagnostics)[0].Name
15671560
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1568-
Start-Sleep -s 180
15691561
# Verify event hub auditing settings is enabled.
15701562
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
15711563
Assert-AreEqual "Enabled" $policy.AuditState
@@ -1585,7 +1577,6 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
15851577

15861578
# Disable event hub auditing policy and verify it.
15871579
Set-AzSqlDatabaseAuditing -State Disabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
1588-
Start-Sleep -s 180
15891580
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
15901581
Assert-AreEqual "Disabled" $policy.AuditState
15911582
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1607,7 +1598,6 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
16071598

16081599
# Remove old Diagnostics
16091600
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1610-
Start-Sleep -s 180
16111601
# Verify only one diagnostic settings exist.
16121602
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
16131603
Assert-AreEqual 1 ($diagnostics).count
@@ -1631,7 +1621,6 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
16311621

16321622
# Enable event hub auditing policy and verify it.
16331623
Set-AzSqlDatabaseAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub -EventHubAuthorizationRuleResourceId $eventHubAuthorizationRuleResourceId
1634-
Start-Sleep -s 180
16351624
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
16361625
Assert-AreEqual "Enabled" $policy.AuditState
16371626
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1654,10 +1643,8 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
16541643
$settingsName = ($diagnostics)[0].Name
16551644
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
16561645

1657-
Start-Sleep -s 180
16581646
# Disable log analytics auditing policy and verify it
16591647
Set-AzSqlDatabaseAuditing -State Disabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -LogAnalytics
1660-
Start-Sleep -s 180
16611648
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -LogAnalytics
16621649
Assert-AreEqual "Disabled" $policy.AuditState
16631650
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1679,7 +1666,6 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
16791666

16801667
# Remove old Diagnostics
16811668
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1682-
Start-Sleep -s 180
16831669
# Verify log analytics auditing policy is Disabled.
16841670
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -LogAnalytics
16851671
Assert-AreEqual "Disabled" $policy.AuditState
@@ -1699,7 +1685,6 @@ function Test-NewDatabaseDiagnosticsAreCreatedOnNeed
16991685

17001686
# Disable event hub auditing policy and verify it.
17011687
Set-AzSqlDatabaseAuditing -State Disabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
1702-
Start-Sleep -s 180
17031688
$policy = Get-AzSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -EventHub
17041689
Assert-AreEqual "Disabled" $policy.AuditState
17051690
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1758,7 +1743,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
17581743

17591744
# Enable event hub auditing policy and verify it.
17601745
Set-AzSqlServerAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub -EventHubAuthorizationRuleResourceId $eventHubAuthorizationRuleResourceId
1761-
Start-Sleep -s 180
17621746
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
17631747
Assert-AreEqual "Enabled" $policy.AuditState
17641748
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1778,11 +1762,9 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
17781762
# Enable a new category in existing Diagnostic Settings.
17791763
$settingsName = ($diagnostics)[0].Name
17801764
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1781-
Start-Sleep -s 180
17821765

17831766
# Enable log analytics auditing policy and verify it
17841767
Set-AzSqlServerAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -LogAnalytics -WorkspaceResourceId $workspaceResourceId
1785-
Start-Sleep -s 180
17861768
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -LogAnalytics
17871769
Assert-AreEqual "Enabled" $policy.AuditState
17881770
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1800,7 +1782,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
18001782

18011783
# Remove old Diagnostics.
18021784
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1803-
Start-Sleep -s 180
18041785

18051786
# Verify only one diagnostic settings exists.
18061787
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
@@ -1809,7 +1790,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
18091790
# Enable a new category in Diagnostic Settings.
18101791
$settingsName = ($diagnostics)[0].Name
18111792
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1812-
Start-Sleep -s 180
18131793

18141794
# Verify log analytics auditing policy is enabled.
18151795
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -LogAnalytics
@@ -1826,7 +1806,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
18261806

18271807
# Enable event hub auditing policy and verify it.
18281808
Set-AzSqlServerAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub -EventHubAuthorizationRuleResourceId $eventHubAuthorizationRuleResourceId
1829-
Start-Sleep -s 180
18301809
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
18311810
Assert-AreEqual "Enabled" $policy.AuditState
18321811
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1844,7 +1823,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
18441823

18451824
# Remove old Diagnostics.
18461825
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1847-
Start-Sleep -s 180
18481826

18491827
# Verify only one diagnostic settings exist.
18501828
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
@@ -1853,7 +1831,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
18531831
# Enable a new category in Diagnostic Settings
18541832
$settingsName = ($diagnostics)[0].Name
18551833
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1856-
Start-Sleep -s 180
18571834
# Verify event hub auditing settings is enabled.
18581835
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
18591836
Assert-AreEqual "Enabled" $policy.AuditState
@@ -1869,7 +1846,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
18691846

18701847
# Disable event hub auditing policy and verify it.
18711848
Set-AzSqlServerAuditing -State Disabled -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
1872-
Start-Sleep -s 180
18731849
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
18741850
Assert-AreEqual "Disabled" $policy.AuditState
18751851
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1887,7 +1863,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
18871863

18881864
# Remove old Diagnostics
18891865
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1890-
Start-Sleep -s 180
18911866
# Verify only one diagnostic settings exist.
18921867
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
18931868
Assert-AreEqual 1 ($diagnostics).count "7"
@@ -1907,7 +1882,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
19071882

19081883
# Enable event hub auditing policy and verify it.
19091884
Set-AzSqlServerAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub -EventHubAuthorizationRuleResourceId $eventHubAuthorizationRuleResourceId
1910-
Start-Sleep -s 180
19111885
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
19121886
Assert-AreEqual "Enabled" $policy.AuditState
19131887
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1925,11 +1899,9 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
19251899
Assert-AreEqual 1 ($diagnostics).count "8"
19261900
$settingsName = ($diagnostics)[0].Name
19271901
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1928-
Start-Sleep -s 180
19291902

19301903
# Disable log analytics auditing policy and verify it
19311904
Set-AzSqlServerAuditing -State Disabled -ResourceGroupName $params.rgname -ServerName $params.serverName -LogAnalytics
1932-
Start-Sleep -s 180
19331905
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -LogAnalytics
19341906
Assert-AreEqual "Disabled" $policy.AuditState
19351907
Assert-AreEqual 3 $policy.AuditActionGroup.Length
@@ -1947,7 +1919,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
19471919

19481920
# Remove old Diagnostics
19491921
Remove-AzDiagnosticSetting -ResourceId $resourceId -Name $settingsName
1950-
Start-Sleep -s 180
19511922
# Verify log analytics auditing policy is Disabled.
19521923
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -LogAnalytics
19531924
Assert-AreEqual "Disabled" $policy.AuditState
@@ -1963,7 +1934,6 @@ function Test-NewServerDiagnosticsAreCreatedOnNeed
19631934

19641935
# Disable event hub auditing policy and verify it.
19651936
Set-AzSqlServerAuditing -State Disabled -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
1966-
Start-Sleep -s 180
19671937
$policy = Get-AzSqlServerAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -EventHub
19681938
Assert-AreEqual "Disabled" $policy.AuditState
19691939
Assert-AreEqual 3 $policy.AuditActionGroup.Length

0 commit comments

Comments
 (0)