diff --git a/src/ResourceManager/Sql/AzureRM.Sql.Netcore.psd1 b/src/ResourceManager/Sql/AzureRM.Sql.Netcore.psd1 index 32b23bdc18c2..7c3bb4224808 100644 --- a/src/ResourceManager/Sql/AzureRM.Sql.Netcore.psd1 +++ b/src/ResourceManager/Sql/AzureRM.Sql.Netcore.psd1 @@ -139,9 +139,7 @@ CmdletsToExport = 'Get-AzureRmSqlDatabaseTransparentDataEncryption', 'Remove-AzureRmSqlDatabaseLongTermRetentionBackup', 'Get-AzureRmSqlDeletedDatabaseBackup', 'Get-AzureRmSqlDatabaseGeoBackup', - 'Get-AzureRmSqlServerBackupLongTermRetentionVault', 'Restore-AzureRmSqlDatabase', - 'Set-AzureRmSqlServerBackupLongTermRetentionVault', 'Get-AzureRmSqlDatabaseRestorePoints', 'Get-AzureRmSqlDatabaseAuditingPolicy', 'Get-AzureRmSqlServerAuditingPolicy', diff --git a/src/ResourceManager/Sql/ChangeLog.md b/src/ResourceManager/Sql/ChangeLog.md index 92e49c045054..e3eaf9cfcfe4 100644 --- a/src/ResourceManager/Sql/ChangeLog.md +++ b/src/ResourceManager/Sql/ChangeLog.md @@ -18,6 +18,9 @@ - Additional information about change #1 --> ## Current Release +* Deprecated unsupported LongTermRetention cmdlets: + * Get-AzureRmSqlServerBackupLongTermRetentionVault + * Set-AzureRmSqlServerBackupLongTermRetentionVault ## Version 4.8.1-preview * Bug fixes for cmdlets in Elastic Jobs diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.cs index b09dd3d948bf..55beebc3b8be 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.cs +++ b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.cs @@ -67,17 +67,6 @@ public void TestRestorePointInTimeBackup() RunPowerShellTest("Test-RestorePointInTimeBackup"); } } - [Fact] - [Trait(Category.AcceptanceType, Category.CheckIn)] - public void TestServerBackupLongTermRetentionVault() - { - // TODO Rewrite SQL backup tests to be recordable - // TODO https://github.com/Azure/azure-powershell/issues/4155 - if (TestMockSupport.RunningMocked) - { - RunPowerShellTest("Test-ServerBackupLongTermRetentionVault"); - } - } [Fact(Skip = "LTR-V1 restore service is retiring in Prod.")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestRestoreLongTermRetentionBackup() diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.ps1 b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.ps1 index 45e9f48302e6..10962fb26251 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.ps1 +++ b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.ps1 @@ -121,22 +121,6 @@ function Test-RestorePointInTimeBackup -ServerName $db.ServerName -ResourceId $db.ResourceId -Edition 'GeneralPurpose' -VCore 2 -ComputeGeneration 'Gen4' } -function Test-ServerBackupLongTermRetentionVault -{ - $location = "North Europe" - $serverVersion = "12.0" - $rg = Get-AzureRmResourceGroup -ResourceGroupName hchung - $server = Get-AzureRmSqlServer -ServerName hchung-testsvr -ResourceGroupName $rg.ResourceGroupName - $vaultResourceId = "/subscriptions/e5e8af86-2d93-4ebd-8eb5-3b0184daa9de/resourceGroups/hchung/providers/Microsoft.RecoveryServices/vaults/hchung-testvault" - - # set - Set-AzureRmSqlServerBackupLongTermRetentionVault -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName -ResourceId $vaultResourceId - # get - $result = Get-AzureRmSqlServerBackupLongTermRetentionVault -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName - #verify - Assert-True { $result.RecoveryServicesVaultResourceId -eq $vaultResourceId } -} - function Test-DatabaseBackupLongTermRetentionPolicy { $location = "North Europe" diff --git a/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/GetAzureSqlServerBackupLongTermRetentionVault.cs b/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/GetAzureSqlServerBackupLongTermRetentionVault.cs index 03ff4cfa06ad..3fc3893081e9 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/GetAzureSqlServerBackupLongTermRetentionVault.cs +++ b/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/GetAzureSqlServerBackupLongTermRetentionVault.cs @@ -17,9 +17,11 @@ using System.Management.Automation; using Microsoft.Azure.Commands.Sql.Backup.Model; using Microsoft.Azure.Commands.Sql.Database.Model; +using Microsoft.WindowsAzure.Commands.Common.CustomAttributes; namespace Microsoft.Azure.Commands.Sql.Backup.Cmdlet { + [CmdletDeprecation] [Cmdlet(VerbsCommon.Get, "AzureRmSqlServerBackupLongTermRetentionVault", SupportsShouldProcess = true)] public class GetAzureSqlServerBackupLongTermRetentionVault : AzureSqlServerBackupLongTermRetentionVaultCmdletBase { diff --git a/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/SetAzureSqlServerBackupLongTermRetentionVault.cs b/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/SetAzureSqlServerBackupLongTermRetentionVault.cs index 712983338432..9c7ecbec8238 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/SetAzureSqlServerBackupLongTermRetentionVault.cs +++ b/src/ResourceManager/Sql/Commands.Sql/Database Backup/Cmdlet/SetAzureSqlServerBackupLongTermRetentionVault.cs @@ -18,12 +18,14 @@ using System.Management.Automation; using Microsoft.Azure.Commands.Sql.Backup.Model; using Microsoft.Azure.Commands.Sql.Database.Model; +using Microsoft.WindowsAzure.Commands.Common.CustomAttributes; namespace Microsoft.Azure.Commands.Sql.Backup.Cmdlet { /// /// Cmdlet to create or update a new Azure Sql Server backup archival vault /// + [CmdletDeprecation] [Cmdlet(VerbsCommon.Set, "AzureRmSqlServerBackupLongTermRetentionVault", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.Low)]