[Azure.Storage] Fix a null reference issue in New-AzureRMStorageAccount

src/ResourceManager/Storage/ChangeLog.md

@@ -24,6 +24,7 @@
     - Set-AzureRmStorageAccount
 * Added Location Completer to -Location parameters allowing tab completion through valid Locations
 * Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
+* Fix a null reference issue of run cmdlet New-AzureRMStorageAccount with parameter -EnableEncryptionService None
 * Added -AsJob support for long-running Storage cmdlets. Allows selected cmdlets to run in the background and return a job to track and control progress.
     - Affected cmdlets are New-, Remove-, Add-, and Update- for Storage Account and Storage Account Network Rule.
 ## Version 4.0.1

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

@@ -203,6 +203,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccountStorageV2.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestNewAzureStorageAccountEncryptionServiceNone.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

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

@@ -118,5 +118,12 @@ public void TestSetAzureStorageAccountStorageV2()
         {
             TestController.NewInstance.RunPsTest("Test-SetAzureStorageAccountStorageV2");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewAzureStorageAccountEncryptionServiceNone()
+        {
+            TestController.NewInstance.RunPsTest("Test-NewAzureStorageAccountEncryptionServiceNone");
+        }
     }
 }

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

@@ -662,4 +662,60 @@ function Test-SetAzureStorageAccountStorageV2
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+
+<#
+.SYNOPSIS
+Test NewSetAzureStorageAccount with EncryptionService None
+.Description
+AzureAutomationTest
+#>
+function Test-NewAzureStorageAccountEncryptionServiceNone
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Standard_GRS';
+        $loc = Get-ProviderLocation ResourceManagement;
+		$kind = 'StorageV2'
+
+        New-AzureRmResourceGroup -Name $rgname -Location $loc;
+        $loc = Get-ProviderLocation_Stage ResourceManagement;
+        New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind -EnableEncryptionService None;
+
+        Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+        $stotype = 'StandardGRS';
+        Assert-AreEqual $sto.StorageAccountName $stoname;
+        Assert-AreEqual $sto.Sku.Name $stotype;
+        Assert-AreEqual $sto.Location $loc;
+        Assert-AreEqual $sto.Kind $kind;   
+
+        Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -EnableHttpsTrafficOnly $true -EnableEncryptionService None;
+        $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
+        Assert-AreEqual $sto.StorageAccountName $stoname;
+        Assert-AreEqual $sto.Sku.Name $stotype;
+        Assert-AreEqual $sto.Location $loc;
+        Assert-AreEqual $sto.Kind $kind;
+        Assert-AreEqual $sto.EnableHttpsTrafficOnly $true;    
+
+        Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -EnableHttpsTrafficOnly $false -DisableEncryptionService None;
+        $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
+        Assert-AreEqual $sto.StorageAccountName $stoname;
+        Assert-AreEqual $sto.Sku.Name $stotype;
+        Assert-AreEqual $sto.Location $loc;
+        Assert-AreEqual $sto.Kind $kind;
+        Assert-AreEqual $sto.EnableHttpsTrafficOnly $false;
+
+        Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
 }