Skip to content

[SQL DB] Added Information Message that will be displayed Aure SQL DB with GeoDr link is migrated to Hyperscale edition #27530

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.

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

Merged
merged 6 commits into from
Apr 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -1393,8 +1393,8 @@ function Test-DatabaseUpdateWithPerDBCMK ($location = "eastus2euap")
# Setup
$rg = Create-ResourceGroupForTest
$server = Create-ServerForTest $rg $location
$encryptionProtector = "https://pstestkv.vault.azure.net/keys/testkey/f62d937858464f329ab4a8c2dc7e0fa4"
$umi = "/subscriptions/2c647056-bab2-4175-b172-493ff049eb29/resourceGroups/pstest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pstestumi"
$encryptionProtector = "https://kvpstest.vault.azure.net/keys/pstestkey/1493a5e6d9e34b429276c02457e42c0c"
$umi = "/subscriptions/10a238d6-a139-46d0-818d-d091394072b6/resourceGroups/pstest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pstestumi"

# Create with per db cmk enabled
$databaseName = Get-DatabaseName
Expand All @@ -1405,7 +1405,7 @@ function Test-DatabaseUpdateWithPerDBCMK ($location = "eastus2euap")
Assert-AreEqual $databaseFromGet.EncryptionProtector $encryptionProtector

# Update the db with new EncryptionProtector
$encryptionProtector2 = "https://pstestkv.vault.azure.net/keys/testkey1/6218d117492a42eda0b6a9334c9a989d"
$encryptionProtector2 = "https://kvpstest.vault.azure.net/keys/pstestkey1/f6143120ccd3400c94e244799d6d00d1"
$dbAfterUpdate = Set-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -EncryptionProtector $encryptionProtector2 -EncryptionProtectorAutoRotation:$false

$databaseGetAfterUpdate = Get-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
Expand Down
21 changes: 11 additions & 10 deletions src/Sql/Sql.Test/ScenarioTests/ElasticPoolCrudTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -639,19 +639,20 @@ function Test-UpdateElasticPoolWithPreferredEnclaveType
.SYNOPSIS
Tests moving a database out of a Hyperscale elastic pool
#>
function Test-MoveDatabaseOutHyperscaleElasticPool
function Test-MoveDatabaseOutHyperscaleElasticPool($location = "uksouth")
{
# Setup
$location = "East US 2 EUAP"
$rg = "pstest"
$server = "canarysvr1"
$rg = Create-ResourceGroupForTest $location
$server = Create-ServerForTest $rg $location

try
{
# Create Hyperscale elastic pool
$poolName = Get-ElasticPoolName
$ep1 = New-AzSqlElasticPool -ServerName $server -ResourceGroupName $rg `
-ElasticPoolName $poolName -VCore 4 -Edition Hyperscale -ComputeGeneration Gen5 -HighAvailabilityReplicaCount 2
$job = New-AzSqlElasticPool -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName `
-ElasticPoolName $poolName -VCore 4 -Edition "Hyperscale" -ComputeGeneration "Gen5" -HighAvailabilityReplicaCount 2 -AsJob
$job | Wait-Job
$ep1 = $job.Output

Assert-NotNull $ep1
Assert-AreEqual Hyperscale $ep1.Edition
Expand All @@ -660,23 +661,23 @@ function Test-MoveDatabaseOutHyperscaleElasticPool

# Create database inside pool
$databaseName = Get-DatabaseName
$db = New-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -ElasticPoolName $poolName
$db = New-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -ElasticPoolName $poolName

Assert-NotNull $db
Assert-AreEqual Hyperscale $db.Edition
Assert-AreEqual 2 $db.HighAvailabilityReplicaCount

#Move database out of elastic pool
$db = Set-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -Edition "Hyperscale" -Vcore 4 -ComputeGeneration "Gen5"
$db = Set-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -Edition "Hyperscale" -Vcore 4 -ComputeGeneration "Gen5"
Assert-NotNull $db
Assert-AreEqual Hyperscale $db.Edition
Assert-AreEqual 4 $db.Capacity
Assert-AreEqual 2 $db.HighAvailabilityReplicaCount
}
finally
{
Remove-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName
Remove-AzSqlElasticPool -ElasticPoolName $poolName -ResourceGroupName $rg -ServerName $server
Remove-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
Remove-AzSqlElasticPool -ElasticPoolName $poolName -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/Sql/Sql.Test/ScenarioTests/ReadScaleCrudTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.SYNOPSIS
Tests create and update a database with read scale option
#>
function Test-CreateUpdateDatabaseReadScale ($serverVersion = "12.0", $location = "West Europe")
function Test-CreateUpdateDatabaseReadScale ($serverVersion = "12.0", $location = "uksouth")
{
# Setup
$rg = Create-ResourceGroupForTest
Expand Down Expand Up @@ -44,7 +44,7 @@ function Test-CreateUpdateDatabaseReadScale ($serverVersion = "12.0", $location
.SYNOPSIS
Tests Getting a database read scale option
#>
function Test-GetDatabaseReadScale ($serverVersion = "12.0", $location = "West Europe")
function Test-GetDatabaseReadScale ($serverVersion = "12.0", $location = "uksouth")
{
# Setup
$rg = Create-ResourceGroupForTest
Expand Down Expand Up @@ -81,7 +81,7 @@ function Test-GetDatabaseReadScale ($serverVersion = "12.0", $location = "West E
.SYNOPSIS
Tests database HighAvailabilityReplicaCount option
#>
function Test-DatabaseReadReplicaCount ($serverVersion = "12.0", $location = "West Europe")
function Test-DatabaseReadReplicaCount ($serverVersion = "12.0", $location = "uksouth")
{
# Setup
$rg = Create-ResourceGroupForTest
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading