Skip to content

Commit 3a0414b

Browse files
yaakoviyunyaakoviyun
committed
Updating tests
1 parent 9ca6d5a commit 3a0414b

File tree

7 files changed

+13706
-12129
lines changed

7 files changed

+13706
-12129
lines changed

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/VulnerabilityAssessmentTests.ps1

Lines changed: 11 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -150,24 +150,8 @@ function Test-VulnerabilityAssessmentSettingsTest
150150
-BlobStorageSasUri "https://invalid.blob.core.windows.netXXXXXXXXXXXXXXX"} `
151151
-message "Invalid BlobStorageSasUri parameter value. The value should be in format of https://mystorage.blob.core.windows.net/vulnerability-assessment?st=XXXXXX."
152152

153-
# Update Vulnerability Assessment settings (UpdateSettingsWithStorageAccountNameParameterSet parameter set)
154-
try
155-
{
156-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
153+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
157154
-StorageAccountName $params.storageAccount
158-
}
159-
catch
160-
{
161-
if ((Get-SqlTestMode) -eq 'Playback')
162-
{
163-
# This command fails in Playback mode because the recorder do not record storage container creation command
164-
# Issue #6600 (https://github.com/Azure/azure-powershell/issues/6600)
165-
}
166-
else
167-
{
168-
throw;
169-
}
170-
}
171155

172156
# Get Vulnerability Assessment settings
173157
$settings = Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
@@ -179,34 +163,17 @@ function Test-VulnerabilityAssessmentSettingsTest
179163
Assert-AreEqual "vulnerability-assessment" $settings.ScanResultsContainerName
180164
Assert-AreEqual $params.storageAccount $settings.StorageAccountName
181165
Assert-AreEqual None $settings.RecurringScansInterval
182-
Assert-AreEqual $false $settings.EmailAdmins
166+
Assert-AreEqual $true $settings.EmailAdmins
183167
Assert-AreEqualArray @() $settings.NotificationEmail
184168

185169
# Set Vulnerability Assessment settings with all optional values (SetSettingsWithStorageAccountNameParameterSet parameter set)
186-
$testScanResultsContainerName = "test-scan-results-container-name"
187170
$testEmailAdmins = $true
188171
$testNotificationEmail = @("[email protected]", "[email protected]")
189172
$testRecurringScansInterval = [Microsoft.Azure.Commands.Sql.VulnerabilityAssessment.Model.RecurringScansInterval]::Weekly
190173

191-
# Update Vulnerability Assessment settings (UpdateSettingsWithStorageAccountNameParameterSet parameter set)
192-
try
193-
{
194-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
174+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
195175
-RecurringScansInterval $testRecurringScansInterval -EmailAdmins $testEmailAdmins `
196176
-NotificationEmail $testNotificationEmail
197-
}
198-
catch
199-
{
200-
if ((Get-SqlTestMode) -eq 'Playback')
201-
{
202-
# This command fails in Playback mode because the recorder do not record storage container creation command
203-
# Issue #6600 (https://github.com/Azure/azure-powershell/issues/6600)
204-
}
205-
else
206-
{
207-
throw;
208-
}
209-
}
210177

211178
# Get Vulnerability Assessment settings
212179
$settings = Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
@@ -215,7 +182,7 @@ function Test-VulnerabilityAssessmentSettingsTest
215182
Assert-AreEqual $params.rgname $settings.ResourceGroupName
216183
Assert-AreEqual $params.serverName $settings.ServerName
217184
Assert-AreEqual $params.databaseName $settings.DatabaseName
218-
Assert-AreEqual $testScanResultsContainerName $settings.ScanResultsContainerName
185+
Assert-AreEqual "vulnerability-assessment" $settings.ScanResultsContainerName
219186
Assert-AreEqual $params.storageAccount $settings.StorageAccountName
220187
Assert-AreEqual $testRecurringScansInterval $settings.RecurringScansInterval
221188
Assert-AreEqual $testEmailAdmins $settings.EmailAdmins
@@ -256,24 +223,8 @@ function Test-VulnerabilityAssessmentSettingsTest
256223
-BlobStorageSasUri $testBlobStorageSasUri -RecurringScansInterval $testRecurringScansInterval -EmailAdmins $testEmailAdmins `
257224
-NotificationEmail $testNewNotificationEmail
258225

259-
try
260-
{
261-
Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $newDatabaseName | Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings `
226+
Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $newDatabaseName | Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings `
262227
-ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
263-
}
264-
catch
265-
{
266-
if ((Get-SqlTestMode) -eq 'Playback')
267-
{
268-
# This command fails in Playback mode because the recorder do not record storage container creation command
269-
# Issue #6600 (https://github.com/Azure/azure-powershell/issues/6600)
270-
}
271-
else
272-
{
273-
throw;
274-
}
275-
}
276-
277228
$settings = Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
278229

279230
Assert-AreEqual $params.rgname $settings.ResourceGroupName
@@ -346,25 +297,9 @@ function Test-VulnerabilityAssessmentBaselineTest
346297
# Turn on ATP
347298
Enable-AzureRmSqlServerAdvancedThreatProtection -ResourceGroupName $params.rgname -ServerName $params.serverName
348299

349-
# Set Vulnerability Assessment settings (SetSettingsWithStorageAccountNameParameterSet parameter set)
350-
try
351-
{
352-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
300+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
353301
-StorageAccountName $params.storageAccount
354-
}
355-
catch
356-
{
357-
if ((Get-SqlTestMode) -eq 'Playback')
358-
{
359-
# This command fails in Playback mode because the recorder do not record storage container creation command
360-
# Issue #6600 (https://github.com/Azure/azure-powershell/issues/6600)
361-
}
362-
else
363-
{
364-
throw;
365-
}
366-
}
367-
302+
368303
$ruleId = "VA2108"
369304

370305
# Get and remove baseline for non existing baseline
@@ -511,30 +446,14 @@ function Test-VulnerabilityAssessmentScanRecordGetListTest
511446
# Turn on ATP
512447
Enable-AzureRmSqlServerAdvancedThreatProtection -ResourceGroupName $params.rgname -ServerName $params.serverName
513448

514-
# Set Vulnerability Assessment settings (SetSettingsWithStorageAccountNameParameterSet parameter set)
515-
try
516-
{
517-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
449+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
518450
-StorageAccountName $params.storageAccount
519-
}
520-
catch
521-
{
522-
if ((Get-SqlTestMode) -eq 'Playback')
523-
{
524-
# This command fails in Playback mode because the recorder do not record storage container creation command
525-
# Issue #6600 (https://github.com/Azure/azure-powershell/issues/6600)
526-
}
527-
else
528-
{
529-
throw;
530-
}
531-
}
532451

533452
# Trigger scan without scan ID
534453
try
535454
{
536455
Start-AzureRmSqlDatabaseVulnerabilityAssessmentScan -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
537-
}
456+
}
538457
catch
539458
{
540459
if ((Get-SqlTestMode) -eq 'Playback')
@@ -547,7 +466,7 @@ function Test-VulnerabilityAssessmentScanRecordGetListTest
547466
throw;
548467
}
549468
}
550-
469+
551470
# Trigger scan as a Job with scan ID
552471
$scanId1 = "cmdletGetListScan"
553472
$scanJob = Start-AzureRmSqlDatabaseVulnerabilityAssessmentScan -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -ScanId $scanId1 -AsJob
@@ -663,24 +582,8 @@ function Test-VulnerabilityAssessmentScanConvertTest
663582
# Turn on ATP
664583
Enable-AzureRmSqlServerAdvancedThreatProtection -ResourceGroupName $params.rgname -ServerName $params.serverName
665584

666-
# Set Vulnerability Assessment settings (SetSettingsWithStorageAccountNameParameterSet parameter set)
667-
try
668-
{
669-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
585+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
670586
-StorageAccountName $params.storageAccount
671-
}
672-
catch
673-
{
674-
if ((Get-SqlTestMode) -eq 'Playback')
675-
{
676-
# This command fails in Playback mode because the recorder do not record storage container creation command
677-
# Issue #6600 (https://github.com/Azure/azure-powershell/issues/6600)
678-
}
679-
else
680-
{
681-
throw;
682-
}
683-
}
684587

685588
# Convert scan without providing scan ID
686589
Assert-ThrowsContains -script { Convert-AzureRmSqlDatabaseVulnerabilityAssessmentScan -ResourceGroupName $params.rgname -ServerName $params.serverName `

0 commit comments

Comments
 (0)