Skip to content

Commit 16fe31d

Browse files
hotsnrdingmeng-xue
andauthored
Cover New-AzSqlElasticPool case for SQL maintenance (#14102)
* Cover New-Pool case for maintenance * Added test coverage Co-authored-by: Dingmeng Xue <[email protected]>
1 parent f2ccdd3 commit 16fe31d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,9 @@ function Test-CreateDatabaseWithMaintenanceConfigurationId
336336
# Create database with non-default maintenance
337337
$databaseName = Get-DatabaseName
338338
$mId = Get-PublicMaintenanceConfigurationId $location "DB_1"
339+
$mName = Get-PublicMaintenanceConfigurationName $location "DB_1"
339340
$db = New-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
340-
-DatabaseName $databaseName -Edition Premium -MaintenanceConfigurationId $mId -Force
341+
-DatabaseName $databaseName -Edition Premium -MaintenanceConfigurationId $mName -Force
341342
Assert-AreEqual $db.DatabaseName $databaseName
342343
Assert-NotNull $db.Edition
343344
Assert-NotNull $db.MaintenanceConfigurationId
@@ -648,8 +649,9 @@ function Test-UpdateDatabaseWithMaintenanceConfigurationId
648649

649650
# Alter database maintenance
650651
$mId = Get-PublicMaintenanceConfigurationId $location "DB_1"
652+
$mName = Get-PublicMaintenanceConfigurationName $location "DB_1"
651653
$sdb1 = Set-AzSqlDatabase -ResourceGroupName $db1.ResourceGroupName -ServerName $db1.ServerName -DatabaseName $db1.DatabaseName `
652-
-MaintenanceConfigurationId $mId
654+
-MaintenanceConfigurationId $mName
653655

654656
Assert-AreEqual $sdb1.DatabaseName $databaseName
655657
Assert-NotNull $sdb1.MaintenanceConfigurationId

src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,10 @@ function Test-CreateElasticPoolWithMaintenanceConfigurationId
201201

202202
# Create pool with non-default maintenance
203203
$poolName = Get-ElasticPoolName
204+
$mName = Get-PublicMaintenanceConfigurationName $location "DB_1"
204205
$mId = Get-PublicMaintenanceConfigurationId $location "DB_1"
205206
$ep = New-AzSqlElasticPool -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
206-
-ElasticPoolName $poolName -Edition Premium -MaintenanceConfigurationId $mId
207+
-ElasticPoolName $poolName -Edition Premium -MaintenanceConfigurationId $mName
207208
Assert-AreEqual $ep.ElasticPoolName $poolName
208209
Assert-NotNull $ep.Edition
209210
Assert-NotNull $ep.MaintenanceConfigurationId

src/Sql/Sql/Elastic Pools/Services/AzureSqlElasticPoolAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ internal AzureSqlElasticPoolModel CreateElasticPool(AzureSqlElasticPoolModel mod
112112
MaxCapacity = model.DatabaseCapacityMax
113113
},
114114
LicenseType = model.LicenseType,
115-
MaintenanceConfigurationId = model.MaintenanceConfigurationId,
115+
MaintenanceConfigurationId = MaintenanceConfigurationHelper.ConvertMaintenanceConfigurationIdArgument(model.MaintenanceConfigurationId, Context.Subscription.Id),
116116
});
117117

118118
return CreateElasticPoolModelFromResponse(model.ResourceGroupName, model.ServerName, resp);

0 commit comments

Comments
 (0)