Merge pull request #9037 from wastoresh/srpsdk11

[Storage] Upgrade to SRPSDK 11.0

Author: markcowl

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

@@ -39,7 +39,6 @@ function Test-StorageAccount
         $job | Wait-Job
         $stos = Get-AzStorageAccount -ResourceGroupName $rgname;
 
-        $stotype = 'StandardGRS';
         Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname  -Name $stoname; }
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
@@ -52,7 +51,6 @@ function Test-StorageAccount
         # TODO: Still need to do retry for Set-, even after Get- returns it.
         Retry-IfException { $global:sto = Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -AccessTier $accessTier -Force }
         $sto = Get-AzStorageAccount -ResourceGroupName $rgname  -Name $stoname;
-        $stotype = 'StandardLRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -64,7 +62,6 @@ function Test-StorageAccount
         Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype -AccessTier $accessTier -Force
 
         $sto = Get-AzStorageAccount -ResourceGroupName $rgname  -Name $stoname;
-        $stotype = 'StandardRAGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -75,7 +72,6 @@ function Test-StorageAccount
         Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype
 
         $sto = Get-AzStorageAccount -ResourceGroupName $rgname  -Name $stoname;
-        $stotype = 'StandardGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -130,7 +126,6 @@ function Test-NewAzureStorageAccount
         $loc = Get-ProviderLocation ResourceManagement;
         New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
         $sto = Get-AzStorageAccount -ResourceGroupName $rgname  -Name $stoname;
-        $stotype = 'StandardLRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -162,15 +157,14 @@ function Test-GetAzureStorageAccount
         $stoname = 'sto' + $rgname;
         $stotype = 'Standard_GRS';
         $loc = Get-ProviderLocation ResourceManagement;
-        $kind = 'Storage'
+        $kind = 'StorageV2'
 
         New-AzResourceGroup -Name $rgname -Location $loc;
         Write-Output ("Resource Group created")
 
         New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype ;
 
         Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
-        $stotype = 'StandardGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -216,7 +210,6 @@ function Test-SetAzureStorageAccount
         New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind -EnableHttpsTrafficOnly $true -EnableHierarchicalNamespace $true;
 
         Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
-        $stotype = 'StandardGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -240,7 +233,6 @@ function Test-SetAzureStorageAccount
         Assert-AreEqual $true $sto.EnableHierarchicalNamespace;
 
         $sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname;
-        $stotype = 'StandardRAGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -309,7 +301,6 @@ function Test-SetAzureRmStorageAccountKeySource
         New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
 
         $sto = Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -StorageEncryption
-        $stotype = 'StandardGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -639,7 +630,6 @@ function Test-SetAzureStorageAccountStorageV2
         New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
 
         Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
-        $stotype = 'StandardGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -742,7 +732,6 @@ function Test-NewAzureStorageAccountBlockBlobStorage
 
         New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
         $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
-        $stotype = 'PremiumLRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
@@ -782,7 +771,6 @@ function Test-StorageAccountManagementPolicy
         New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
 
         Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
-        $stotype = 'StandardGRS';
         Assert-AreEqual $stoname $sto.StorageAccountName;
         Assert-AreEqual $stotype $sto.Sku.Name;
         Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestGetAzureStorageAccount.json

@@ -1,13 +1,13 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.Storage/locations/eastus2%28stage%29/usages?api-version=2018-11-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzMiUyOHN0YWdlJTI5L3VzYWdlcz9hcGktdmVyc2lvbj0yMDE4LTExLTAx",
+      "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.Storage/locations/eastus2%28stage%29/usages?api-version=2019-04-01",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzMiUyOHN0YWdlJTI5L3VzYWdlcz9hcGktdmVyc2lvbj0yMDE5LTA0LTAx",
       "RequestMethod": "GET",
       "RequestBody": "",
       "RequestHeaders": {
         "x-ms-client-request-id": [
-          "4b708fff-fea3-4c66-b96c-71341772642e"
+          "43479304-72fe-4301-a6c4-aa96181febaf"
         ],
         "Accept-Language": [
           "en-US"
@@ -16,7 +16,7 @@
           "FxVersion/4.6.27207.03",
           "OSName/Windows",
           "OSVersion/Microsoft.Windows.10.0.17763.",
-          "Microsoft.Azure.Management.Storage.StorageManagementClient/10.0.0.0"
+          "Microsoft.Azure.Management.Storage.StorageManagementClient/11.0.0.0"
         ]
       },
       "ResponseHeaders": {
@@ -27,7 +27,7 @@
           "no-cache"
         ],
         "x-ms-request-id": [
-          "8eb8990a-0a7c-44bb-95a4-48066cc59dce"
+          "b384ce8f-73df-4be5-a320-4afe8a409bcb"
         ],
         "Strict-Transport-Security": [
           "max-age=31536000; includeSubDomains"
@@ -36,19 +36,19 @@
           "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
         ],
         "x-ms-ratelimit-remaining-subscription-reads": [
-          "11999"
+          "11963"
         ],
         "x-ms-correlation-request-id": [
-          "d61c8bda-857e-4dbf-8ce5-d19a0bb251d3"
+          "6e7a1a59-039e-433b-a39a-e4c7a3eff9b5"
         ],
         "x-ms-routing-request-id": [
-          "SOUTHEASTASIA:20190306T095939Z:d61c8bda-857e-4dbf-8ce5-d19a0bb251d3"
+          "SOUTHEASTASIA:20190419T080733Z:6e7a1a59-039e-433b-a39a-e4c7a3eff9b5"
         ],
         "X-Content-Type-Options": [
           "nosniff"
         ],
         "Date": [
-          "Wed, 06 Mar 2019 09:59:38 GMT"
+          "Fri, 19 Apr 2019 08:07:33 GMT"
         ],
         "Content-Length": [
           "129"
@@ -60,7 +60,7 @@
           "-1"
         ]
       },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 13,\r\n      \"limit\": 250,\r\n      \"name\": {\r\n        \"value\": \"StorageAccounts\",\r\n        \"localizedValue\": \"Storage Accounts\"\r\n      }\r\n    }\r\n  ]\r\n}",
+      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 14,\r\n      \"limit\": 250,\r\n      \"name\": {\r\n        \"value\": \"StorageAccounts\",\r\n        \"localizedValue\": \"Storage Accounts\"\r\n      }\r\n    }\r\n  ]\r\n}",
       "StatusCode": 200
     }
   ],

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestGetAzureStorageAccountKey.json

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="11.0.0" />
   </ItemGroup>
 
 </Project>

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestGetAzureStorageLocationUsage.json

@@ -18,6 +18,13 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgrade to Microsoft.Azure.Management.Storage 11.0.0, to support new API version 2019-04-01.
+* The default Storage account Kind in Create Storage account change from 'Storage' to 'StorageV2'
+    - New-AzStorageAccount
+* Change the Storage account cmdlet output Sku.Name to be aligned with input SkuName by add '-', like "StandardLRS" change to "Standard_LRS"
+    - New-AzStorageAccount
+    - Get-AzStorageAccount
+    - Set-AzStorageAccount
 
 ## Version 1.2.0
 * Report detail error when create Storage context with parameter -UseConnectedAccount, but without login Azure account

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNetworkRule.json

@@ -17,7 +17,6 @@
 using Microsoft.Azure.Management.Storage.Models;
 using Microsoft.WindowsAzure.Commands.Common.Storage;
 using Microsoft.WindowsAzure.Commands.Storage.Adapters;
-using Microsoft.WindowsAzure.Storage;
 using System;
 using System.Collections.Generic;
 using Microsoft.WindowsAzure.Commands.Common.Attributes;
@@ -70,7 +69,7 @@ public PSStorageAccount(StorageModels.StorageAccount storageAccount)
         public Sku Sku { get; set; }
 
         [Ps1Xml(Label = "Kind", Target = ViewControl.Table, Position = 4)]
-        public Kind? Kind { get; set; }
+        public string Kind { get; set; }
         public Encryption Encryption { get; set; }
 
         [Ps1Xml(Label = "AccessTier", Target = ViewControl.Table, Position = 5)]

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccount.json

@@ -14,7 +14,7 @@
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="11.0.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="9.4.2" />
     <PackageReference Include="Microsoft.Azure.Storage.File" Version="9.4.2" />
     <PackageReference Include="Microsoft.Azure.Storage.Queue" Version="9.4.2" />

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountBlockBlobStorage.json

@@ -51,11 +51,11 @@ public class NewAzureStorageAccountCommand : StorageAccountBaseCmdlet
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Storage Account Sku Name.")]
         [Alias(StorageAccountTypeAlias, AccountTypeAlias, Account_TypeAlias)]
-        [ValidateSet(AccountTypeString.StandardLRS,
-            AccountTypeString.StandardZRS,
-            AccountTypeString.StandardGRS,
-            AccountTypeString.StandardRAGRS,
-            AccountTypeString.PremiumLRS,
+        [ValidateSet(StorageModels.SkuName.StandardLRS,
+            StorageModels.SkuName.StandardZRS,
+            StorageModels.SkuName.StandardGRS,
+            StorageModels.SkuName.StandardRAGRS,
+            StorageModels.SkuName.PremiumLRS,
             IgnoreCase = true)]
         public string SkuName { get; set; }
 
@@ -71,12 +71,23 @@ public class NewAzureStorageAccountCommand : StorageAccountBaseCmdlet
         [Parameter(
             Mandatory = false,
             HelpMessage = "Storage Account Kind.")]
-        [ValidateSet(AccountKind.Storage,
-            AccountKind.StorageV2,
-            AccountKind.BlobStorage,
-            AccountKind.BlockBlobStorage,
+        [ValidateSet(StorageModels.Kind.Storage,
+            StorageModels.Kind.StorageV2,
+            StorageModels.Kind.BlobStorage,
+            StorageModels.Kind.BlockBlobStorage,
             IgnoreCase = true)]
-        public string Kind { get; set; }
+        public string Kind
+        {
+            get
+            {
+                return kind;
+            }
+            set
+            {
+                kind = value;
+            }
+        }
+        private string kind = StorageModels.Kind.StorageV2;
 
         [Parameter(
             Mandatory = false,
@@ -167,7 +178,7 @@ public override void ExecuteCmdlet()
             StorageAccountCreateParameters createParameters = new StorageAccountCreateParameters()
             {
                 Location = this.Location,
-                Sku = new Sku(ParseSkuName(this.SkuName)),
+                Sku = new Sku(this.SkuName),
                 Tags = TagsConversionHelper.CreateTagDictionary(Tag, validate: true),
             };
 
@@ -184,9 +195,9 @@ public override void ExecuteCmdlet()
                 throw new System.ArgumentException(string.Format("UseSubDomain must be set together with CustomDomainName."));
             }
 
-            if (Kind != null)
+            if (kind != null)
             {
-                createParameters.Kind = ParseAccountKind(Kind);
+                createParameters.Kind = kind;
             }
 
             if (this.AccessTier != null)

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountKey.json

@@ -73,11 +73,11 @@ public SwitchParameter Force
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Storage Account Sku Name.")]
         [Alias(StorageAccountTypeAlias, AccountTypeAlias, Account_TypeAlias)]
-        [ValidateSet(AccountTypeString.StandardLRS,
-            AccountTypeString.StandardZRS,
-            AccountTypeString.StandardGRS,
-            AccountTypeString.StandardRAGRS,
-            AccountTypeString.PremiumLRS,
+        [ValidateSet(StorageModels.SkuName.StandardLRS,
+            StorageModels.SkuName.StandardZRS,
+            StorageModels.SkuName.StandardGRS,
+            StorageModels.SkuName.StandardRAGRS,
+            StorageModels.SkuName.PremiumLRS,
             IgnoreCase = true)]
         public string SkuName { get; set; }
 
@@ -197,7 +197,7 @@ public override void ExecuteCmdlet()
                     StorageAccountUpdateParameters updateParameters = new StorageAccountUpdateParameters();
                     if (this.SkuName != null)
                     {
-                        updateParameters.Sku = new Sku(ParseSkuName(this.SkuName));
+                        updateParameters.Sku = new Sku(this.SkuName);
                     }
 
                     if (this.Tag != null)

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestPipingGetAccountToGetKey.json

@@ -47,21 +47,6 @@ public abstract class StorageAccountBaseCmdlet : AzureRMCmdlet
 
         protected const string StorageUsageNounStr = "AzureRmStorageUsage";
 
-        protected struct AccountTypeString
-        {
-            internal const string StandardLRS = "Standard_LRS";
-            internal const string StandardZRS = "Standard_ZRS";
-            internal const string StandardGRS = "Standard_GRS";
-            internal const string StandardRAGRS = "Standard_RAGRS";
-            internal const string PremiumLRS = "Premium_LRS";
-        }
-        protected struct AccountKind
-        {
-            internal const string Storage = "Storage";
-            internal const string StorageV2 = "StorageV2";
-            internal const string BlobStorage = "BlobStorage";
-            internal const string BlockBlobStorage = "BlockBlobStorage";
-        }
         protected struct AccountAccessTier
         {
             internal const string Hot = "Hot";
@@ -113,25 +98,6 @@ public string SubscriptionId
             }
         }
 
-        protected static SkuName ParseSkuName(string skuName)
-        {
-            SkuName returnSkuName;
-            if (!Enum.TryParse<SkuName>(skuName.Replace("_", ""), true, out returnSkuName))
-            {
-                throw new ArgumentOutOfRangeException("SkuName");
-            }
-            return returnSkuName;
-        }
-
-        protected static Kind ParseAccountKind(string accountKind)
-        {
-            Kind returnKind;
-            if (!Enum.TryParse<Kind>(accountKind, true, out returnKind))
-            {
-                throw new ArgumentOutOfRangeException("Kind");
-            }
-            return returnKind;
-        }
         protected static AccessTier ParseAccessTier(string accessTier)
         {
             AccessTier returnAccessTier;

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestPipingNewUpdateAccount.json

@@ -10,16 +10,16 @@
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
   </PropertyGroup>
 
-   <ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.StorageSync" Version="3.0.0" />
-	<PackageReference Include="Microsoft.Azure.Management.Storage" Version="10.0.0" />
-	<PackageReference Include="System.Management" Version="4.5.0" />
-	</ItemGroup>
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="11.0.0" />
+    <PackageReference Include="System.Management" Version="4.5.0" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Storage\Storage.Management\Storage.Management.csproj" />
     <ProjectReference Include="..\..\Storage\Storage\Storage.csproj" />
     <ProjectReference Include="..\StorageSync\StorageSync.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>