Merge pull request #10876 from wastoresh/EncryQTga

[Storage]Support set Table/Queue Encyrption Keytype in Create Storage Account

Author: isra-fel

src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.2.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.3.0" />
   </ItemGroup>
 
 </Project>

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

@@ -176,5 +176,12 @@ public void TestNewSetAzureStorageAccount_LargeFileShare()
         {
             TestRunner.RunTestScript("Test-NewSetAzureStorageAccount_LargeFileShare");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewAzureStorageAccountQueueTableEncrytionKeyType()
+        {
+            TestRunner.RunTestScript("Test-NewAzureStorageAccountQueueTableEncrytionKeyType");
+        }
     }
 }

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

@@ -1147,4 +1147,46 @@ function Test-NewSetAzureStorageAccount_LargeFileShare
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Test Test-NewAzureStorageAccountQueueTableEncrytionKeyType
+.DESCRIPTION
+SmokeTest
+#>
+function Test-NewAzureStorageAccountQueueTableEncrytionKeyType
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Standard_LRS';
+        $loc = Get-ProviderLocation_Canary 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 -EncryptionKeyTypeForTable Account -EncryptionKeyTypeForQueue Account
+
+        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 "Account" $sto.Encryption.Services.Queue.KeyType
+        Assert-AreEqual "Account" $sto.Encryption.Services.Table.KeyType
+
+        Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
 }