Skip to content

Commit b996fe7

Browse files
yaakoviyunyaakoviyun
committed
Revert "Updating tests"
This reverts commit 3a0414b.
1 parent 3a0414b commit b996fe7

File tree

7 files changed

+12096
-13673
lines changed

7 files changed

+12096
-13673
lines changed

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

Lines changed: 108 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,24 @@ 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-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
153+
# Update Vulnerability Assessment settings (UpdateSettingsWithStorageAccountNameParameterSet parameter set)
154+
try
155+
{
156+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
154157
-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+
}
155171

156172
# Get Vulnerability Assessment settings
157173
$settings = Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
@@ -163,17 +179,34 @@ function Test-VulnerabilityAssessmentSettingsTest
163179
Assert-AreEqual "vulnerability-assessment" $settings.ScanResultsContainerName
164180
Assert-AreEqual $params.storageAccount $settings.StorageAccountName
165181
Assert-AreEqual None $settings.RecurringScansInterval
166-
Assert-AreEqual $true $settings.EmailAdmins
182+
Assert-AreEqual $false $settings.EmailAdmins
167183
Assert-AreEqualArray @() $settings.NotificationEmail
168184

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

174-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
191+
# Update Vulnerability Assessment settings (UpdateSettingsWithStorageAccountNameParameterSet parameter set)
192+
try
193+
{
194+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
175195
-RecurringScansInterval $testRecurringScansInterval -EmailAdmins $testEmailAdmins `
176196
-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+
}
177210

178211
# Get Vulnerability Assessment settings
179212
$settings = Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
@@ -182,7 +215,7 @@ function Test-VulnerabilityAssessmentSettingsTest
182215
Assert-AreEqual $params.rgname $settings.ResourceGroupName
183216
Assert-AreEqual $params.serverName $settings.ServerName
184217
Assert-AreEqual $params.databaseName $settings.DatabaseName
185-
Assert-AreEqual "vulnerability-assessment" $settings.ScanResultsContainerName
218+
Assert-AreEqual $testScanResultsContainerName $settings.ScanResultsContainerName
186219
Assert-AreEqual $params.storageAccount $settings.StorageAccountName
187220
Assert-AreEqual $testRecurringScansInterval $settings.RecurringScansInterval
188221
Assert-AreEqual $testEmailAdmins $settings.EmailAdmins
@@ -223,8 +256,24 @@ function Test-VulnerabilityAssessmentSettingsTest
223256
-BlobStorageSasUri $testBlobStorageSasUri -RecurringScansInterval $testRecurringScansInterval -EmailAdmins $testEmailAdmins `
224257
-NotificationEmail $testNewNotificationEmail
225258

226-
Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $newDatabaseName | Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings `
259+
try
260+
{
261+
Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $newDatabaseName | Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings `
227262
-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+
228277
$settings = Get-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
229278

230279
Assert-AreEqual $params.rgname $settings.ResourceGroupName
@@ -297,9 +346,25 @@ function Test-VulnerabilityAssessmentBaselineTest
297346
# Turn on ATP
298347
Enable-AzureRmSqlServerAdvancedThreatProtection -ResourceGroupName $params.rgname -ServerName $params.serverName
299348

300-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
349+
# Set Vulnerability Assessment settings (SetSettingsWithStorageAccountNameParameterSet parameter set)
350+
try
351+
{
352+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
301353
-StorageAccountName $params.storageAccount
302-
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+
303368
$ruleId = "VA2108"
304369

305370
# Get and remove baseline for non existing baseline
@@ -446,14 +511,30 @@ function Test-VulnerabilityAssessmentScanRecordGetListTest
446511
# Turn on ATP
447512
Enable-AzureRmSqlServerAdvancedThreatProtection -ResourceGroupName $params.rgname -ServerName $params.serverName
448513

449-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
514+
# Set Vulnerability Assessment settings (SetSettingsWithStorageAccountNameParameterSet parameter set)
515+
try
516+
{
517+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
450518
-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+
}
451532

452533
# Trigger scan without scan ID
453534
try
454535
{
455536
Start-AzureRmSqlDatabaseVulnerabilityAssessmentScan -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
456-
}
537+
}
457538
catch
458539
{
459540
if ((Get-SqlTestMode) -eq 'Playback')
@@ -466,7 +547,7 @@ function Test-VulnerabilityAssessmentScanRecordGetListTest
466547
throw;
467548
}
468549
}
469-
550+
470551
# Trigger scan as a Job with scan ID
471552
$scanId1 = "cmdletGetListScan"
472553
$scanJob = Start-AzureRmSqlDatabaseVulnerabilityAssessmentScan -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -ScanId $scanId1 -AsJob
@@ -582,8 +663,24 @@ function Test-VulnerabilityAssessmentScanConvertTest
582663
# Turn on ATP
583664
Enable-AzureRmSqlServerAdvancedThreatProtection -ResourceGroupName $params.rgname -ServerName $params.serverName
584665

585-
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
666+
# Set Vulnerability Assessment settings (SetSettingsWithStorageAccountNameParameterSet parameter set)
667+
try
668+
{
669+
Update-AzureRmSqlDatabaseVulnerabilityAssessmentSettings -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName `
586670
-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+
}
587684

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

0 commit comments

Comments
 (0)