RDBug 7069788:[PSH] fix the breaking change on New/Get/Set-AzureRMStorageAccount for Sku.Name, and New-AzureRMstorageAccountKey

Author: blueww

ChangeLog.md

@@ -1,8 +1,14 @@
 ##2016.08.22 version 1.7.0
 * Azure Storage
-  * Change the return type of Get-AzureRmStorageAccountKey cmdlet, to make both of following works (To migrate a breaking change from 1.4.0)
+  * Change the return type of Get-AzureRmStorageAccountKey cmdlet, to make both of following works (Migrate breaking change from 1.4.0)
     - $key = (Get-AzureRmStorageAccountKey -ResourceGroupName $groupname -Name $accountname).Key1 
     - $key = (Get-AzureRmStorageAccountKey -ResourceGroupName $groupname -Name $accountname)[0].Value 
+  * Change the return type of New/Get/Set-AzureRMStorageAccount cmdlet by add back AccountType, to make both of following works (Migrate breaking change from 1.4.0)
+    - $AccountType = (Get-AzureRmStorageAccount -ResourceGroupName $groupname -Name $accountname).AccountType
+    - $AccountType = (Get-AzureRmStorageAccount -ResourceGroupName $groupname -Name $accountname).Sku.Name
+  * Change the return type of New-AzureRmStorageAccountKey cmdlet, to make both of following works (Migrate breaking change from 1.4.0)
+    - $key = (Get-AzureRmStorageAccountKey -ResourceGroupName $groupname -Name $accountname -KeyName $keyname).StorageAccountKeys.Key1
+    - $key = (Get-AzureRmStorageAccountKey -ResourceGroupName $groupname -Name $accountname -KeyName $keyname).Keys[0].Value
 
 ##2016.07.11 version 1.6.0
 * **Behavioral change for -Force, –Confirm and $ConfirmPreference parameters for all cmdlets. We are changing this implementation to be in line with PowerShell guidelines. For most cmdlets, this means removing the Force parameter and to skip the ShouldProcess prompt, users will need to include the parameter: ‘-Confirm:$false’ in their PowerShell scripts.** This changes are addressing following issues:

src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj

@@ -142,9 +142,11 @@
     <Compile Include="..\..\..\Common\Commands.Common.Storage\Adapters\ARM.Storage.5\ARMStorageService.cs">
       <Link>Common\ARMStorageService.cs</Link>
     </Compile>
+    <Compile Include="Models\AccountType.cs" />
     <Compile Include="Models\PSStorageAccount.cs" />
     <Compile Include="Models\PSUsage.cs" />
     <Compile Include="Models\StorageAccountKeys.cs" />
+    <Compile Include="Models\StorageAccountRegenerateKeyResponse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StorageAccount\GetAzureStorageAccount.cs" />
     <Compile Include="StorageAccount\GetAzureStorageAccountKey.cs" />

src/ResourceManager/Storage/Commands.Management.Storage/Models/AccountType.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Management.Storage.Models
+{
+    public enum AccountType
+    {
+        StandardLRS = 0,
+        StandardZRS = 1,
+        StandardGRS = 2,
+        StandardRAGRS = 3,
+        PremiumLRS = 4
+    }
+}

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

@@ -31,6 +31,7 @@ public PSStorageAccount(StorageModels.StorageAccount storageAccount)
             this.Id = storageAccount.Id;
             this.Location = storageAccount.Location;
             this.Sku = storageAccount.Sku;
+            this.AccountType = GetAccountType(storageAccount.Sku);
             this.Encryption = storageAccount.Encryption;
             this.Kind = storageAccount.Kind;
             this.AccessTier = storageAccount.AccessTier;
@@ -56,6 +57,7 @@ public PSStorageAccount(StorageModels.StorageAccount storageAccount)
         public string Location { get; set; }
 
         public Sku Sku { get; set; }
+        public AccountType AccountType { get; set; }
         public Kind? Kind { get; set; }
         public Encryption Encryption { get; set; }
         public AccessTier? AccessTier { get; set; }
@@ -121,5 +123,26 @@ public override string ToString()
             // Allow listing storage contents through piping
             return null;
         }
+
+        /// <summary>
+        /// Convert SkuName to Account Type
+        /// </summary>
+        public static AccountType GetAccountType(Sku sku)
+        {
+            switch (sku.Name)
+            {
+                case SkuName.PremiumLRS:
+                    return AccountType.PremiumLRS;
+                case SkuName.StandardLRS:
+                    return AccountType.StandardLRS;
+                case SkuName.StandardRAGRS:
+                    return AccountType.StandardRAGRS;
+                case SkuName.StandardZRS:
+                    return AccountType.StandardZRS;
+                case SkuName.StandardGRS:
+                default:
+                    return AccountType.StandardGRS;
+            }
+        }
     }
 }

src/ResourceManager/Storage/Commands.Management.Storage/Models/StorageAccountRegenerateKeyResponse.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Management.Storage.Models
+{
+    class StorageAccountRegenerateKeyResponse
+    {
+        public StorageAccountRegenerateKeyResponse(StorageAccountListKeysResult result) 
+        {
+            if (result.Keys !=null)
+            {
+                StorageAccountKeys = new StorageAccountKeys(result.Keys);
+                Keys = result.Keys;
+            }
+        }
+        public StorageAccountKeys StorageAccountKeys { get; set; }
+        public IList<StorageAccountKey> Keys { get; }
+    }
+}

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/NewAzureStorageAccountKey.cs

@@ -18,7 +18,7 @@
 
 namespace Microsoft.Azure.Commands.Management.Storage
 {
-    [Cmdlet(VerbsCommon.New, StorageAccountKeyNounStr), OutputType(typeof(StorageAccountKey))]
+    [Cmdlet(VerbsCommon.New, StorageAccountKeyNounStr), OutputType(typeof(StorageAccountKeys))]
     public class NewAzureStorageAccountKeyCommand : StorageAccountBaseCmdlet
     {
         private const string Key1 = "key1";
@@ -59,7 +59,7 @@ public override void ExecuteCmdlet()
                 this.Name,
                 this.KeyName);
 
-            WriteObject(keys);
+            WriteObject(new StorageAccountRegenerateKeyResponse(keys));
         }
     }
 }