diff --git a/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs b/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs
index baa71fab7bca..33ab3f2e08e0 100644
--- a/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs
+++ b/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs
@@ -197,5 +197,12 @@ public void TestNewSetAzureStorageAccount_LargeFileShare()
{
TestRunner.RunTestScript("Test-NewSetAzureStorageAccount_LargeFileShare");
}
+
+ [Fact]
+ [Trait(Category.AcceptanceType, Category.CheckIn)]
+ public void TestNewAzureStorageAccountQueueTableEncrytionKeyType()
+ {
+ TestRunner.RunTestScript("Test-NewAzureStorageAccountQueueTableEncrytionKeyType");
+ }
}
}
diff --git a/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1 b/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1
index 5d11362c9c56..9006f75351c8 100644
--- a/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1
+++ b/src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1
@@ -1289,4 +1289,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 Service -EncryptionKeyTypeForQueue Service
+
+ 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.Blob.KeyType
+ Assert-AreEqual "Account" $sto.Encryption.Services.File.KeyType
+
+ Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
+ }
+ finally
+ {
+ # Cleanup
+ Clean-ResourceGroup $rgname
+ }
}
\ No newline at end of file
diff --git a/src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountQueueTableEncrytionKeyType.json b/src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountQueueTableEncrytionKeyType.json
new file mode 100644
index 000000000000..5c76895d67c5
--- /dev/null
+++ b/src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountQueueTableEncrytionKeyType.json
@@ -0,0 +1,747 @@
+{
+ "Entries": [
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourcegroups/pstestrg7294?api-version=2016-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Jlc291cmNlZ3JvdXBzL3BzdGVzdHJnNzI5ND9hcGktdmVyc2lvbj0yMDE2LTA5LTAx",
+ "RequestMethod": "PUT",
+ "RequestBody": "{\r\n \"location\": \"eastus2euap\"\r\n}",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "1f8d11f9-aaf9-48a0-9af9-41cabb01ca92"
+ ],
+ "Accept-Language": [
+ "en-US"
+ ],
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.3.4"
+ ],
+ "Content-Type": [
+ "application/json; charset=utf-8"
+ ],
+ "Content-Length": [
+ "33"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-ratelimit-remaining-subscription-writes": [
+ "1199"
+ ],
+ "x-ms-request-id": [
+ "2b4d8fb8-8c06-46ac-925d-9909bd91c4cd"
+ ],
+ "x-ms-correlation-request-id": [
+ "2b4d8fb8-8c06-46ac-925d-9909bd91c4cd"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090433Z:2b4d8fb8-8c06-46ac-925d-9909bd91c4cd"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:04:32 GMT"
+ ],
+ "Content-Length": [
+ "182"
+ ],
+ "Content-Type": [
+ "application/json; charset=utf-8"
+ ],
+ "Expires": [
+ "-1"
+ ]
+ },
+ "ResponseBody": "{\r\n \"id\": \"/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294\",\r\n \"name\": \"pstestrg7294\",\r\n \"location\": \"eastus2euap\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
+ "StatusCode": 201
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.Storage/checkNameAvailability?api-version=2019-06-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9jaGVja05hbWVBdmFpbGFiaWxpdHk/YXBpLXZlcnNpb249MjAxOS0wNi0wMQ==",
+ "RequestMethod": "POST",
+ "RequestBody": "{\r\n \"name\": \"stopstestrg7294\",\r\n \"type\": \"Microsoft.Storage/storageAccounts\"\r\n}",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "d6460c0d-f96c-41c3-8850-48dfdb609341"
+ ],
+ "Accept-Language": [
+ "en-US"
+ ],
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Storage.StorageManagementClient/14.3.0.0"
+ ],
+ "Content-Type": [
+ "application/json; charset=utf-8"
+ ],
+ "Content-Length": [
+ "81"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-request-id": [
+ "714e154b-f175-42b7-b4e7-9f615c54dae2"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "Server": [
+ "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11985"
+ ],
+ "x-ms-correlation-request-id": [
+ "dcfe96bd-f773-4337-a46d-db22561b0a03"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090434Z:dcfe96bd-f773-4337-a46d-db22561b0a03"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:04:33 GMT"
+ ],
+ "Content-Length": [
+ "22"
+ ],
+ "Content-Type": [
+ "application/json"
+ ],
+ "Expires": [
+ "-1"
+ ]
+ },
+ "ResponseBody": "{\r\n \"nameAvailable\": true\r\n}",
+ "StatusCode": 200
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294/providers/Microsoft.Storage/storageAccounts/stopstestrg7294?api-version=2019-06-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Jlc291cmNlR3JvdXBzL3BzdGVzdHJnNzI5NC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL3N0b3BzdGVzdHJnNzI5ND9hcGktdmVyc2lvbj0yMDE5LTA2LTAx",
+ "RequestMethod": "PUT",
+ "RequestBody": "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\"\r\n },\r\n \"kind\": \"StorageV2\",\r\n \"location\": \"eastus2euap\",\r\n \"properties\": {\r\n \"encryption\": {\r\n \"services\": {\r\n \"table\": {\r\n \"keyType\": \"Service\"\r\n },\r\n \"queue\": {\r\n \"keyType\": \"Service\"\r\n }\r\n },\r\n \"keySource\": \"Microsoft.Storage\"\r\n }\r\n }\r\n}",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "5b036996-6437-4d49-be22-6c66094ebaad"
+ ],
+ "Accept-Language": [
+ "en-US"
+ ],
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Storage.StorageManagementClient/14.3.0.0"
+ ],
+ "Content-Type": [
+ "application/json; charset=utf-8"
+ ],
+ "Content-Length": [
+ "354"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "Location": [
+ "https://management.azure.com/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.Storage/locations/eastus2euap/asyncoperations/8d70d26b-f999-4048-b174-3dec11d53ec1?monitor=true&api-version=2019-06-01"
+ ],
+ "Retry-After": [
+ "17"
+ ],
+ "x-ms-request-id": [
+ "8d70d26b-f999-4048-b174-3dec11d53ec1"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "Server": [
+ "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
+ ],
+ "x-ms-ratelimit-remaining-subscription-writes": [
+ "1199"
+ ],
+ "x-ms-correlation-request-id": [
+ "728d62a0-9259-4757-8773-1f9bfd494835"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090441Z:728d62a0-9259-4757-8773-1f9bfd494835"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:04:41 GMT"
+ ],
+ "Content-Type": [
+ "text/plain; charset=utf-8"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Content-Length": [
+ "0"
+ ]
+ },
+ "ResponseBody": "",
+ "StatusCode": 202
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.Storage/locations/eastus2euap/asyncoperations/8d70d26b-f999-4048-b174-3dec11d53ec1?monitor=true&api-version=2019-06-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzMmV1YXAvYXN5bmNvcGVyYXRpb25zLzhkNzBkMjZiLWY5OTktNDA0OC1iMTc0LTNkZWMxMWQ1M2VjMT9tb25pdG9yPXRydWUmYXBpLXZlcnNpb249MjAxOS0wNi0wMQ==",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Storage.StorageManagementClient/14.3.0.0"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-request-id": [
+ "c8f930b4-7409-4f5b-b4e5-72930daf057f"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "Server": [
+ "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11984"
+ ],
+ "x-ms-correlation-request-id": [
+ "69810202-5249-4104-9422-8126c49c31b4"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090459Z:69810202-5249-4104-9422-8126c49c31b4"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:04:58 GMT"
+ ],
+ "Content-Length": [
+ "1265"
+ ],
+ "Content-Type": [
+ "application/json"
+ ],
+ "Expires": [
+ "-1"
+ ]
+ },
+ "ResponseBody": "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"tier\": \"Standard\"\r\n },\r\n \"kind\": \"StorageV2\",\r\n \"id\": \"/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294/providers/Microsoft.Storage/storageAccounts/stopstestrg7294\",\r\n \"name\": \"stopstestrg7294\",\r\n \"type\": \"Microsoft.Storage/storageAccounts\",\r\n \"location\": \"eastus2euap\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"privateEndpointConnections\": [],\r\n \"networkAcls\": {\r\n \"bypass\": \"AzureServices\",\r\n \"virtualNetworkRules\": [],\r\n \"ipRules\": [],\r\n \"defaultAction\": \"Allow\"\r\n },\r\n \"supportsHttpsTrafficOnly\": true,\r\n \"encryption\": {\r\n \"services\": {\r\n \"file\": {\r\n \"keyType\": \"Account\",\r\n \"enabled\": true,\r\n \"lastEnabledTime\": \"2019-12-27T09:04:41.1300321Z\"\r\n },\r\n \"blob\": {\r\n \"keyType\": \"Account\",\r\n \"enabled\": true,\r\n \"lastEnabledTime\": \"2019-12-27T09:04:41.1300321Z\"\r\n }\r\n },\r\n \"keySource\": \"Microsoft.Storage\"\r\n },\r\n \"accessTier\": \"Hot\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"creationTime\": \"2019-12-27T09:04:41.0987685Z\",\r\n \"primaryEndpoints\": {\r\n \"dfs\": \"https://stopstestrg7294.dfs.core.windows.net/\",\r\n \"web\": \"https://stopstestrg7294.z3.web.core.windows.net/\",\r\n \"blob\": \"https://stopstestrg7294.blob.core.windows.net/\",\r\n \"queue\": \"https://stopstestrg7294.queue.core.windows.net/\",\r\n \"table\": \"https://stopstestrg7294.table.core.windows.net/\",\r\n \"file\": \"https://stopstestrg7294.file.core.windows.net/\"\r\n },\r\n \"primaryLocation\": \"eastus2euap\",\r\n \"statusOfPrimary\": \"available\"\r\n }\r\n}",
+ "StatusCode": 200
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294/providers/Microsoft.Storage/storageAccounts/stopstestrg7294?api-version=2019-06-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Jlc291cmNlR3JvdXBzL3BzdGVzdHJnNzI5NC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL3N0b3BzdGVzdHJnNzI5ND9hcGktdmVyc2lvbj0yMDE5LTA2LTAx",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "ee638064-6875-45c8-a8c8-c3e7064c4478"
+ ],
+ "Accept-Language": [
+ "en-US"
+ ],
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Storage.StorageManagementClient/14.3.0.0"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-request-id": [
+ "59e4bcc9-e177-48d9-a3dd-73ef093e1c3d"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "Server": [
+ "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11983"
+ ],
+ "x-ms-correlation-request-id": [
+ "516e9f80-4bd5-4f45-a764-d61bcdefa934"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090459Z:516e9f80-4bd5-4f45-a764-d61bcdefa934"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:04:58 GMT"
+ ],
+ "Content-Length": [
+ "1265"
+ ],
+ "Content-Type": [
+ "application/json"
+ ],
+ "Expires": [
+ "-1"
+ ]
+ },
+ "ResponseBody": "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"tier\": \"Standard\"\r\n },\r\n \"kind\": \"StorageV2\",\r\n \"id\": \"/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294/providers/Microsoft.Storage/storageAccounts/stopstestrg7294\",\r\n \"name\": \"stopstestrg7294\",\r\n \"type\": \"Microsoft.Storage/storageAccounts\",\r\n \"location\": \"eastus2euap\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"privateEndpointConnections\": [],\r\n \"networkAcls\": {\r\n \"bypass\": \"AzureServices\",\r\n \"virtualNetworkRules\": [],\r\n \"ipRules\": [],\r\n \"defaultAction\": \"Allow\"\r\n },\r\n \"supportsHttpsTrafficOnly\": true,\r\n \"encryption\": {\r\n \"services\": {\r\n \"file\": {\r\n \"keyType\": \"Account\",\r\n \"enabled\": true,\r\n \"lastEnabledTime\": \"2019-12-27T09:04:41.1300321Z\"\r\n },\r\n \"blob\": {\r\n \"keyType\": \"Account\",\r\n \"enabled\": true,\r\n \"lastEnabledTime\": \"2019-12-27T09:04:41.1300321Z\"\r\n }\r\n },\r\n \"keySource\": \"Microsoft.Storage\"\r\n },\r\n \"accessTier\": \"Hot\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"creationTime\": \"2019-12-27T09:04:41.0987685Z\",\r\n \"primaryEndpoints\": {\r\n \"dfs\": \"https://stopstestrg7294.dfs.core.windows.net/\",\r\n \"web\": \"https://stopstestrg7294.z3.web.core.windows.net/\",\r\n \"blob\": \"https://stopstestrg7294.blob.core.windows.net/\",\r\n \"queue\": \"https://stopstestrg7294.queue.core.windows.net/\",\r\n \"table\": \"https://stopstestrg7294.table.core.windows.net/\",\r\n \"file\": \"https://stopstestrg7294.file.core.windows.net/\"\r\n },\r\n \"primaryLocation\": \"eastus2euap\",\r\n \"statusOfPrimary\": \"available\"\r\n }\r\n}",
+ "StatusCode": 200
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294/providers/Microsoft.Storage/storageAccounts/stopstestrg7294?api-version=2019-06-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Jlc291cmNlR3JvdXBzL3BzdGVzdHJnNzI5NC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL3N0b3BzdGVzdHJnNzI5ND9hcGktdmVyc2lvbj0yMDE5LTA2LTAx",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "7d10f402-a625-4646-a402-b29ba7be1086"
+ ],
+ "Accept-Language": [
+ "en-US"
+ ],
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Storage.StorageManagementClient/14.3.0.0"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-request-id": [
+ "ec8e0a41-cdff-4a83-ad3f-ae77251f547c"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "Server": [
+ "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11996"
+ ],
+ "x-ms-correlation-request-id": [
+ "4f501c56-43c2-424d-b766-2cdc6ef295a5"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090500Z:4f501c56-43c2-424d-b766-2cdc6ef295a5"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:05:00 GMT"
+ ],
+ "Content-Length": [
+ "1265"
+ ],
+ "Content-Type": [
+ "application/json"
+ ],
+ "Expires": [
+ "-1"
+ ]
+ },
+ "ResponseBody": "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\",\r\n \"tier\": \"Standard\"\r\n },\r\n \"kind\": \"StorageV2\",\r\n \"id\": \"/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294/providers/Microsoft.Storage/storageAccounts/stopstestrg7294\",\r\n \"name\": \"stopstestrg7294\",\r\n \"type\": \"Microsoft.Storage/storageAccounts\",\r\n \"location\": \"eastus2euap\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"privateEndpointConnections\": [],\r\n \"networkAcls\": {\r\n \"bypass\": \"AzureServices\",\r\n \"virtualNetworkRules\": [],\r\n \"ipRules\": [],\r\n \"defaultAction\": \"Allow\"\r\n },\r\n \"supportsHttpsTrafficOnly\": true,\r\n \"encryption\": {\r\n \"services\": {\r\n \"file\": {\r\n \"keyType\": \"Account\",\r\n \"enabled\": true,\r\n \"lastEnabledTime\": \"2019-12-27T09:04:41.1300321Z\"\r\n },\r\n \"blob\": {\r\n \"keyType\": \"Account\",\r\n \"enabled\": true,\r\n \"lastEnabledTime\": \"2019-12-27T09:04:41.1300321Z\"\r\n }\r\n },\r\n \"keySource\": \"Microsoft.Storage\"\r\n },\r\n \"accessTier\": \"Hot\",\r\n \"provisioningState\": \"Succeeded\",\r\n \"creationTime\": \"2019-12-27T09:04:41.0987685Z\",\r\n \"primaryEndpoints\": {\r\n \"dfs\": \"https://stopstestrg7294.dfs.core.windows.net/\",\r\n \"web\": \"https://stopstestrg7294.z3.web.core.windows.net/\",\r\n \"blob\": \"https://stopstestrg7294.blob.core.windows.net/\",\r\n \"queue\": \"https://stopstestrg7294.queue.core.windows.net/\",\r\n \"table\": \"https://stopstestrg7294.table.core.windows.net/\",\r\n \"file\": \"https://stopstestrg7294.file.core.windows.net/\"\r\n },\r\n \"primaryLocation\": \"eastus2euap\",\r\n \"statusOfPrimary\": \"available\"\r\n }\r\n}",
+ "StatusCode": 200
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourceGroups/pstestrg7294/providers/Microsoft.Storage/storageAccounts/stopstestrg7294?api-version=2019-06-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Jlc291cmNlR3JvdXBzL3BzdGVzdHJnNzI5NC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL3N0b3BzdGVzdHJnNzI5ND9hcGktdmVyc2lvbj0yMDE5LTA2LTAx",
+ "RequestMethod": "DELETE",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "ad92af80-0c18-4c29-b5ab-78fd6ffd5987"
+ ],
+ "Accept-Language": [
+ "en-US"
+ ],
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Storage.StorageManagementClient/14.3.0.0"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-request-id": [
+ "a4bc220a-a123-42fa-8d44-192d03de426c"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "Server": [
+ "Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
+ ],
+ "x-ms-ratelimit-remaining-subscription-deletes": [
+ "14999"
+ ],
+ "x-ms-correlation-request-id": [
+ "c71f7084-4541-4f5e-a0b1-5d9ccc3d830d"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090510Z:c71f7084-4541-4f5e-a0b1-5d9ccc3d830d"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:05:09 GMT"
+ ],
+ "Content-Type": [
+ "text/plain; charset=utf-8"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Content-Length": [
+ "0"
+ ]
+ },
+ "ResponseBody": "",
+ "StatusCode": 200
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/resourcegroups/pstestrg7294?api-version=2016-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Jlc291cmNlZ3JvdXBzL3BzdGVzdHJnNzI5ND9hcGktdmVyc2lvbj0yMDE2LTA5LTAx",
+ "RequestMethod": "DELETE",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "x-ms-client-request-id": [
+ "30026de1-2786-41c7-a29d-e34119784d28"
+ ],
+ "Accept-Language": [
+ "en-US"
+ ],
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.3.4"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "Location": [
+ "https://management.azure.com/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1QU1RFU1RSRzcyOTQtRUFTVFVTMkVVQVAiLCJqb2JMb2NhdGlvbiI6ImVhc3R1czJldWFwIn0?api-version=2016-09-01"
+ ],
+ "Retry-After": [
+ "15"
+ ],
+ "x-ms-ratelimit-remaining-subscription-deletes": [
+ "14999"
+ ],
+ "x-ms-request-id": [
+ "a0d7bdd0-3db0-4a32-81d4-5e4c1588808e"
+ ],
+ "x-ms-correlation-request-id": [
+ "a0d7bdd0-3db0-4a32-81d4-5e4c1588808e"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090519Z:a0d7bdd0-3db0-4a32-81d4-5e4c1588808e"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:05:18 GMT"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Content-Length": [
+ "0"
+ ]
+ },
+ "ResponseBody": "",
+ "StatusCode": 202
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1QU1RFU1RSRzcyOTQtRUFTVFVTMkVVQVAiLCJqb2JMb2NhdGlvbiI6ImVhc3R1czJldWFwIn0?api-version=2016-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L29wZXJhdGlvbnJlc3VsdHMvZXlKcWIySkpaQ0k2SWxKRlUwOVZVa05GUjFKUFZWQkVSVXhGVkVsUFRrcFBRaTFRVTFSRlUxUlNSemN5T1RRdFJVRlRWRlZUTWtWVlFWQWlMQ0pxYjJKTWIyTmhkR2x2YmlJNkltVmhjM1IxY3pKbGRXRndJbjA/YXBpLXZlcnNpb249MjAxNi0wOS0wMQ==",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.3.4"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "Location": [
+ "https://management.azure.com/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1QU1RFU1RSRzcyOTQtRUFTVFVTMkVVQVAiLCJqb2JMb2NhdGlvbiI6ImVhc3R1czJldWFwIn0?api-version=2016-09-01"
+ ],
+ "Retry-After": [
+ "15"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11988"
+ ],
+ "x-ms-request-id": [
+ "e89724cb-1435-4057-b3d7-b8583d9ee9b7"
+ ],
+ "x-ms-correlation-request-id": [
+ "e89724cb-1435-4057-b3d7-b8583d9ee9b7"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090534Z:e89724cb-1435-4057-b3d7-b8583d9ee9b7"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:05:34 GMT"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Content-Length": [
+ "0"
+ ]
+ },
+ "ResponseBody": "",
+ "StatusCode": 202
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1QU1RFU1RSRzcyOTQtRUFTVFVTMkVVQVAiLCJqb2JMb2NhdGlvbiI6ImVhc3R1czJldWFwIn0?api-version=2016-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L29wZXJhdGlvbnJlc3VsdHMvZXlKcWIySkpaQ0k2SWxKRlUwOVZVa05GUjFKUFZWQkVSVXhGVkVsUFRrcFBRaTFRVTFSRlUxUlNSemN5T1RRdFJVRlRWRlZUTWtWVlFWQWlMQ0pxYjJKTWIyTmhkR2x2YmlJNkltVmhjM1IxY3pKbGRXRndJbjA/YXBpLXZlcnNpb249MjAxNi0wOS0wMQ==",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.3.4"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "Location": [
+ "https://management.azure.com/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1QU1RFU1RSRzcyOTQtRUFTVFVTMkVVQVAiLCJqb2JMb2NhdGlvbiI6ImVhc3R1czJldWFwIn0?api-version=2016-09-01"
+ ],
+ "Retry-After": [
+ "15"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11991"
+ ],
+ "x-ms-request-id": [
+ "41ad4c02-fad4-4d69-9a67-74555bf89da2"
+ ],
+ "x-ms-correlation-request-id": [
+ "41ad4c02-fad4-4d69-9a67-74555bf89da2"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090550Z:41ad4c02-fad4-4d69-9a67-74555bf89da2"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:05:50 GMT"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Content-Length": [
+ "0"
+ ]
+ },
+ "ResponseBody": "",
+ "StatusCode": 202
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1QU1RFU1RSRzcyOTQtRUFTVFVTMkVVQVAiLCJqb2JMb2NhdGlvbiI6ImVhc3R1czJldWFwIn0?api-version=2016-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L29wZXJhdGlvbnJlc3VsdHMvZXlKcWIySkpaQ0k2SWxKRlUwOVZVa05GUjFKUFZWQkVSVXhGVkVsUFRrcFBRaTFRVTFSRlUxUlNSemN5T1RRdFJVRlRWRlZUTWtWVlFWQWlMQ0pxYjJKTWIyTmhkR2x2YmlJNkltVmhjM1IxY3pKbGRXRndJbjA/YXBpLXZlcnNpb249MjAxNi0wOS0wMQ==",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.3.4"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11985"
+ ],
+ "x-ms-request-id": [
+ "08369111-9294-48bc-a447-bbd2b85f6b5e"
+ ],
+ "x-ms-correlation-request-id": [
+ "08369111-9294-48bc-a447-bbd2b85f6b5e"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090606Z:08369111-9294-48bc-a447-bbd2b85f6b5e"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:06:06 GMT"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Content-Length": [
+ "0"
+ ]
+ },
+ "ResponseBody": "",
+ "StatusCode": 200
+ },
+ {
+ "RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1QU1RFU1RSRzcyOTQtRUFTVFVTMkVVQVAiLCJqb2JMb2NhdGlvbiI6ImVhc3R1czJldWFwIn0?api-version=2016-09-01",
+ "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L29wZXJhdGlvbnJlc3VsdHMvZXlKcWIySkpaQ0k2SWxKRlUwOVZVa05GUjFKUFZWQkVSVXhGVkVsUFRrcFBRaTFRVTFSRlUxUlNSemN5T1RRdFJVRlRWRlZUTWtWVlFWQWlMQ0pxYjJKTWIyTmhkR2x2YmlJNkltVmhjM1IxY3pKbGRXRndJbjA/YXBpLXZlcnNpb249MjAxNi0wOS0wMQ==",
+ "RequestMethod": "GET",
+ "RequestBody": "",
+ "RequestHeaders": {
+ "User-Agent": [
+ "FxVersion/4.6.27817.03",
+ "OSName/Windows",
+ "OSVersion/Microsoft.Windows.10.0.18363.",
+ "Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.3.4"
+ ]
+ },
+ "ResponseHeaders": {
+ "Cache-Control": [
+ "no-cache"
+ ],
+ "Pragma": [
+ "no-cache"
+ ],
+ "x-ms-ratelimit-remaining-subscription-reads": [
+ "11984"
+ ],
+ "x-ms-request-id": [
+ "b9ef143a-18c0-4f7a-b18c-8ad436702ca6"
+ ],
+ "x-ms-correlation-request-id": [
+ "b9ef143a-18c0-4f7a-b18c-8ad436702ca6"
+ ],
+ "x-ms-routing-request-id": [
+ "SOUTHEASTASIA:20191227T090606Z:b9ef143a-18c0-4f7a-b18c-8ad436702ca6"
+ ],
+ "Strict-Transport-Security": [
+ "max-age=31536000; includeSubDomains"
+ ],
+ "X-Content-Type-Options": [
+ "nosniff"
+ ],
+ "Date": [
+ "Fri, 27 Dec 2019 09:06:06 GMT"
+ ],
+ "Expires": [
+ "-1"
+ ],
+ "Content-Length": [
+ "0"
+ ]
+ },
+ "ResponseBody": "",
+ "StatusCode": 200
+ }
+ ],
+ "Names": {
+ "Test-NewAzureStorageAccountQueueTableEncrytionKeyType": [
+ "pstestrg7294"
+ ]
+ },
+ "Variables": {
+ "SubscriptionId": "ce4a7590-4722-4bcf-a2c6-e473e9f11778"
+ }
+}
\ No newline at end of file
diff --git a/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj b/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj
index 4535fd375b5c..64a961b1ca8a 100644
--- a/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj
+++ b/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj
@@ -11,7 +11,7 @@
-
+
\ No newline at end of file
diff --git a/src/Storage/Storage.Management/ChangeLog.md b/src/Storage/Storage.Management/ChangeLog.md
index 26f8c15db42e..f40f26454bd4 100644
--- a/src/Storage/Storage.Management/ChangeLog.md
+++ b/src/Storage/Storage.Management/ChangeLog.md
@@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Upcoming Release
+* Support set Table/Queue Encyrption Keytype in Create Storage Account
+ - New-AzRmStorageAccount
* Add breaking change warning message for DefaultAction Value change in a future release
- Update-AzStorageAccountNetworkRuleSet
diff --git a/src/Storage/Storage.Management/Storage.Management.csproj b/src/Storage/Storage.Management/Storage.Management.csproj
index f9111d90718f..43e608c8fd08 100644
--- a/src/Storage/Storage.Management/Storage.Management.csproj
+++ b/src/Storage/Storage.Management/Storage.Management.csproj
@@ -14,10 +14,10 @@
$(LegacyAssemblyPrefix)$(PsModuleName)
-
-
-
-
+
+
+
+
diff --git a/src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs b/src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs
index b0894cce8679..fbb16af9ff4b 100644
--- a/src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs
+++ b/src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs
@@ -260,6 +260,18 @@ public bool EnableActiveDirectoryDomainServicesForFile
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
public SwitchParameter AsJob { get; set; }
+ [Parameter(Mandatory = false, HelpMessage = "Set the Encryption KeyType for Table. -Account, Table will be encrypted with account-scoped encryption key. -Service, Table will always be encrypted with Service-Managed keys. The default value is Service.")]
+ [ValidateSet(StorageModels.KeyType.Service,
+ StorageModels.KeyType.Account,
+ IgnoreCase = true)]
+ public string EncryptionKeyTypeForTable { get; set; }
+
+ [Parameter(Mandatory = false, HelpMessage = "Set the Encryption KeyType for Queue. -Account, Queue will be encrypted with account-scoped encryption key. -Service, Queue will always be encrypted with Service-Managed keys. The default value is Service.")]
+ [ValidateSet(StorageModels.KeyType.Service,
+ StorageModels.KeyType.Account,
+ IgnoreCase = true)]
+ public string EncryptionKeyTypeForQueue { get; set; }
+
public override void ExecuteCmdlet()
{
base.ExecuteCmdlet();
@@ -356,6 +368,20 @@ public override void ExecuteCmdlet()
{
createParameters.LargeFileSharesState = LargeFileSharesState.Enabled;
}
+ if(this.EncryptionKeyTypeForQueue != null || this.EncryptionKeyTypeForTable != null)
+ {
+ createParameters.Encryption = new Encryption();
+ createParameters.Encryption.KeySource = KeySource.MicrosoftStorage;
+ createParameters.Encryption.Services = new EncryptionServices();
+ if (this.EncryptionKeyTypeForQueue != null)
+ {
+ createParameters.Encryption.Services.Queue = new EncryptionService(keyType: this.EncryptionKeyTypeForQueue);
+ }
+ if (this.EncryptionKeyTypeForTable != null)
+ {
+ createParameters.Encryption.Services.Table = new EncryptionService(keyType: this.EncryptionKeyTypeForTable);
+ }
+ }
var createAccountResponse = this.StorageClient.StorageAccounts.Create(
this.ResourceGroupName,
diff --git a/src/Storage/Storage.Management/help/New-AzStorageAccount.md b/src/Storage/Storage.Management/help/New-AzStorageAccount.md
index c0b9ec178358..41736a381c60 100644
--- a/src/Storage/Storage.Management/help/New-AzStorageAccount.md
+++ b/src/Storage/Storage.Management/help/New-AzStorageAccount.md
@@ -19,7 +19,8 @@ New-AzStorageAccount [-ResourceGroupName] [-Name] [-SkuName] <
[-Kind ] [-AccessTier ] [-CustomDomainName ] [-UseSubDomain ]
[-Tag ] [-EnableHttpsTrafficOnly ] [-AssignIdentity] [-NetworkRuleSet ]
[-EnableHierarchicalNamespace ] [-EnableAzureActiveDirectoryDomainServicesForFile ]
- [-EnableLargeFileShare] [-AsJob] [-DefaultProfile ] []
+ [-EnableLargeFileShare] [-AsJob] [-EncryptionKeyTypeForTable ] [-EncryptionKeyTypeForQueue ]
+ [-DefaultProfile ] []
```
### ActiveDirectoryDomainServicesForFile
@@ -100,6 +101,13 @@ PS C:\>New-AzStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "m
This command creates a Storage account withenable Files Active Directory Domain Service Authentication.
+### Example 8: Create a Storage account with Queue and Table Service use account-scoped encryption key.
+```
+PS C:\>New-AzStorageAccount -ResourceGroupName "MyResourceGroup" -AccountName "mystorageaccount" -Location "eastus2euap" -SkuName "Standard_LRS" -Kind StorageV2 -EncryptionKeyTypeForTable Account -EncryptionKeyTypeForQueue Account
+```
+
+This command creates a Storage account with Queue and Table Service use account-scoped encryption key, so Queue and Table will use same encryption key with Blob and File service.
+
## PARAMETERS
### -AccessTier
@@ -351,6 +359,42 @@ Accept pipeline input: False
Accept wildcard characters: False
```
+### -EncryptionKeyTypeForQueue
+Set the Encryption KeyType for Queue. The default value is Service.
+-Account: Queue will be encrypted with account-scoped encryption key.
+-Service: Queue will always be encrypted with Service-Managed keys.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+Accepted values: Service, Account
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -EncryptionKeyTypeForTable
+Set the Encryption KeyType for Table. The default value is Service.
+- Account: Table will be encrypted with account-scoped encryption key.
+- Service: Table will always be encrypted with Service-Managed keys.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+Accepted values: Service, Account
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
### -EnableLargeFileShare
Indicates whether or not the storage account can support large file shares with more than 5 TiB capacity.
Once the account is enabled, the feature cannot be disabled.
diff --git a/tools/LocalFeed/Microsoft.Azure.Management.Storage.14.3.0.nupkg b/tools/LocalFeed/Microsoft.Azure.Management.Storage.14.3.0.nupkg
new file mode 100644
index 000000000000..0ea89a3bd4eb
Binary files /dev/null and b/tools/LocalFeed/Microsoft.Azure.Management.Storage.14.3.0.nupkg differ