[Storage] Support Extended location (#14718)

src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs

@@ -225,5 +225,12 @@ public void TestNewSetAzureStorageAccountAllowSharedKeyAccess()
         {
             TestRunner.RunTestScript("Test-NewSetAzureStorageAccountAllowSharedKeyAccess");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewAzureStorageAccountEdgeZone()
+        {
+            TestRunner.RunTestScript("Test-NewAzureStorageAccountEdgeZone");
+        }        
     }
 }

src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1

@@ -1553,4 +1553,46 @@ function Test-NewSetAzStorageAccount_RoutingPreference
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Test Test-NewAzureStorageAccountEdgeZone
+.DESCRIPTION
+SmokeTest
+#>
+function Test-NewAzureStorageAccountEdgeZone
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Premium_LRS';
+        $loc = Get-ProviderLocation ResourceManagement;
+        $kind = 'StorageV2'
+
+        New-AzResourceGroup -Name $rgname -Location $loc;
+        Write-Output ("Resource Group created")
+
+		# new account
+        New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -SkuName $stotype -EdgeZone "microsoftlosangeles1"
+
+        Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+        Assert-AreEqual $stoname $sto.StorageAccountName;
+        Assert-AreEqual $stotype $sto.Sku.Name;
+        Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
+        Assert-AreEqual $kind $sto.Kind;
+        Assert-AreEqual "EdgeZone" $sto.ExtendedLocation.Type;
+        Assert-AreEqual "microsoftlosangeles1" $sto.ExtendedLocation.Name;
+
+        Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
 }

src/Storage/Storage.Management/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Supported EdgeZone in create storage account
+    - `New-AzStorageAccount`
 * Fixed an issue that delete immutable blob will prompt incorrect message.
     - `Remove-AzStorageAccount`
 

src/Storage/Storage.Management/Models/PSStorageAccount.cs

@@ -61,6 +61,7 @@ public PSStorageAccount(StorageModels.StorageAccount storageAccount)
             this.RoutingPreference = PSRoutingPreference.ParsePSRoutingPreference(storageAccount.RoutingPreference);
             this.BlobRestoreStatus = storageAccount.BlobRestoreStatus is null ? null : new PSBlobRestoreStatus(storageAccount.BlobRestoreStatus);
             this.EnableNfsV3 = storageAccount.EnableNfsV3;
+            this.ExtendedLocation = storageAccount.ExtendedLocation is null ? null : new PSExtendedLocation(storageAccount.ExtendedLocation);
             this.AllowSharedKeyAccess = storageAccount.AllowSharedKeyAccess;
 
         }
@@ -140,6 +141,8 @@ public PSStorageAccount(StorageModels.StorageAccount storageAccount)
 
         public bool? AllowSharedKeyAccess { get; set; }
 
+        public PSExtendedLocation ExtendedLocation { get; set; }
+
         public static PSStorageAccount Create(StorageModels.StorageAccount storageAccount, IStorageManagementClient client)
         {
             var result = new PSStorageAccount(storageAccount);
@@ -207,4 +210,19 @@ public Sku ParseSku()
             return new Sku(Name, Tier);
         }
     }
+
+    public class PSExtendedLocation
+    {
+        public PSExtendedLocation()
+        { }
+
+        public PSExtendedLocation(ExtendedLocation extendedLocation)
+        {
+            this.Name = extendedLocation.Name;
+            this.Type = extendedLocation.Type;
+        }
+
+        public string Name { get; set; }
+        public string Type { get; set; }
+    }
 }

src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs

@@ -374,6 +374,10 @@ public bool AllowSharedKeyAccess
         }
         private bool? allowSharedKeyAccess = null;
 
+        [Parameter(Mandatory = false, HelpMessage = "Set the extended location name for EdgeZone. If not set, the storage account will be created in Azure main region. Otherwise it will be created in the specified extended location")]
+        [ValidateNotNullOrEmpty]
+        public string EdgeZone { get; set; }
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -512,6 +516,14 @@ public override void ExecuteCmdlet()
             {
                 createParameters.AllowSharedKeyAccess = allowSharedKeyAccess;
             }
+            if(this.EdgeZone != null)
+            {
+                createParameters.ExtendedLocation = new ExtendedLocation()
+                {
+                    Type = ExtendedLocationTypes.EdgeZone,
+                    Name = this.EdgeZone
+                };
+            }
 
             var createAccountResponse = this.StorageClient.StorageAccounts.Create(
                 this.ResourceGroupName,

src/Storage/Storage.Management/help/New-AzStorageAccount.md

@@ -22,7 +22,7 @@ New-AzStorageAccount [-ResourceGroupName] <String> [-Name] <String> [-SkuName] <
  [-EnableLargeFileShare] [-PublishMicrosoftEndpoint <Boolean>] [-PublishInternetEndpoint <Boolean>] [-AsJob]
  [-EncryptionKeyTypeForTable <String>] [-EncryptionKeyTypeForQueue <String>] [-RequireInfrastructureEncryption]
  [-AllowBlobPublicAccess <Boolean>] [-MinimumTlsVersion <String>] [-AllowSharedKeyAccess <Boolean>]
- [-DefaultProfile <IAzureContextContainer>] [-RoutingChoice <String>] [<CommonParameters>]
+ [-EdgeZone <String>] [-DefaultProfile <IAzureContextContainer>] [-RoutingChoice <String>] [<CommonParameters>]
 ```
 
 ### ActiveDirectoryDomainServicesForFile
@@ -37,7 +37,7 @@ New-AzStorageAccount [-ResourceGroupName] <String> [-Name] <String> [-SkuName] <
  [-ActiveDirectoryDomainSid <String>] [-ActiveDirectoryAzureStorageSid <String>] [-AsJob]
  [-EncryptionKeyTypeForTable <String>] [-EncryptionKeyTypeForQueue <String>] [-RequireInfrastructureEncryption]
  [-AllowBlobPublicAccess <Boolean>] [-MinimumTlsVersion <String>] [-AllowSharedKeyAccess <Boolean>]
- [-DefaultProfile <IAzureContextContainer>] [-RoutingChoice <String>] [<CommonParameters>]
+ [-EdgeZone <String>] [-DefaultProfile <IAzureContextContainer>] [-RoutingChoice <String>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -172,6 +172,19 @@ InternetEndpoints  : {"Blob":"https://mystorageaccount-internetrouting.blob.core
 
 This command creates a Storage account with RoutingPreference setting: PublishMicrosoftEndpoint and PublishInternetEndpoint as true, and RoutingChoice as MicrosoftRouting.
 
+### Example 11: Create a Storage account with EdgeZone
+```powershell
+PS C:\>$account = New-AzStorageAccount -ResourceGroupName "myresourcegroup" -AccountName "mystorageaccount" -SkuName Premium_LRS -Location westus -EdgeZone "microsoftlosangeles1"
+
+PS C:\>$account.ExtendedLocation
+
+Name                 Type    
+----                 ----    
+microsoftlosangeles1 EdgeZone
+```
+
+This command creates a Storage account with EdgeZone as "microsoftlosangeles1", then show the created account ExtendedLocation properties.
+
 ## PARAMETERS
 
 ### -AccessTier
@@ -375,6 +388,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -EdgeZone
+Set the extended location name for EdgeZone. If not set, the storage account will be created in Azure main region. Otherwise it will be created in the specified extended location
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -EnableActiveDirectoryDomainServicesForFile
 Enable Azure Files Active Directory Domain Service Authentication for the storage account.