Remove obsolete parameter 'GracePeriodWithDataLossHour' from Sql Failover Group cmdlets.

Author: dlemMSFT

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

@@ -122,7 +122,7 @@ function Test-FailoverGroup()
 
 		# Create with default values
 		$fgName = Get-FailoverGroupName
-		$fg = New-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -PartnerServerName $partnerServer.ServerName -FailoverGroupName $fgName -FailoverPolicy Automatic -GracePeriodWithDataLossHour 1 -AllowReadOnlyFailoverToPrimary Enabled
+		$fg = New-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -PartnerServerName $partnerServer.ServerName -FailoverGroupName $fgName -FailoverPolicy Automatic -GracePeriodWithDataLossHours 1 -AllowReadOnlyFailoverToPrimary Enabled
 		Validate-FailoverGroup $server $partnerServer $fgName Primary Automatic 1 Enabled @() $fg
 
 		# Alter all properties
@@ -284,7 +284,7 @@ function Test-SetFailoverGroup-AutomaticWithGracePeriodZero()
 	Handle-FailoverGroupTestWithFailoverGroup {
 		Param($fg)
 
-		$newFg = $fg | Set-AzureRmSqlDatabaseFailoverGroup -FailoverPolicy Automatic -GracePeriodWithDataLossHour 0 -AllowReadOnlyFailoverToPrimary Disabled
+		$newFg = $fg | Set-AzureRmSqlDatabaseFailoverGroup -FailoverPolicy Automatic -GracePeriodWithDataLossHours 0 -AllowReadOnlyFailoverToPrimary Disabled
 		Assert-FailoverGroupsEqual $fg $newFg -failoverPolicy Automatic -gracePeriod 1 -readOnlyFailoverPolicy Disabled
 		Validate-FailoverGroupWithGet $newFg
 	} -failoverPolicy Manual

src/ResourceManager/Sql/Commands.Sql/Failover Group/Cmdlet/AzureSqlFailoverGroupCmdletBase.cs

@@ -42,15 +42,10 @@ protected override AzureSqlFailoverGroupAdapter InitModelAdapter(AzureSubscripti
         {
             int? gracePeriod = null;
 
-            // Respect both parameters, but the non-obselete one takes precedence.
-            foreach (var parameterName in new[] { "GracePeriodWithDataLossHours", "GracePeriodWithDataLossHour" })
+            object parameterValue;
+            if (MyInvocation.BoundParameters.TryGetValue("GracePeriodWithDataLossHours", out parameterValue))
             {
-                object parameterValue;
-                if (MyInvocation.BoundParameters.TryGetValue(parameterName, out parameterValue))
-                {
-                    gracePeriod = (int)parameterValue;
-                    break;
-                }
+                gracePeriod = (int)parameterValue;
             }
 
             if (!gracePeriod.HasValue && policy == FailoverPolicy.Automatic)

src/ResourceManager/Sql/Commands.Sql/Failover Group/Cmdlet/NewAzureSqlFailoverGroup.cs

@@ -82,17 +82,6 @@ public class NewAzureSqlFailoverGroup : AzureSqlFailoverGroupCmdletBase
         [PSDefaultValue(Help = "1")]
         public int GracePeriodWithDataLossHours { get; set; }
 
-        /// <summary>
-        /// Gets or sets the grace period with data loss for the Sql Azure Failover Group.
-        /// </summary>
-        [Parameter(Mandatory = false,
-            HelpMessage = "Interval before automatic failover is initiated if an outage occurs on the primary server and failover cannot be completed without data loss.")]
-        [ValidateNotNullOrEmpty]
-        [ValidateRange(0, int.MaxValue)]
-        [PSDefaultValue(Help = "1")]
-        [Obsolete("This parameter will be deprecated in the next release.")]
-        public int GracePeriodWithDataLossHour { get; set; }
-
         /// <summary>
         /// Gets or sets the failover policy for read only endpoint of the Sql Azure Failover Group.
         /// </summary>

src/ResourceManager/Sql/Commands.Sql/Failover Group/Cmdlet/SetAzureSqlFailoverGroup.cs

@@ -69,17 +69,6 @@ public class SetAzureSqlFailoverGroup : AzureSqlFailoverGroupCmdletBase
         [PSDefaultValue(Help = "1")]
         public int GracePeriodWithDataLossHours { get; set; }
 
-        /// <summary>
-        /// Gets or sets the grace period with data loss for the Sql Azure Failover Group.
-        /// </summary>
-        [Parameter(Mandatory = false,
-            HelpMessage = "Interval before automatic failover is initiated if an outage occurs on the primary server and failover cannot be completed without data loss.")]
-        [ValidateNotNullOrEmpty]
-        [ValidateRange(0, int.MaxValue)]
-        [PSDefaultValue(Help = "1")]
-        [Obsolete("This parameter will be deprecated in the next release.")]
-        public int GracePeriodWithDataLossHour { get; set; }
-
         /// <summary>
         /// Gets or sets the failover policy for read only endpoint of the Sql Azure Failover Group.
         /// </summary>

src/ResourceManager/Sql/documentation/current-breaking-changes.md

@@ -44,24 +44,26 @@ The following cmdlets were affected this release:
 
 **New-AzureRmSqlDatabaseFailoverGroup**
 - Tag parameter was removed
+- 'GracePeriodWithDataLossHour' parameter was renamed to 'GracePeriodWithDataLossHours'
 
 ```powershell
 # Old
-New-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -PartnerServerName server2 -Tag @{ Environment="Test" }
+New-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -PartnerServerName server2 -FailoverPolicy Automatic -GracePeriodWithDataLossHour 1 -Tag @{ Environment="Test" }
 
 # New
-New-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -PartnerServerName server2
+New-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -PartnerServerName server2 -FailoverPolicy Automatic -GracePeriodWithDataLossHours 1
 ```
 
 **Set-AzureRmSqlDatabaseFailoverGroup**
 - Tag parameter was removed
+- 'GracePeriodWithDataLossHour' parameter was renamed to 'GracePeriodWithDataLossHours'
 
 ```powershell
 # Old
-Set-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -FailoverPolicy Automatic -Tag @{ Environment="Test" }
+Set-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -FailoverPolicy Automatic -GracePeriodWithDataLossHour 1 -Tag @{ Environment="Test" }
 
 # New
-Set-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -FailoverPolicy Automatic
+Set-AzureRmSqlDatabaseFailoverGroup -ResourceGroupName rg -ServerName server1 -FailoverGroupName fg -FailoverPolicy Automatic -GracePeriodWithDataLossHours 1
 ```
 
 **Add-AzureRmSqlDatabaseToFailoverGroup**