Revert "Edit Get & Set ShortTermRetentionPolicy For Adding New Parameter: DiffBackupIntervalInHours (#12562)" (#13250)

This reverts commit 34467c6.

Author: lululilliancoding

src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.ps1

@@ -443,84 +443,55 @@ function Test-RemoveDatabaseRestorePoint
 function Test-ShortTermRetentionPolicy
 {
 	# Setup
-	$location = "southeast asia"
-	$rg = "PowershellStageResourceGroup"
-	$server = "pssqlserverfortest"
+	$location = Get-Location "Microsoft.Sql" "servers" "West US 2"
+	$rg = Create-ResourceGroupForTest $location
+	$server = Create-ServerForTest $rg $location
 
  	try
 	{
 		# Create db with default values
 		$databaseName = Get-DatabaseName
-		$db = New-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -Force:$true
+		$db = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
 
-		# Test GET default values. 
-		$defaultRetention = 7
-		# After we configure Backup Service's default DiffBackupIntervalInHours to 24 hours for new created databases, $defaultDiffbackupinterval should be changed to 24.
-		$defaultDiffbackupinterval = 12
-		$policy = Get-AzSqlDatabaseBackupShortTermRetentionPolicy -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName
-		Assert-AreEqual $policy.Count 1
-		Assert-AreEqual $defaultRetention $policy[0].RetentionDays
-		Assert-AreEqual $defaultDiffbackupinterval $policy[0].DiffBackupIntervalInHours
-
- 		# Test SET
-		$retention = 6
-		$diffbackupinterval = 24
-		$policy = Set-AzSqlDatabaseBackupShortTermRetentionPolicy -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -RetentionDays $retention -DiffBackupIntervalInHours $diffbackupinterval
+ 		# Test default parameter set
+		$retention = 28
+		$policy = Set-AzureRmSqlDatabaseBackupShortTermRetentionPolicy -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -RetentionDays $retention
 		Assert-AreEqual $policy.Count 1
 		Assert-AreEqual $retention $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
-
-		$retentionOnly = 5
-		$policy = Set-AzSqlDatabaseBackupShortTermRetentionPolicy -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -RetentionDays $retentionOnly
+		$policy = Get-AzureRmSqlDatabaseBackupShortTermRetentionPolicy -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
 		Assert-AreEqual $policy.Count 1
-		Assert-AreEqual $retentionOnly $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
-
-		$diffbackupintervalOnly = 12
-		$policy = Set-AzSqlDatabaseBackupShortTermRetentionPolicy -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName -DiffBackupIntervalInHours $diffbackupintervalOnly
-		Assert-AreEqual $policy.Count 1
-		Assert-AreEqual $retentionOnly $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupintervalOnly $policy[0].DiffBackupIntervalInHours
+		Assert-AreEqual $retention $policy[0].RetentionDays
 
  		# Test InputObject
-		$retention = 7
-		$diffbackupinterval = 24
-		$policy = Set-AzSqlDatabaseBackupShortTermRetentionPolicy -AzureSqlDatabase $db -RetentionDays $retention -DiffBackupIntervalInHours $diffbackupinterval
+		$retention = 21
+		$policy = Set-AzureRmSqlDatabaseBackupShortTermRetentionPolicy -AzureSqlDatabase $db -RetentionDays $retention
 		Assert-AreEqual 1 $policy.Count
 		Assert-AreEqual $retention $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
-		$policy = Get-AzSqlDatabaseBackupShortTermRetentionPolicy -AzureSqlDatabase $db
+		$policy = Get-AzureRmSqlDatabaseBackupShortTermRetentionPolicy -AzureSqlDatabase $db
 		Assert-AreEqual 1 $policy.Count
 		Assert-AreEqual $retention $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
 
  		# Test ResourceId
-		$retention = 6
-		$diffbackupinterval = 12
+		$retention = 14
 		$resourceId = $db.ResourceId + "/backupShortTermRetentionPolicies/default"
-		$policy = Set-AzSqlDatabaseBackupShortTermRetentionPolicy -ResourceId $resourceId -RetentionDays $retention -DiffBackupIntervalInHours $diffbackupinterval
+		$policy = Set-AzureRmSqlDatabaseBackupShortTermRetentionPolicy -ResourceId $resourceId -RetentionDays $retention
 		Assert-AreEqual 1 $policy.Count
 		Assert-AreEqual $retention $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
-		$policy = Get-AzSqlDatabaseBackupShortTermRetentionPolicy -ResourceId $resourceId
+		$policy = Get-AzureRmSqlDatabaseBackupShortTermRetentionPolicy -ResourceId $resourceId
 		Assert-AreEqual 1 $policy.Count
 		Assert-AreEqual $retention $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
 
  		# Test Piping
 		$retention = 7
-		$diffbackupinterval = 24
-		$policy = $db | Set-AzSqlDatabaseBackupShortTermRetentionPolicy -RetentionDays $retention -DiffBackupIntervalInHours $diffbackupinterval
+		$policy = $db | Set-AzureRmSqlDatabaseBackupShortTermRetentionPolicy -RetentionDays $retention
 		Assert-AreEqual 1 $policy.Count
 		Assert-AreEqual $retention $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
-		$policy = $db | Get-AzSqlDatabaseBackupShortTermRetentionPolicy
+		$policy = $db | Get-AzureRmSqlDatabaseBackupShortTermRetentionPolicy
 		Assert-AreEqual 1 $policy.Count
 		Assert-AreEqual $retention $policy[0].RetentionDays
-		Assert-AreEqual $diffbackupinterval $policy[0].DiffBackupIntervalInHours
  	}
 	finally
 	{
-		Remove-AzSqlDatabase -ResourceGroupName $rg -ServerName $server -DatabaseName $databaseName
+		Remove-ResourceGroupForTest $rg
 	}
 }

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests/TestShortTermRetentionPolicy.json

@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.45.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.44.2-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Sql/Sql.Test/Sql.Test.csproj

@@ -18,7 +18,41 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Added DiffBackupIntervalInHours to `Set-AzSqlDatabaseBackupShortTermRetentionPolicy` 
+* Update Azure Paired Regions URL in Backup Storage Redundancy Warnings 
+
+## Version 2.11.0
+* Added BackupStorageRedundancy to the following: 
+    - `Restore-AzureRmSqlDatabase`
+    - `New-AzSqlDatabaseCopy`
+    - `New-AzSqlDatabaseSecondary`
+* Removed case sensitivity for BackupStorageRedundancy parameter for all SQL DB references 
+* Updated BackupStorageRedundancy warning message names
+* Added support for Managed HSM Uris for SQL DB and Managed Instance
+
+## Version 2.10.1
+* Added warning for BackupStorageRedundancy configuration in select regions in `New-AzSqlDatabase` (Ignore Case for BackupStorageRedundancy configuration input)
+* Fixed for bug in `New-AzSqlDatabaseExport`
+* Removed case sensitivity for BackupStorageRedundancy parameter for `New-AzSqlInstance` 
+
+## Version 2.10.0
+* Added BackupStorageRedundancy to `New-AzSqlInstance` and `Get-AzSqlInstance`
+* Added cmdlet `Get-AzSqlServerActiveDirectoryOnlyAuthentication`
+* Added cmdlet `Enable-AzSqlServerActiveDirectoryOnlyAuthentication`
+* Added Force parameter to `New-AzSqlInstance`
+* Added cmdlets for Managed Database Log Replay service
+	- `Start-AzSqlInstanceDatabaseLogReplay`
+	- `Get-AzSqlInstanceDatabaseLogReplay`
+	- `Complete-AzSqlInstanceDatabaseLogReplay`
+	- `Stop-AzSqlInstanceDatabaseLogReplay`
+* Added cmdlet `Get-AzSqlInstanceActiveDirectoryOnlyAuthentication`
+* Added cmdlet `Enable-AzSqlInstanceActiveDirectoryOnlyAuthentication`
+* Added cmdlet `Disable-AzSqlInstanceActiveDirectoryOnlyAuthentication`
+* Updated cmdlets `New-AzSqlDatabaseImport` and `New-AzSqlDatabaseExport` to support network isolation functionality
+* Added cmdlet `New-AzSqlDatabaseImportExisting`
+* Updated Databases cmdlets to support backup storage type specification
+* Added Force parameter to `New-AzSqlDatabase`
+* Updated ActiveDirectoryOnlyAuthentication cmdlets for server and instance to include ResourceId and InputObject
+* Added support for Managed HSM Uris for SQL DB and Managed Instance
 
 ## Version 2.9.1
 * Fixed potential server name case insensitive error in `New-AzSqlServer` and `Set-AzSqlServer`

src/Sql/Sql/ChangeLog.md

@@ -16,7 +16,6 @@
 using System.Linq;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Sql.Backup.Model;
-using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Sql.Backup.Cmdlet
 {
@@ -29,18 +28,12 @@ public class SetAzureRmSqlDatabaseBackupShortTermRetentionPolicy : AzureSqlDatab
         /// <summary>
         /// Gets or sets backup retention days.
         /// </summary>
-        [Parameter(Mandatory = false,
+        [Parameter(Mandatory = true,
             Position = 3,
             HelpMessage = "The backup retention setting, in days.")]
-        public int RetentionDays { get; set; }
+        [ValidateNotNullOrEmpty]
+        public int RetentionDays{ get; set; }
 
-        /// <summary>
-        /// Gets or sets differential backup interval hours.
-        /// </summary>
-        [Parameter(Mandatory = false,
-            HelpMessage = "The differential backup interval, in hours.")]
-        public int DiffBackupIntervalInHours { get; set; }	
-			
         /// <summary>
         /// Get the entities from the service
         /// </summary>
@@ -71,10 +64,7 @@ protected override IEnumerable<AzureSqlDatabaseBackupShortTermRetentionPolicyMod
                     ResourceGroupName,
                     ServerName,
                     DatabaseName,
-                    new Management.Sql.Models.BackupShortTermRetentionPolicy(
-                        retentionDays: this.IsParameterBound(c => c.RetentionDays) ? RetentionDays : null as int?, 
-                        diffBackupIntervalInHours: this.IsParameterBound(c => c.DiffBackupIntervalInHours) ? DiffBackupIntervalInHours : null as int?)
-                )
+                    new Management.Sql.Models.BackupShortTermRetentionPolicy(retentionDays: RetentionDays))
             };
         }
 

src/Sql/Sql/Database Backup/Cmdlet/GetAzureSqlDatabaseBackupShortTermRetentionPolicy.cs renamed to src/Sql/Sql/Database Backup/Cmdlet/GetAzureRmSqlDatabaseBackupShortTermRetentionPolicy.cs

@@ -12,8 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
-
 namespace Microsoft.Azure.Commands.Sql.Backup.Model
 {
     public class AzureSqlDatabaseBackupShortTermRetentionPolicyModel
@@ -36,12 +34,7 @@ public class AzureSqlDatabaseBackupShortTermRetentionPolicyModel
         /// <summary>
         /// Gets or sets the retention days of this policy.
         /// </summary>
-        public int? RetentionDays { get; set; }
-
-        /// <summary>
-        /// Gets or sets the differential backup interval of this policy.
-        /// </summary>
-        public int? DiffBackupIntervalInHours { get; set; }
+        public int RetentionDays { get; set; }
 
         /// <summary>
         /// Construct AzureSqlDatabaseBackupShortTermRetentionPolicyModel from Management.Sql.BackupShortTermRetentionPolicy object
@@ -51,16 +44,10 @@ public class AzureSqlDatabaseBackupShortTermRetentionPolicyModel
         /// <param name="policy"></param>
         public AzureSqlDatabaseBackupShortTermRetentionPolicyModel(string resourceGroup, string serverName, string databaseName, Management.Sql.Models.BackupShortTermRetentionPolicy policy)
         {
-            if (policy.RetentionDays == null && policy.DiffBackupIntervalInHours == null)
-            {
-                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Sql.Properties.Resources.SetAzSqlDatabaseBackupShortTermRetentionInvalidParameters, "RetentionDays", "DiffBackupIntervalInHours"));
-            }
-
             ResourceGroupName = resourceGroup;
             ServerName = serverName;
             DatabaseName = databaseName;
-            RetentionDays = policy.RetentionDays;
-            DiffBackupIntervalInHours = policy.DiffBackupIntervalInHours;
+            RetentionDays = policy.RetentionDays.Value;
         }
     }
 }

src/Sql/Sql/Database Backup/Cmdlet/SetAzureSqlDatabaseBackupShortTermRetentionPolicy.cs renamed to src/Sql/Sql/Database Backup/Cmdlet/SetAzureRmSqlDatabaseBackupShortTermRetentionPolicy.cs

@@ -585,8 +585,7 @@ internal AzureSqlDatabaseBackupShortTermRetentionPolicyModel SetDatabaseBackupSh
                     databaseName,
                     new Management.Sql.Models.BackupShortTermRetentionPolicy()
                     {
-                        RetentionDays = model.RetentionDays,
-                        DiffBackupIntervalInHours = model.DiffBackupIntervalInHours
+                        RetentionDays = model.RetentionDays
                     });
 
             return new AzureSqlDatabaseBackupShortTermRetentionPolicyModel(resourceGroup, serverName, databaseName, baPolicy);

src/Sql/Sql/Database Backup/Model/AzureSqlDatabaseBackupShortTermRetentionPolicyModel.cs

@@ -652,7 +652,4 @@
   <data name="BackupRedundancyNotChosenTakeSourceWarning" xml:space="preserve">
     <value>You have not specified the value for backup storage redundancy which will default to the source's backup storage redundancy. To learn more about Azure Paired Regions visit aka.ms/azure-ragrs-regions.</value>
   </data>
-  <data name="SetAzSqlDatabaseBackupShortTermRetentionInvalidParameters" xml:space="preserve">
-    <value>Parameter '{0}' and '{1}' both being null is not allowed.</value>
-  </data>
 </root>