Skip to content

Commit b6d414b

Browse files
wanyang7wanyang7
committed
add records for audit test
1 parent 255f357 commit b6d414b

File tree

37 files changed

+147854
-90
lines changed

37 files changed

+147854
-90
lines changed

‎src/Synapse/Synapse.Test/ScenarioTests/AuditTests.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void TestBlobAuditSqlPoolRetentionKeepProperties()
136136
"Test-BlobAuditSqlPoolRetentionKeepProperties");
137137
}
138138

139-
[Fact]
139+
[Fact(Skip = "SQL Data Warehouse audit doesn’t support audit actions.")]
140140
[Trait(Category.AcceptanceType, Category.CheckIn)]
141141
public void TestBlobAuditOnSqlPool()
142142
{
@@ -154,16 +154,7 @@ public void TestBlobAuditOnWorkspace()
154154
"Test-BlobAuditOnWorkspace");
155155
}
156156

157-
[Fact]
158-
[Trait(Category.AcceptanceType, Category.CheckIn)]
159-
public void TestBlobAuditSqlPoolUpdatePolicyWithSameNameStorageOnDifferentRegion()
160-
{
161-
NewInstance.RunPsTest(
162-
_logger,
163-
"Test-BlobAuditSqlPoolUpdatePolicyWithSameNameStorageOnDifferentRegion");
164-
}
165-
166-
[Fact]
157+
[Fact(Skip = "SQL Data Warehouse audit doesn’t support other audit groups.")]
167158
[Trait(Category.AcceptanceType, Category.CheckIn)]
168159
public void TestBlobAuditWithAuditActionGroups()
169160
{

‎src/Synapse/Synapse.Test/ScenarioTests/AuditTests.ps1

Lines changed: 14 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -519,46 +519,6 @@ function Test-BlobAuditOnWorkspace
519519
}
520520
}
521521

522-
<#
523-
.SYNOPSIS
524-
Tests the flow in which re-setting the policy with storage account that has the same name as before, but it is now on a different region
525-
#>
526-
function Test-BlobAuditSqlPoolUpdatePolicyWithSameNameStorageOnDifferentRegion
527-
{
528-
# Setup
529-
$testSuffix = getAssetName
530-
Create-BlobAuditingTestEnvironment $testSuffix
531-
$params = Get-SqlBlobAuditingTestEnvironmentParameters $testSuffix
532-
533-
try
534-
{
535-
# Test
536-
Set-AzSynapseSqlPoolAudit -BlobStorageTargetState Enabled -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName -StorageAccountResourceId $params.storageAccountResourceId
537-
$policy = Get-AzSynapseSqlPoolAudit -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName
538-
539-
# Assert
540-
Assert-AreEqual $policy.StorageAccountResourceId $params.storageAccountResourceId
541-
Assert-AreEqual $policy.BlobStorageTargetState "Enabled"
542-
543-
$newResourceGroupName = "test-rg2-for-sql-cmdlets-" + $testSuffix
544-
New-AzureRmResourceGroup -Location "West Europe" -ResourceGroupName $newResourceGroupName
545-
New-AzureRmStorageAccount -StorageAccountName $params.storageAccount -ResourceGroupName $newResourceGroupName -Location "West Europe" -Type Standard_GRS
546-
547-
Set-AzSynapseSqlPoolAudit -BlobStorageTargetState Enabled -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName -StorageAccountResourceId $params.storageAccountResourceId
548-
$policy = Get-AzSynapseSqlPoolAudit -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName
549-
550-
# Assert
551-
Assert-AreEqual $policy.StorageAccountResourceId $params.storageAccountResourceId
552-
Assert-AreEqual $policy.BlobStorageTargetState "Enabled"
553-
}
554-
finally
555-
{
556-
# Cleanup
557-
Remove-AzureRmResourceGroup -Name $newResourceGroupName -Force
558-
Remove-BlobAuditingTestEnvironment $testSuffix
559-
}
560-
}
561-
562522
<#
563523
.SYNOPSIS
564524
Tests that when modifying the auditActionGroup property of a blob auditing policy, these properties are later fetched properly
@@ -821,7 +781,7 @@ function Test-AuditOnSqlPool
821781
Assert-AreEqual "Disabled" $policy.BlobStorageTargetState
822782
Assert-AreEqual 0 $policy.AuditActionGroup.Length
823783
Assert-AreEqual 0 $policy.AuditAction.Length
824-
Assert-Null $policy.PredicateExpression
784+
Assert-AreEqual "" $policy.PredicateExpression
825785
Assert-Null $policy.StorageAccountResourceId
826786
Assert-AreEqual "None" $policy.StorageKeyType
827787
Assert-Null $policy.RetentionInDays
@@ -1204,7 +1164,7 @@ function Test-NewSqlPoolAuditDiagnosticsAreCreatedOnNeed
12041164
Assert-AreEqual "Disabled" $policy.EventHubTargetState
12051165
Assert-AreEqual 0 $policy.AuditActionGroup.Length
12061166
Assert-AreEqual 0 $policy.AuditAction.Length
1207-
Assert-Null $policy.PredicateExpression
1167+
Assert-AreEqual "" $policy.PredicateExpression
12081168
Assert-Null $policy.EventHubAuthorizationRuleResourceId
12091169
Assert-Null $policy.EventHubNamespace
12101170

@@ -1232,7 +1192,7 @@ function Test-NewSqlPoolAuditDiagnosticsAreCreatedOnNeed
12321192

12331193
# Enable a new category in existing Diagnostic Settings.
12341194
$settingsName = ($diagnostics)[0].Name
1235-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1195+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SqlRequests
12361196

12371197
# Enable log analytics auditing policy and verify it
12381198
Set-AzSynapseSqlPoolAudit -LogAnalyticsTargetState Enabled -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName -WorkspaceResourceId $workspaceResourceId
@@ -1259,7 +1219,7 @@ function Test-NewSqlPoolAuditDiagnosticsAreCreatedOnNeed
12591219

12601220
# Enable a new category in Diagnostic Settings.
12611221
$settingsName = ($diagnostics)[0].Name
1262-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1222+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SqlRequests
12631223

12641224
# Verify log analytics auditing policy is enabled.
12651225
$policy = Get-AzSynapseSqlPoolAudit -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName
@@ -1299,7 +1259,7 @@ function Test-NewSqlPoolAuditDiagnosticsAreCreatedOnNeed
12991259

13001260
# Enable a new category in Diagnostic Settings
13011261
$settingsName = ($diagnostics)[0].Name
1302-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1262+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SqlRequests
13031263

13041264
# Verify event hub auditing settings is enabled.
13051265
$policy = Get-AzSynapseSqlPoolAudit -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName
@@ -1368,7 +1328,7 @@ function Test-NewSqlPoolAuditDiagnosticsAreCreatedOnNeed
13681328
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
13691329
Assert-AreEqual 1 ($diagnostics).count
13701330
$settingsName = ($diagnostics)[0].Name
1371-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1331+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SqlRequests
13721332

13731333
# Disable log analytics auditing policy and verify it
13741334
Set-AzSynapseSqlPoolAudit -LogAnalyticsTargetState Disabled -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -SqlPoolName $params.sqlPoolName
@@ -1472,7 +1432,7 @@ function Test-NewWorkspaceAuditDiagnosticsAreCreatedOnNeed
14721432

14731433
# Enable a new category in existing Diagnostic Settings.
14741434
$settingsName = ($diagnostics)[0].Name
1475-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1435+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category BuiltinSqlReqsEnded
14761436

14771437
# Enable log analytics auditing policy and verify it
14781438
Set-AzSynapseSqlAudit -LogAnalyticsTargetState Enabled -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -WorkspaceResourceId $workspaceResourceId
@@ -1498,7 +1458,7 @@ function Test-NewWorkspaceAuditDiagnosticsAreCreatedOnNeed
14981458

14991459
# Enable a new category in Diagnostic Settings.
15001460
$settingsName = ($diagnostics)[0].Name
1501-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1461+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category BuiltinSqlReqsEnded
15021462

15031463
# Verify log analytics auditing policy is enabled.
15041464
$policy = Get-AzSynapseSqlAudit -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName
@@ -1535,7 +1495,7 @@ function Test-NewWorkspaceAuditDiagnosticsAreCreatedOnNeed
15351495

15361496
# Enable a new category in Diagnostic Settings
15371497
$settingsName = ($diagnostics)[0].Name
1538-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1498+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category BuiltinSqlReqsEnded
15391499
# Verify event hub auditing settings is enabled.
15401500
$policy = Get-AzSynapseSqlAudit -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName
15411501
Assert-AreEqual "Enabled" $policy.EventHubTargetState
@@ -1596,7 +1556,7 @@ function Test-NewWorkspaceAuditDiagnosticsAreCreatedOnNeed
15961556
$diagnostics = Get-AzDiagnosticSetting -ResourceId $resourceId
15971557
Assert-AreEqual 1 ($diagnostics).count "8"
15981558
$settingsName = ($diagnostics)[0].Name
1599-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1559+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category BuiltinSqlReqsEnded
16001560

16011561
# Disable log analytics auditing policy and verify it
16021562
Set-AzSynapseSqlAudit -LogAnalyticsTargetState Disabled -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName
@@ -1814,7 +1774,7 @@ function Test-RemoveAuditOnSqlPool
18141774
Assert-AreEqual "Disabled" $policy.BlobStorageTargetState
18151775
Assert-AreEqual 0 $policy.AuditActionGroup.Length
18161776
Assert-AreEqual 0 $policy.AuditAction.Length
1817-
Assert-Null $policy.PredicateExpression
1777+
Assert-AreEqual "" $policy.PredicateExpression
18181778
Assert-Null $policy.StorageAccountResourceId
18191779
Assert-AreEqual "None" $policy.StorageKeyType
18201780
Assert-Null $policy.RetentionInDays
@@ -1957,7 +1917,7 @@ function Test-RemoveSqlPoolAuditingSettingsMultipleDiagnosticSettings
19571917
Assert-AreEqual "Disabled" $policy.EventHubTargetState
19581918
Assert-AreEqual 0 $policy.AuditActionGroup.Length
19591919
Assert-AreEqual 0 $policy.AuditAction.Length
1960-
Assert-Null $policy.PredicateExpression
1920+
Assert-AreEqual "" $policy.PredicateExpression
19611921
Assert-Null $policy.EventHubAuthorizationRuleResourceId
19621922
Assert-Null $policy.EventHubNamespace
19631923

@@ -1985,7 +1945,7 @@ function Test-RemoveSqlPoolAuditingSettingsMultipleDiagnosticSettings
19851945

19861946
# Enable a new category in existing Diagnostic Settings.
19871947
$settingsName = ($diagnostics)[0].Name
1988-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
1948+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SqlRequests
19891949

19901950
# Create new Diagnostic Settings and enable auditing category
19911951
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Category SQLSecurityAuditEvents -WorkspaceId $workspaceResourceId
@@ -2082,7 +2042,7 @@ function Test-RemoveWorkspaceAuditingSettingsMultipleDiagnosticSettings
20822042

20832043
# Enable a new category in existing Diagnostic Settings.
20842044
$settingsName = ($diagnostics)[0].Name
2085-
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category SQLInsights
2045+
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Name $settingsName -Category IntegrationPipelineRuns
20862046

20872047
# Create new Diagnostic Settings and enable auditing category
20882048
Set-AzDiagnosticSetting -ResourceId $resourceId -Enabled $True -Category SQLSecurityAuditEvents -WorkspaceId $workspaceResourceId

‎src/Synapse/Synapse.Test/ScenarioTests/SynapseTestBase.cs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
using Microsoft.Rest;
3232
using NewStorageManagementClient = Microsoft.Azure.Management.Storage.Version2017_10_01.StorageManagementClient;
3333
using Microsoft.Azure.Management.Storage;
34-
using Microsoft.Azure.Management.Monitor.Version2018_09_01;
34+
using SDKMonitor = Microsoft.Azure.Management.Monitor;
35+
using CommonMonitor = Microsoft.Azure.Management.Monitor.Version2018_09_01;
3536
using Microsoft.Azure.Management.OperationalInsights;
3637
using Microsoft.Azure.Management.EventHub;
3738

@@ -54,7 +55,9 @@ public class SynapseTestBase : RMTestBase
5455

5556
public StorageManagementClient StorageManagementClient { get; private set; }
5657

57-
public MonitorManagementClient MonitorManagementClient { get; private set; }
58+
public CommonMonitor.MonitorManagementClient CommonMonitorManagementClient { get; private set; }
59+
60+
public SDKMonitor.MonitorManagementClient SDKMonitorManagementClient { get; private set; }
5861

5962
public OperationalInsightsManagementClient OperationalInsightsManagementClient { get; private set; }
6063

@@ -143,7 +146,8 @@ protected void SetupManagementClients(MockContext context)
143146
SynapseClient = GetSynapseClient(context);
144147
StorageManagementClient = GetStorageManagementClient(context);
145148
NewResourceManagementClient = GetResourceManagementClient(context);
146-
MonitorManagementClient = GetMonitorManagementClient(context);
149+
CommonMonitorManagementClient = GetCommonMonitorManagementClient(context);
150+
SDKMonitorManagementClient = GetMonitorManagementClient(context);
147151
OperationalInsightsManagementClient = GetOperationalInsightsManagementClient(context);
148152
EventHubManagementClient = GetEventHubManagementClient(context);
149153
_helper.SetupManagementClients(
@@ -152,7 +156,8 @@ protected void SetupManagementClients(MockContext context)
152156
SynapseClient,
153157
StorageManagementClient,
154158
NewResourceManagementClient,
155-
MonitorManagementClient,
159+
CommonMonitorManagementClient,
160+
SDKMonitorManagementClient,
156161
OperationalInsightsManagementClient,
157162
EventHubManagementClient,
158163
GetNewSynapseManagementClient(context)
@@ -197,9 +202,14 @@ protected static SynapseSqlV3ManagementClient GetSynapseSqlV3ManagementClient(Mo
197202
return context.GetServiceClient<SynapseSqlV3ManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
198203
}
199204

200-
protected static MonitorManagementClient GetMonitorManagementClient(MockContext context)
205+
protected static CommonMonitor.MonitorManagementClient GetCommonMonitorManagementClient(MockContext context)
206+
{
207+
return context.GetServiceClient<CommonMonitor.MonitorManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
208+
}
209+
210+
protected static SDKMonitor.MonitorManagementClient GetMonitorManagementClient(MockContext context)
201211
{
202-
return context.GetServiceClient<MonitorManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
212+
return context.GetServiceClient<SDKMonitor.MonitorManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
203213
}
204214

205215
protected static OperationalInsightsManagementClient GetOperationalInsightsManagementClient(MockContext context)

0 commit comments

Comments
 (0)