Addressing comments from pull request

Author: mykolian

ChangeLog.md

@@ -95,7 +95,6 @@
 * Ability to Get-AzSqlServerServiceObjective by location without needing a preexisting server in the region.
 * Support for time zone parameter in Managed Instance create.
 * Fix documentation for wildcards
-* Support of Serverless specific parameters
 
 #### Az.Websites
 * fixes the Set-AzWebApp and Set-AzWebAppSlot to not remove the tags on execution

src/Sql/Sql.Test/ScenarioTests/DatabaseCrudTests.ps1

@@ -198,16 +198,16 @@ function Test-CreateServerlessDatabase
 	{
 		# Create with Edition and RequestedServiceObjectiveName
 		$databaseName = Get-DatabaseName
-		$job1 = New-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -RequestedServiceObjectiveName GP_S_Gen5_2 -AutoPauseDelayMinutes 360 -MinVCore 0.5 -AsJob
+		$job1 = New-AzSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -RequestedServiceObjectiveName GP_S_Gen5_2 -AutoPauseDelayInMinutes 360 -MinVCore 0.5 -AsJob
 		$job1 | Wait-Job
 		$db = $job1.Output
 
 		Assert-AreEqual $databaseName $db.DatabaseName
 		Assert-NotNull $db.MaxSizeBytes
 		Assert-AreEqual GP_S_Gen5_2 $db.CurrentServiceObjectiveName
 		Assert-AreEqual 2 $db.Capacity
-		Assert-AreEqual 360 $db.AutoPauseDelayMinutes
-		Assert-AreEqual 0.5 $db.MinCapacity
+		Assert-AreEqual 360 $db.AutoPauseDelayInMinutes
+		Assert-AreEqual 0.5 $db.MinimumCapacity
 		Assert-AreEqual GeneralPurpose $db.Edition
 	}
 	finally
@@ -573,8 +573,8 @@ function Test-UpdateServerlessDatabase()
 		Assert-NotNull $db1.MaxSizeBytes
 		Assert-NotNull $db1.Edition
 		Assert-NotNull $db1.CurrentServiceObjectiveName
-		Assert-NotNull $db1.MinCapacity
-		Assert-NotNull $db1.AutoPauseDelayMinutes
+		Assert-NotNull $db1.MinimumCapacity
+		Assert-NotNull $db1.AutoPauseDelayInMinutes
 
 		# Alter to dtu database
 		$job = Set-AzSqlDatabase -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName `
@@ -583,8 +583,8 @@ function Test-UpdateServerlessDatabase()
 		$db1 = $job.Output
 		Assert-AreEqual $db1.DatabaseName $db.DatabaseName
 		Assert-AreEqual $db1.Edition Premium
-		Assert-Null $db1.MinCapacity
-		Assert-Null $db1.AutoPauseDelayMinutes
+		Assert-Null $db1.MinimumCapacity
+		Assert-Null $db1.AutoPauseDelayInMinutes
 
 		# Alter back to Serverless
 		$job = Set-AzSqlDatabase -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName `
@@ -594,19 +594,19 @@ function Test-UpdateServerlessDatabase()
 		Assert-AreEqual $db1.DatabaseName $db.DatabaseName
 		Assert-AreEqual $db1.Edition GeneralPurpose
 		Assert-AreEqual $db1.CurrentServiceObjectiveName GP_S_Gen5_2
-		Assert-NotNull $db1.MinCapacity
-		Assert-NotNull $db1.AutoPauseDelayMinutes
+		Assert-NotNull $db1.MinimumCapacity
+		Assert-NotNull $db1.AutoPauseDelayInMinutes
 
-		# Alter mincapacity and autopausedelayminutes
+		# Alter mincapacity and AutoPauseDelayInMinutes
 		$job = Set-AzSqlDatabase -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName `
-			-Vcore 2 -Edition GeneralPurpose -ComputeModel Serverless -ComputeGeneration Gen5 -MinCapacity 2 -AutoPauseDelayMinutes 1440 -AsJob
+			-Vcore 2 -Edition GeneralPurpose -ComputeModel Serverless -ComputeGeneration Gen5 -MinimumCapacity 2 -AutoPauseDelayInMinutes 1440 -AsJob
 		$job | Wait-Job
 		$db1 = $job.Output
 		Assert-AreEqual $db1.DatabaseName $db.DatabaseName
 		Assert-AreEqual $db1.Edition GeneralPurpose
 		Assert-AreEqual $db1.CurrentServiceObjectiveName GP_S_Gen5_2
-		Assert-AreEqual $db1.MinCapacity 2
-		Assert-AreEqual $db1.AutoPauseDelayMinutes 1440
+		Assert-AreEqual $db1.MinimumCapacity 2
+		Assert-AreEqual $db1.AutoPauseDelayInMinutes 1440
 	}
 	finally
 	{

src/Sql/Sql/ChangeLog.md

@@ -27,7 +27,7 @@
 * Ability to Get-AzSqlServerServiceObjective by location without needing a preexisting server in the region.
 * Support for time zone parameter in Managed Instance create.
 * Fix documentation for wildcards
-* Support of Serverless specific parameters
+* Support of Serverless specific parameters in New-AzSqlDatabase and Set-AzSqlDatabase
 
 ## Version 1.8.0
 * Support Database Data Classification.

src/Sql/Sql/Database/Cmdlet/NewAzureSqlDatabase.cs

@@ -173,16 +173,16 @@ public class NewAzureSqlDatabase : AzureSqlDatabaseCmdletBase<AzureSqlDatabaseCr
         /// Gets or sets the Auto Pause delay for Azure Sql Database
         /// </summary>
         [Parameter(Mandatory = false,
-            HelpMessage = "The auto pause delay in minutes for database(serverless only), -1 to opt out")]
-        public int? AutoPauseDelayMinutes { get; set; }
+            HelpMessage = "The auto pause delay in minutes for database(serverless only), -1 to opt out from pausing")]
+        public int AutoPauseDelayInMinutes { get; set; }
 
         /// <summary>
         /// Gets or sets the Minimal capacity that database will always have allocated, if not paused
         /// </summary>
         [Parameter(Mandatory = false,
             HelpMessage = "The Minimal capacity that database will always have allocated, if not paused. For serverless database only.")]
-        [Alias("MinVCore")]
-        public double? MinCapacity { get; set; }
+        [Alias("MinVCore", "MinCapacity")]
+        public double MinimumCapacity { get; set; }
 
         /// <summary>
         /// Overriding to add warning message
@@ -244,8 +244,8 @@ protected override AzureSqlDatabaseCreateOrUpdateModel ApplyUserInputToModel(Azu
                 ReadScale = ReadScale,
                 ZoneRedundant = MyInvocation.BoundParameters.ContainsKey("ZoneRedundant") ? (bool?)ZoneRedundant.ToBool() : null,
                 LicenseType = LicenseType, // note: default license type will be LicenseIncluded in SQL RP if not specified
-                AutoPauseDelayMinutes = AutoPauseDelayMinutes,
-                MinCapacity = MinCapacity,
+                AutoPauseDelayInMinutes = MyInvocation.BoundParameters.ContainsKey("AutoPauseDelayInMinutes") ? AutoPauseDelayInMinutes : (int?)null,
+                MinimumCapacity = MyInvocation.BoundParameters.ContainsKey("AutoPauseDelayInMinutes") ? MinimumCapacity : (double?)null,
             };
 
             if(ParameterSetName == DtuDatabaseParameterSet)

src/Sql/Sql/Database/Cmdlet/SetAzureSqlDatabase.cs

@@ -194,12 +194,12 @@ public class SetAzureSqlDatabase : AzureSqlDatabaseCmdletBase<IEnumerable<AzureS
         /// Gets or sets the auto pause delay for the Azure Sql Database
         /// </summary>
         [Parameter(Mandatory = false,
-            HelpMessage = "The auto pause delay in minutes for database (serverless only), -1 to opt out",
+            HelpMessage = "The auto pause delay in minutes for database (serverless only), -1 to opt out from pausing",
             ParameterSetName = UpdateParameterSetName)]
         [Parameter(Mandatory = false,
-            HelpMessage = "The auto pause delay in minutes for database (serverless only), -1 to opt out",
+            HelpMessage = "The auto pause delay in minutes for database (serverless only), -1 to opt out from pausing",
             ParameterSetName = VcoreDatabaseParameterSet)]
-        public int? AutoPauseDelayMinutes { get; set; }
+        public int AutoPauseDelayInMinutes { get; set; }
 
         /// <summary>
         /// Gets or sets the Minimal capacity that database will always have allocated, if not paused
@@ -210,8 +210,8 @@ public class SetAzureSqlDatabase : AzureSqlDatabaseCmdletBase<IEnumerable<AzureS
         [Parameter(Mandatory = false,
             HelpMessage = "The Minimal capacity that database will always have allocated, if not paused. For serverless database only.",
             ParameterSetName = VcoreDatabaseParameterSet)]
-        [Alias("MinVCore")]
-        public double? MinCapacity { get; set; }
+        [Alias("MinVCore", "MinCapacity")]
+        public double MinimumCapacity { get; set; }
 
         /// <summary>
         /// Overriding to add warning message
@@ -255,8 +255,8 @@ protected override IEnumerable<AzureSqlDatabaseModel> ApplyUserInputToModel(IEnu
                            ? (bool?)ZoneRedundant.ToBool()
                            : null,
                 LicenseType = LicenseType ?? model.FirstOrDefault().LicenseType, // set to original license type
-                AutoPauseDelayMinutes = AutoPauseDelayMinutes,
-                MinCapacity = MinCapacity,
+                AutoPauseDelayInMinutes = MyInvocation.BoundParameters.ContainsKey("AutoPauseDelayInMinutes") ? AutoPauseDelayInMinutes : (int?)null,
+                MinimumCapacity = MyInvocation.BoundParameters.ContainsKey("MinimumCapacity") ? MinimumCapacity : (double?)null,
             };
 
             var database = ModelAdapter.GetDatabase(ResourceGroupName, ServerName, DatabaseName);

src/Sql/Sql/Database/Model/AzureSqlDatabaseModel.cs

@@ -168,12 +168,12 @@ public class AzureSqlDatabaseModel
         /// <summary>
         /// Gets or sets the Auto pause delay of the database
         /// </summary>
-        public int? AutoPauseDelayMinutes { get; set; }
+        public int? AutoPauseDelayInMinutes { get; set; }
 
         /// <summary>
         /// Minimal capacity that database will always have allocated, if not paused
         /// </summary>
-        public double? MinCapacity { get; set; }
+        public double? MinimumCapacity { get; set; }
 
         /// <summary>
         /// Construct AzureSqlDatabaseModel
@@ -223,8 +223,8 @@ public AzureSqlDatabaseModel(string resourceGroup, string serverName, Management
             ReadScale = readScale;
 
             ZoneRedundant = false;
-            AutoPauseDelayMinutes = null;
-            MinCapacity = null;
+            AutoPauseDelayInMinutes = null;
+            MinimumCapacity = null;
         }
 
         /// <summary>
@@ -272,8 +272,8 @@ public AzureSqlDatabaseModel(string resourceGroup, string serverName, Management
 
             LicenseType = database.LicenseType;
 
-            AutoPauseDelayMinutes = database.AutoPauseDelay;
-            MinCapacity = database.MinCapacity;
+            AutoPauseDelayInMinutes = database.AutoPauseDelay;
+            MinimumCapacity = database.MinCapacity;
         }
     }
 }

src/Sql/Sql/Database/Services/AzureSqlDatabaseAdapter.cs

@@ -158,8 +158,8 @@ internal AzureSqlDatabaseModel UpsertDatabaseWithNewSdk(string resourceGroup, st
                 ZoneRedundant = model.Database.ZoneRedundant,
                 ElasticPoolId = elasticPoolId,
                 LicenseType = model.Database.LicenseType,
-                AutoPauseDelay = model.Database.AutoPauseDelayMinutes,
-                MinCapacity = model.Database.MinCapacity,
+                AutoPauseDelay = model.Database.AutoPauseDelayInMinutes,
+                MinCapacity = model.Database.MinimumCapacity,
             });
 
             return CreateDatabaseModelFromResponse(resourceGroup, serverName, resp);

src/Sql/Sql/help/New-AzSqlDatabase.md

@@ -18,7 +18,7 @@ Creates a database or an elastic database.
 New-AzSqlDatabase -DatabaseName <String> [-CollationName <String>] [-CatalogCollation <String>]
  [-MaxSizeBytes <Int64>] [-Edition <String>] [-RequestedServiceObjectiveName <String>]
  [-ElasticPoolName <String>] [-ReadScale <DatabaseReadScale>] [-Tags <Hashtable>] [-SampleName <String>]
- [-ZoneRedundant] [-AsJob] [-LicenseType <String>] [-AutoPauseDelayMinutes <Int32>] [-MinCapacity <Double>]
+ [-ZoneRedundant] [-AsJob] [-LicenseType <String>] [-AutoPauseDelayInMinutes <Int32>] [-MinimumCapacity <Double>]
  [-ServerName] <String> [-ResourceGroupName] <String> [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
  [-Confirm] [<CommonParameters>]
 ```
@@ -28,7 +28,7 @@ New-AzSqlDatabase -DatabaseName <String> [-CollationName <String>] [-CatalogColl
 New-AzSqlDatabase -DatabaseName <String> [-CollationName <String>] [-CatalogCollation <String>]
  [-MaxSizeBytes <Int64>] -Edition <String> [-ReadScale <DatabaseReadScale>] [-Tags <Hashtable>]
  [-SampleName <String>] [-ZoneRedundant] [-AsJob] -VCore <Int32> -ComputeGeneration <String>
- [-LicenseType <String>] [-ComputeModel <String>] [-AutoPauseDelayMinutes <Int32>] [-MinCapacity <Double>]
+ [-LicenseType <String>] [-ComputeModel <String>] [-AutoPauseDelayInMinutes <Int32>] [-MinimumCapacity <Double>]
  [-ServerName] <String> [-ResourceGroupName] <String> [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
  [-Confirm] [<CommonParameters>]
 ```
@@ -141,8 +141,8 @@ Capacity                      : 2
 Family                        : Gen5
 SkuName                       : GP_S_Gen5
 LicenseType                   : LicenseIncluded
-AutoPauseDelayMinutes         : 360
-MinCapacity                   : 0.5
+AutoPauseDelayInMinutes       : 360
+MinimumCapacity               : 0.5
 ```
 
 This command creates a Serverless database named Database04 on server Server01.
@@ -164,11 +164,11 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -AutoPauseDelayMinutes
+### -AutoPauseDelayInMinutes
 The auto pause delay in minutes for database(serverless only), -1 to opt out
 
 ```yaml
-Type: System.Nullable`1[System.Int32]
+Type: System.Int32
 Parameter Sets: (All)
 Aliases:
 
@@ -225,7 +225,7 @@ Accept wildcard characters: False
 ```
 
 ### -ComputeModel
-The compute model for Azure Sql database
+The compute model for Azure Sql database. Serverless or Provisioned
 
 ```yaml
 Type: System.String
@@ -352,14 +352,14 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -MinCapacity
+### -MinimumCapacity
 The Minimal capacity that database will always have allocated, if not paused.
 For serverless Azure Sql databases only.
 
 ```yaml
-Type: System.Nullable`1[System.Double]
+Type: System.Double
 Parameter Sets: (All)
-Aliases: MinVCore
+Aliases: MinVCore, MinCapacity
 
 Required: False
 Position: Named

src/Sql/Sql/help/Set-AzSqlDatabase.md

@@ -18,7 +18,7 @@ Sets properties for a database, or moves an existing database into an elastic po
 Set-AzSqlDatabase [-DatabaseName] <String> [-MaxSizeBytes <Int64>] [-Edition <String>]
  [-RequestedServiceObjectiveName <String>] [-ElasticPoolName <String>] [-ReadScale <DatabaseReadScale>]
  [-Tags <Hashtable>] [-ZoneRedundant] [-AsJob] [-LicenseType <String>] [-ComputeModel <String>]
- [-AutoPauseDelayMinutes <Int32>] [-MinCapacity <Double>] [-ServerName] <String>
+ [-AutoPauseDelayInMinutes <Int32>] [-MinimumCapacity <Double>] [-ServerName] <String>
  [-ResourceGroupName] <String> [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
@@ -28,7 +28,7 @@ Set-AzSqlDatabase [-DatabaseName] <String> [-MaxSizeBytes <Int64>] [-Edition <St
 Set-AzSqlDatabase [-DatabaseName] <String> [-MaxSizeBytes <Int64>] [-Edition <String>]
  [-ReadScale <DatabaseReadScale>] [-Tags <Hashtable>] [-ZoneRedundant] [-AsJob] [-VCore <Int32>]
  [-ComputeGeneration <String>] [-LicenseType <String>] [-ComputeModel <String>]
- [-AutoPauseDelayMinutes <Int32>] [-MinCapacity <Double>] [-ServerName] <String>
+ [-AutoPauseDelayInMinutes <Int32>] [-MinimumCapacity <Double>] [-ServerName] <String>
  [-ResourceGroupName] <String> [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
@@ -137,11 +137,11 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -AutoPauseDelayMinutes
+### -AutoPauseDelayInMinutes
 The auto pause delay in minutes for database (serverless only), -1 to opt out
 
 ```yaml
-Type: System.Nullable`1[System.Int32]
+Type: System.Int32
 Parameter Sets: Update, VcoreBasedDatabase
 Aliases:
 
@@ -168,7 +168,7 @@ Accept wildcard characters: False
 ```
 
 ### -ComputeModel
-Computed model of Azure Sql database, serverless or preprovisioned
+Computed model of Azure Sql database. Serverless or Provisioned
 
 ```yaml
 Type: System.String
@@ -284,12 +284,12 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -MinCapacity
+### -MinimumCapacity
 The Minimal capacity that database will always have allocated, if not paused.
 For serverless Azure Sql databases only.
 
 ```yaml
-Type: System.Nullable`1[System.Double]
+Type: System.Double
 Parameter Sets: Update, VcoreBasedDatabase
 Aliases: MinVCore