Skip to content

Commit ed0301c

Browse files
akromm-zzakromm-zz
committed
Fixing tests and addressing some feedback.
1 parent 3d5af21 commit ed0301c

File tree

6 files changed

+40
-20
lines changed

6 files changed

+40
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function Test-RestoreGeoBackup
6666

6767
$geobackup = Get-AzureRmSqlDatabaseGeoBackup -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -DatabaseName $db.DatabaseName
6868
$job = $geobackup | Restore-AzureRmSqlDatabase -FromGeoBackup -TargetDatabaseName $restoredDbName -AsJob
69-
$job | WaitJob
69+
$job | Wait-Job
7070
}
7171

7272
function Test-RestoreDeletedDatabaseBackup
@@ -141,7 +141,7 @@ function Test-RestoreLongTermRetentionBackup
141141
$restoredDbName = "powershell_db_restored_ltr"
142142
$recoveryPointResourceId = "/subscriptions/e5e8af86-2d93-4ebd-8eb5-3b0184daa9de/resourceGroups/hchung/providers/Microsoft.RecoveryServices/vaults/hchung-testvault/backupFabrics/Azure/protectionContainers/AzureSqlContainer;Sql;hchung;hchung-testsvr/protectedItems/AzureSqlDb;dsName;hchung-testdb;fbf5641f-77f8-43b7-8fd7-5338ec293213/recoveryPoints/1731556986347"
143143

144-
Restore-AzureRmSqlDatabase -FromLongTermRetentionBackup -ResourceId $recoveryPointResourceId -TargetDatabaseName $restoredDbName`
144+
Restore-AzureRmSqlDatabase -FromLongTermRetentionBackup -ResourceId $recoveryPointResourceId -TargetDatabaseName $restoredDbName `
145145
-ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName
146146
}
147147

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ function Test-SwitchFailoverGroup()
368368
Param($fg)
369369

370370
$foGroup = Get-AzureRmSqlDatabaseFailoverGroup $fg.PartnerResourceGroupName $fg.PartnerServerName $fg.FailoverGroupName
371-
$job = $foGroup | Switch-AzureRmSqlDatabaseFailoverGroup
371+
$job = $foGroup | Switch-AzureRmSqlDatabaseFailoverGroup -AsJob
372372
$job | Wait-Job
373373

374374
$newSecondaryFg = $fg | Get-AzureRmSqlDatabaseFailoverGroup

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,9 @@ function Test-UpdateServer
6161
$serverPassword = "n3wc00lP@55w0rd"
6262
$secureString = ConvertTo-SecureString $serverPassword -AsPlainText -Force
6363

64-
$job = Set-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
65-
-SqlAdministratorPassword $secureString -AsJob
66-
$job | Wait-Job
67-
$server1 = $job.Output
68-
64+
$server1 = Set-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
65+
-SqlAdministratorPassword $secureString
66+
6967
Assert-AreEqual $server1.ServerName $server.ServerName
7068
Assert-AreEqual $server1.ServerVersion $server.ServerVersion
7169
Assert-AreEqual $server1.SqlAdministratorLogin $server.SqlAdministratorLogin

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ function Test-AddServerKeyVaultKey
2525
{
2626
$job = Add-AzureRmSqlServerKeyVaultKey -ServerName $params.serverName -ResourceGroupName $params.rgName -KeyId $params.keyId -AsJob
2727
$job | Wait-Job
28-
$keyResult = = $job
28+
$keyResult = $job.Output
29+
30+
# $keyResult = Add-AzureRmSqlServerKeyVaultKey -ServerName $params.serverName -ResourceGroupName $params.rgName -KeyId $params.keyId
2931

3032
Assert-AreEqual $params.keyId $keyResult.Uri
3133
Assert-AreEqual $params.serverKeyName $keyResult.ServerKeyName

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@ function Test-UpdateTransparentDataEncryption
3434
try
3535
{
3636
# Alter all properties
37-
$job = Set-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName `
38-
-State Enabled -AsJob
39-
$job | Wait-Job
40-
$tde1 = $job.Output
37+
$tde1 = Set-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName `
38+
-DatabaseName $db.DatabaseName -State Enabled
4139

4240
Assert-AreEqual $tde1.State Enabled
4341
}
@@ -65,21 +63,24 @@ function Test-GetTransparentDataEncryption
6563

6664
try
6765
{
68-
$tde1 = Get-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $server.ResourceGroupname -ServerName $server.ServerName -DatabaseName $db.DatabaseName
66+
$tde1 = Get-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $server.ResourceGroupname -ServerName $server.ServerName `
67+
-DatabaseName $db.DatabaseName
6968
Assert-AreEqual $tde1.State Enabled
7069

7170
$tde2 = $tde1 | Get-AzureRmSqlDatabaseTransparentDataEncryption
7271
Assert-AreEqual $tde2.State Enabled
7372

7473
# Alter all properties
75-
$tde3 = Set-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName `
76-
-State Disabled
74+
$tde3 = Set-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName `
75+
-DatabaseName $db.DatabaseName -State Disabled
7776
Assert-AreEqual $tde3.State Disabled
7877

79-
$tdeActivity = Get-AzureRmSqlDatabaseTransparentDataEncryptionActivity -ResourceGroupName $server.ResourceGroupname -ServerName $server.ServerName -DatabaseName $db.DatabaseName
78+
$tdeActivity = Get-AzureRmSqlDatabaseTransparentDataEncryptionActivity -ResourceGroupName $server.ResourceGroupname `
79+
-ServerName $server.ServerName -DatabaseName $db.DatabaseName
8080
Assert-AreEqual $tdeActivity.Status Decrypting
8181

82-
$tde4 = Get-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $server.ResourceGroupname -ServerName $server.ServerName -DatabaseName $db.DatabaseName
82+
$tde4 = Get-AzureRmSqlDatabaseTransparentDataEncryption -ResourceGroupName $server.ResourceGroupname `
83+
-ServerName $server.ServerName -DatabaseName $db.DatabaseName
8384
Assert-AreEqual $tde4.State Disabled
8485
}
8586
finally
@@ -133,7 +134,11 @@ function Test-SetTransparentDataEncryptionProtector
133134
Assert-AreEqual $params.keyId $keyResult.Uri
134135

135136
# Rotate to AKV
136-
$encProtector2 = Set-AzureRmSqlServerTransparentDataEncryptionProtector -ResourceGroupName $params.rgName -ServerName $params.serverName -Type AzureKeyVault -KeyId $params.keyId -Force
137+
$job = Set-AzureRmSqlServerTransparentDataEncryptionProtector -ResourceGroupName $params.rgName -ServerName $params.serverName `
138+
-Type AzureKeyVault -KeyId $params.keyId -Force -AsJob
139+
$job | Wait-Job
140+
$encProtector2 = $job.Output
141+
137142
Assert-AreEqual AzureKeyVault $encProtector2.Type
138143
Assert-AreEqual $params.serverKeyName $encProtector2.ServerKeyVaultKeyName
139144

‎src/ResourceManager/Sql/Commands.Sql/ServiceObjective/Cmdlet/AzureSqlServerServiceObjectiveCmdletBase.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Microsoft.Azure.Commands.Sql.Common;
1818
using Microsoft.Azure.Commands.Sql.ServiceObjective.Adapter;
1919
using Microsoft.Azure.Commands.Sql.ServiceObjective.Model;
20+
using System;
2021
using System.Collections.Generic;
2122
using System.Management.Automation;
2223

@@ -34,7 +35,21 @@ public abstract class AzureSqlServerServiceObjectiveCmdletBase
3435
HelpMessage = "SQL Database server name.")]
3536
[ValidateNotNullOrEmpty]
3637
public string ServerName { get; set; }
37-
38+
39+
/// Gets or sets the name of the database to use.
40+
/// </summary>
41+
/// <remarks>
42+
/// This parameter is not needed or used. It will be removed in a future release.
43+
/// </remarks>
44+
[Parameter(Mandatory = false,
45+
ValueFromPipelineByPropertyName = true,
46+
Position = 2,
47+
HelpMessage = "SQL Database name.",
48+
DontShow = true)]
49+
[ValidateNotNullOrEmpty]
50+
[Obsolete("This parameter is not needed or used. It will be removed in a future release.")]
51+
public string DatabaseName { get; set; }
52+
3853
/// <summary>
3954
/// Intializes the model adapter
4055
/// </summary>

0 commit comments

Comments
 (0)