Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cover New-AzSqlElasticPool case for SQL maintenance #14102

Merged
merged 3 commits into from
Feb 3, 2021
Merged

Cover New-AzSqlElasticPool case for SQL maintenance #14102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba7ffcd
Cover New-Pool case for maintenance
hotsnr Feb 2, 2021
3d6719c
Added test coverage
hotsnr Feb 2, 2021
6c8ad6c
Merge branch 'release-2021-02-09' into rohkot/fix-sqlpool-maintenance
dingmeng-xue Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,9 @@ function Test-CreateDatabaseWithMaintenanceConfigurationId
# Create database with non-default maintenance
$databaseName = Get-DatabaseName
$mId = Get-PublicMaintenanceConfigurationId $location "DB_1"
$mName = Get-PublicMaintenanceConfigurationName $location "DB_1"
$db = New-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
-DatabaseName $databaseName -Edition Premium -MaintenanceConfigurationId $mId -Force
-DatabaseName $databaseName -Edition Premium -MaintenanceConfigurationId $mName -Force
Assert-AreEqual $db.DatabaseName $databaseName
Assert-NotNull $db.Edition
Assert-NotNull $db.MaintenanceConfigurationId
Expand Down Expand Up @@ -648,8 +649,9 @@ function Test-UpdateDatabaseWithMaintenanceConfigurationId

# Alter database maintenance
$mId = Get-PublicMaintenanceConfigurationId $location "DB_1"
$mName = Get-PublicMaintenanceConfigurationName $location "DB_1"
$sdb1 = Set-AzSqlDatabase -ResourceGroupName $db1.ResourceGroupName -ServerName $db1.ServerName -DatabaseName $db1.DatabaseName `
-MaintenanceConfigurationId $mId
-MaintenanceConfigurationId $mName

Assert-AreEqual $sdb1.DatabaseName $databaseName
Assert-NotNull $sdb1.MaintenanceConfigurationId
Expand Down
3 changes: 2 additions & 1 deletion src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@ function Test-CreateElasticPoolWithMaintenanceConfigurationId

# Create pool with non-default maintenance
$poolName = Get-ElasticPoolName
$mName = Get-PublicMaintenanceConfigurationName $location "DB_1"
$mId = Get-PublicMaintenanceConfigurationId $location "DB_1"
$ep = New-AzSqlElasticPool -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
-ElasticPoolName $poolName -Edition Premium -MaintenanceConfigurationId $mId
-ElasticPoolName $poolName -Edition Premium -MaintenanceConfigurationId $mName
Assert-AreEqual $ep.ElasticPoolName $poolName
Assert-NotNull $ep.Edition
Assert-NotNull $ep.MaintenanceConfigurationId
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql/Elastic Pools/Services/AzureSqlElasticPoolAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ internal AzureSqlElasticPoolModel CreateElasticPool(AzureSqlElasticPoolModel mod
MaxCapacity = model.DatabaseCapacityMax
},
LicenseType = model.LicenseType,
MaintenanceConfigurationId = model.MaintenanceConfigurationId,
MaintenanceConfigurationId = MaintenanceConfigurationHelper.ConvertMaintenanceConfigurationIdArgument(model.MaintenanceConfigurationId, Context.Subscription.Id),
});

return CreateElasticPoolModelFromResponse(model.ResourceGroupName, model.ServerName, resp);
Expand Down