Merge pull request #8049 from sudhindramsft/preview

feat) add support for the `S1` SKU

Author: cormacpayne

src/ResourceManager/Maps/Commands.Maps/ChangeLog.md

@@ -17,4 +17,5 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current Release
+## Current Release
+* Added support for `S1` SKU

src/ResourceManager/Maps/Commands.Maps/MapsAccount/NewAzureMapsAccount.cs

@@ -19,6 +19,7 @@
 using Microsoft.Azure.Management.Maps;
 using Microsoft.Azure.Management.Maps.Models;
 using Microsoft.Azure.Commands.Maps.Models;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 
 namespace Microsoft.Azure.Commands.Maps.MapsAccount
 {
@@ -52,7 +53,7 @@ public class NewAzureMapsAccount : MapsAccountBaseCmdlet
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Maps Account Sku Name.")]
-        [ValidateSet("S0")]
+        [PSArgumentCompleter("S0", "S1")]
         public string SkuName { get; set; }
 
         [Parameter(

src/ResourceManager/Maps/Commands.Maps/help/New-AzMapsAccount.md

@@ -102,7 +102,7 @@ Maps Account Sku Name.
 Type: System.String
 Parameter Sets: (All)
 Aliases:
-Accepted values: S0
+Accepted values: S0, S1
 
 Required: True
 Position: 2

src/ResourceManager/Maps/Maps.Test/ScenarioTests/MapsAccountTests.ps1

@@ -49,6 +49,43 @@ function Test-NewAzureRmMapsAccount
     }
 }
 
+<#
+.SYNOPSIS
+Test New-AzureRmMapsAccountS1
+#>
+function Test-NewAzureRmMapsAccountS1
+{
+    # Setup
+    $rgname = Get-MapsManagementTestResourceName;
+    try
+    {
+        # Test
+        $accountname = 'ps-s1-' + $rgname;
+        $skuname = 'S1';
+        $location = 'West US';
+
+        New-AzureRmResourceGroup -Name $rgname -Location $location;
+
+        $createdAccount = New-AzureRmMapsAccount -ResourceGroupName $rgname -Name $accountname -SkuName $skuname -Force;
+        Assert-NotNull $createdAccount;
+        # Call create again, expect to get the same account
+        $createdAccountAgain = New-AzureRmMapsAccount -ResourceGroupName $rgname -Name $accountname -SkuName $skuname -Force;
+        Assert-NotNull $createdAccountAgain
+        Assert-AreEqual $createdAccount.Id $createdAccountAgain.Id;
+        Assert-AreEqual $createdAccount.ResourceGroupName $createdAccountAgain.ResourceGroupName;
+        Assert-AreEqual $createdAccount.Name $createdAccountAgain.Name;
+        Assert-AreEqual $createdAccount.Location $createdAccountAgain.Location;
+        Assert-AreEqual $createdAccount.Sku.Name $createdAccountAgain.Sku.Name;
+        
+        Retry-IfException { Remove-AzureRmMapsAccount -ResourceGroupName $rgname -Name $accountname -Confirm:$false; }
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Test Remove-AzureRmMapsAccount