@@ -158,8 +158,8 @@ function Test-VulnerabilityAssessmentManagedInstanceSettingsTest
158
158
159
159
# Validate the settings
160
160
Assert-AreEqual $params.rgname $settings.ResourceGroupName
161
- Assert-AreEqual $params.serverName $settings.ManagedInstanceName
162
- Assert-AreEqual $params.databaseName $settings.ManagedDatabaseName
161
+ Assert-AreEqual $params.serverName $settings.InstanceName
162
+ Assert-AreEqual $params.databaseName $settings.DatabaseName
163
163
Assert-AreEqual " vulnerability-assessment" $settings.ScanResultsContainerName
164
164
Assert-AreEqual $params.storageAccount $settings.StorageAccountName
165
165
Assert-AreEqual None $settings.RecurringScansInterval
@@ -180,8 +180,8 @@ function Test-VulnerabilityAssessmentManagedInstanceSettingsTest
180
180
181
181
# Validate the settings
182
182
Assert-AreEqual $params.rgname $settings.ResourceGroupName
183
- Assert-AreEqual $params.serverName $settings.ManagedInstanceName
184
- Assert-AreEqual $params.databaseName $settings.ManagedDatabaseName
183
+ Assert-AreEqual $params.serverName $settings.InstanceName
184
+ Assert-AreEqual $params.databaseName $settings.DatabaseName
185
185
Assert-AreEqual " vulnerability-assessment" $settings.ScanResultsContainerName
186
186
Assert-AreEqual $params.storageAccount $settings.StorageAccountName
187
187
Assert-AreEqual $testRecurringScansInterval $settings.RecurringScansInterval
@@ -211,26 +211,26 @@ function Test-VulnerabilityAssessmentManagedInstanceSettingsTest
211
211
- NotificationEmail $testNotificationEmail
212
212
213
213
# Test piping of set settings from resource object
214
- $newManagedDatabaseName = " newManagedDatabaseName" ;
214
+ $newDatabaseName = " newManagedDatabaseName" ;
215
215
$testNewNotificationEmail = @ (
" [email protected] " , " [email protected] " )
216
216
$testStorageName = $params.storageAccount
217
217
$testBlobStorageSasUri = " https://" + $testStorageName + " .blob.core.windows.net/" + $testScanResultsContainerName + " ?st=XXXXXXXXXXXXXXX"
218
218
$testRecurringScansInterval = [Microsoft.Azure.Commands.Sql.VulnerabilityAssessment.Model.RecurringScansInterval ]::None
219
219
220
220
$collation = " SQL_Latin1_General_CP1_CI_AS"
221
- New-AzSqlInstanceDatabase - Name $newManagedDatabaseName - ResourceGroupName $params.rgname - InstanceName $params.serverName - Collation $collation
221
+ New-AzSqlInstanceDatabase - Name $newDatabaseName - ResourceGroupName $params.rgname - InstanceName $params.serverName - Collation $collation
222
222
223
- Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings - ResourceGroupName $params.rgname - InstanceName $params.serverName - DatabaseName $newManagedDatabaseName `
223
+ Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings - ResourceGroupName $params.rgname - InstanceName $params.serverName - DatabaseName $newDatabaseName `
224
224
- BlobStorageSasUri $testBlobStorageSasUri - RecurringScansInterval $testRecurringScansInterval - EmailAdmins $testEmailAdmins `
225
225
- NotificationEmail $testNewNotificationEmail
226
226
227
- Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings - ResourceGroupName $params.rgname - InstanceName $params.serverName - DatabaseName $newManagedDatabaseName | Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings `
227
+ Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings - ResourceGroupName $params.rgname - InstanceName $params.serverName - DatabaseName $newDatabaseName | Update-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings `
228
228
- ResourceGroupName $params.rgname - InstanceName $params.serverName - DatabaseName $params.databaseName
229
229
$settings = Get-AzSqlInstanceDatabaseVulnerabilityAssessmentSettings - ResourceGroupName $params.rgname - InstanceName $params.serverName - DatabaseName $params.databaseName
230
230
231
231
Assert-AreEqual $params.rgname $settings.ResourceGroupName
232
- Assert-AreEqual $params.serverName $settings.ManagedInstanceName
233
- Assert-AreEqual $params.databaseName $settings.ManagedDatabaseName
232
+ Assert-AreEqual $params.serverName $settings.InstanceName
233
+ Assert-AreEqual $params.databaseName $settings.DatabaseName
234
234
Assert-AreEqual $testScanResultsContainerName $settings.ScanResultsContainerName
235
235
Assert-AreEqual $testStorageName $settings.StorageAccountName
236
236
Assert-AreEqual $testRecurringScansInterval $settings.RecurringScansInterval
@@ -242,8 +242,8 @@ function Test-VulnerabilityAssessmentManagedInstanceSettingsTest
242
242
243
243
# Validate the settings
244
244
Assert-AreEqual $params.rgname $settings.ResourceGroupName
245
- Assert-AreEqual $params.serverName $settings.ManagedInstanceName
246
- Assert-AreEqual $params.databaseName $settings.ManagedDatabaseName
245
+ Assert-AreEqual $params.serverName $settings.InstanceName
246
+ Assert-AreEqual $params.databaseName $settings.DatabaseName
247
247
Assert-AreEqual $testScanResultsContainerName $settings.ScanResultsContainerName
248
248
Assert-AreEqual $testStorageName $settings.StorageAccountName
249
249
Assert-AreEqual $testRecurringScansInterval $settings.RecurringScansInterval
@@ -321,8 +321,8 @@ function Test-VulnerabilityAssessmentManagedInstanceBaselineTest
321
321
- RuleId $ruleId
322
322
323
323
Assert-AreEqual $params.rgname $baseline.ResourceGroupName
324
- Assert-AreEqual $params.serverName $baseline.ManagedInstanceName
325
- Assert-AreEqual $params.databaseName $baseline.ManagedDatabaseName
324
+ Assert-AreEqual $params.serverName $baseline.InstanceName
325
+ Assert-AreEqual $params.databaseName $baseline.DatabaseName
326
326
Assert-AreEqual $ruleId $baseline.RuleId
327
327
Assert-AreEqual $false $baseline.RuleAppliesToMaster
328
328
Assert-AreEqualArray $baselineToSet [0 ] $baseline.BaselineResult [0 ].Result
@@ -338,8 +338,8 @@ function Test-VulnerabilityAssessmentManagedInstanceBaselineTest
338
338
- RuleId $ruleId
339
339
340
340
Assert-AreEqual $params.rgname $baseline.ResourceGroupName
341
- Assert-AreEqual $params.serverName $baseline.ManagedInstanceName
342
- Assert-AreEqual $params.databaseName $baseline.ManagedDatabaseName
341
+ Assert-AreEqual $params.serverName $baseline.InstanceName
342
+ Assert-AreEqual $params.databaseName $baseline.DatabaseName
343
343
Assert-AreEqual $ruleId $baseline.RuleId
344
344
Assert-AreEqual $false $baseline.RuleAppliesToMaster
345
345
Assert-AreEqualArray $baselineToSet [0 ] $baseline.BaselineResult [0 ].Result
@@ -373,8 +373,8 @@ function Test-VulnerabilityAssessmentManagedInstanceBaselineTest
373
373
$baseline = Get-AzSqlInstanceDatabase - ResourceGroupName $params.rgname - InstanceName $params.serverName - Name $params.databaseName `
374
374
| Get-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline - RuleId $ruleId - RuleAppliesToMaster
375
375
Assert-AreEqual $params.rgname $baseline.ResourceGroupName
376
- Assert-AreEqual $params.serverName $baseline.ManagedInstanceName
377
- Assert-AreEqual $params.databaseName $baseline.ManagedDatabaseName
376
+ Assert-AreEqual $params.serverName $baseline.InstanceName
377
+ Assert-AreEqual $params.databaseName $baseline.DatabaseName
378
378
Assert-AreEqual $ruleId $baseline.RuleId
379
379
Assert-AreEqual $true $baseline.RuleAppliesToMaster
380
380
Assert-AreEqualArray $baselineToSet [0 ] $baseline.BaselineResult [0 ].Result
@@ -393,8 +393,8 @@ function Test-VulnerabilityAssessmentManagedInstanceBaselineTest
393
393
$baseline = Get-AzSqlInstanceDatabase - ResourceGroupName $params.rgname - InstanceName $params.serverName - Name $params.databaseName | Get-AzSqlInstanceDatabaseVulnerabilityAssessmentRuleBaseline `
394
394
- RuleId $ruleId
395
395
Assert-AreEqual $params.rgname $baseline.ResourceGroupName
396
- Assert-AreEqual $params.serverName $baseline.ManagedInstanceName
397
- Assert-AreEqual $params.databaseName $baseline.ManagedDatabaseName
396
+ Assert-AreEqual $params.serverName $baseline.InstanceName
397
+ Assert-AreEqual $params.databaseName $baseline.DatabaseName
398
398
Assert-AreEqual $ruleId $baseline.RuleId
399
399
Assert-AreEqual $false $baseline.RuleAppliesToMaster
400
400
Assert-AreEqualArray $baselineToSet [0 ] $baseline.BaselineResult [0 ].Result
@@ -476,8 +476,8 @@ function Test-VulnerabilityAssessmentManagedInstanceScanRecordGetListTest
476
476
477
477
# Validate the scan record that we got from the scan
478
478
Assert-AreEqual $params.rgname $scanRecord1.ResourceGroupName
479
- Assert-AreEqual $params.serverName $scanRecord1.ManagedInstanceName
480
- Assert-AreEqual $params.databaseName $scanRecord1.ManagedDatabaseName
479
+ Assert-AreEqual $params.serverName $scanRecord1.InstanceName
480
+ Assert-AreEqual $params.databaseName $scanRecord1.DatabaseName
481
481
Assert-AreEqual $scanId1 $scanRecord1.ScanId
482
482
Assert-AreEqual " OnDemand" $scanRecord1.TriggerType
483
483
@@ -486,8 +486,8 @@ function Test-VulnerabilityAssessmentManagedInstanceScanRecordGetListTest
486
486
- DatabaseName $params.databaseName - ScanId $scanId1
487
487
488
488
Assert-AreEqual $scanRecord1FromGet.ResourceGroupName $scanRecord1.ResourceGroupName
489
- Assert-AreEqual $scanRecord1FromGet.ManagedInstanceName $scanRecord1.ManagedInstanceName
490
- Assert-AreEqual $scanRecord1FromGet.ManagedDatabaseName $scanRecord1.ManagedDatabaseName
489
+ Assert-AreEqual $scanRecord1FromGet.InstanceName $scanRecord1.InstanceName
490
+ Assert-AreEqual $scanRecord1FromGet.DatabaseName $scanRecord1.DatabaseName
491
491
Assert-AreEqual $scanRecord1FromGet.ScanId $scanRecord1.ScanId
492
492
Assert-AreEqual $scanRecord1FromGet.TriggerType $scanRecord1.TriggerType
493
493
Assert-AreEqual $scanRecord1FromGet.State $scanRecord1.State
@@ -502,8 +502,8 @@ function Test-VulnerabilityAssessmentManagedInstanceScanRecordGetListTest
502
502
- ScanId $scanId1
503
503
504
504
Assert-AreEqual $scanRecord1FromGet.ResourceGroupName $scanRecord1.ResourceGroupName
505
- Assert-AreEqual $scanRecord1FromGet.ManagedInstanceName $scanRecord1.ManagedInstanceName
506
- Assert-AreEqual $scanRecord1FromGet.ManagedDatabaseName $scanRecord1.ManagedDatabaseName
505
+ Assert-AreEqual $scanRecord1FromGet.InstanceName $scanRecord1.InstanceName
506
+ Assert-AreEqual $scanRecord1FromGet.DatabaseName $scanRecord1.DatabaseName
507
507
Assert-AreEqual $scanRecord1FromGet.ScanId $scanRecord1.ScanId
508
508
Assert-AreEqual $scanRecord1FromGet.TriggerType $scanRecord1.TriggerType
509
509
Assert-AreEqual $scanRecord1FromGet.State $scanRecord1.State
@@ -520,8 +520,8 @@ function Test-VulnerabilityAssessmentManagedInstanceScanRecordGetListTest
520
520
521
521
$scanRecord1FromListCmdlet = $scanRecordList [$excpectedScanCount - 1 ]
522
522
Assert-AreEqual $scanRecord1FromListCmdlet.ResourceGroupName $scanRecord1.ResourceGroupName
523
- Assert-AreEqual $scanRecord1FromListCmdlet.ManagedInstanceName $scanRecord1.ManagedInstanceName
524
- Assert-AreEqual $scanRecord1FromListCmdlet.ManagedDatabaseName $scanRecord1.ManagedDatabaseName
523
+ Assert-AreEqual $scanRecord1FromListCmdlet.InstanceName $scanRecord1.InstanceName
524
+ Assert-AreEqual $scanRecord1FromListCmdlet.DatabaseName $scanRecord1.DatabaseName
525
525
Assert-AreEqual $scanRecord1FromListCmdlet.ScanId $scanRecord1.ScanId
526
526
Assert-AreEqual $scanRecord1FromListCmdlet.TriggerType $scanRecord1.TriggerType
527
527
Assert-AreEqual $scanRecord1FromListCmdlet.State $scanRecord1.State
@@ -542,8 +542,8 @@ function Test-VulnerabilityAssessmentManagedInstanceScanRecordGetListTest
542
542
543
543
$scanRecord1FromListCmdlet = $scanRecordList [$excpectedScanCount - 1 ]
544
544
Assert-AreEqual $scanRecord1FromListCmdlet.ResourceGroupName $scanRecord1.ResourceGroupName
545
- Assert-AreEqual $scanRecord1FromListCmdlet.ManagedInstanceName $scanRecord1.ManagedInstanceName
546
- Assert-AreEqual $scanRecord1FromListCmdlet.ManagedDatabaseName $scanRecord1.ManagedDatabaseName
545
+ Assert-AreEqual $scanRecord1FromListCmdlet.InstanceName $scanRecord1.InstanceName
546
+ Assert-AreEqual $scanRecord1FromListCmdlet.DatabaseName $scanRecord1.DatabaseName
547
547
Assert-AreEqual $scanRecord1FromListCmdlet.ScanId $scanRecord1.ScanId
548
548
Assert-AreEqual $scanRecord1FromListCmdlet.TriggerType $scanRecord1.TriggerType
549
549
Assert-AreEqual $scanRecord1FromListCmdlet.State $scanRecord1.State
@@ -599,8 +599,8 @@ function Test-VulnerabilityAssessmentManagedInstanceScanConvertTest
599
599
- ScanId $scanId
600
600
601
601
Assert-AreEqual $params.rgname $convertScanObject.ResourceGroupName
602
- Assert-AreEqual $params.serverName $convertScanObject.ManagedInstanceName
603
- Assert-AreEqual $params.databaseName $convertScanObject.ManagedDatabaseName
602
+ Assert-AreEqual $params.serverName $convertScanObject.InstanceName
603
+ Assert-AreEqual $params.databaseName $convertScanObject.DatabaseName
604
604
Assert-True - script { $convertScanObject.ExportedReportLocation.Contains ($scanId ) }
605
605
Assert-True - script { $convertScanObject.ExportedReportLocation.Contains ($params.storageAccount ) }
606
606
@@ -612,8 +612,8 @@ function Test-VulnerabilityAssessmentManagedInstanceScanConvertTest
612
612
- ScanId $scanId | Convert-AzSqlInstanceDatabaseVulnerabilityAssessmentScan
613
613
614
614
Assert-AreEqual $params.rgname $convertScanObject.ResourceGroupName
615
- Assert-AreEqual $params.serverName $convertScanObject.ManagedInstanceName
616
- Assert-AreEqual $params.databaseName $convertScanObject.ManagedDatabaseName
615
+ Assert-AreEqual $params.serverName $convertScanObject.InstanceName
616
+ Assert-AreEqual $params.databaseName $convertScanObject.DatabaseName
617
617
Assert-True - script { $convertScanObject.ExportedReportLocation.Contains ($scanId ) }
618
618
Assert-True - script { $convertScanObject.ExportedReportLocation.Contains ($params.storageAccount ) }
619
619
0 commit comments