From e5d6c0e193255b53afc08b1ad159d88cebf8fc2b Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Thu, 11 Jun 2020 16:56:52 -0700 Subject: [PATCH 1/8] Add allowBlobPublicAccess and minimumTlsVersion properties --- .../stable/2019-06-01/storage.json | 57 ++++++++++++++++++- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json index 9416555d58d2..191246ac75f5 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json @@ -2131,7 +2131,24 @@ "$ref": "#/definitions/RoutingPreference", "x-ms-client-name": "RoutingPreference", "description": "Maintains information about the network routing choice opted by the user for data transfer" - } + }, + "allowBlobPublicAccess": { + "type": "boolean", + "x-ms-client-name": "AllowBlobPublicAccess", + "description": "Allow or disallow public access to all blobs or containers in the storage account." + }, + "minimumTlsVersion": { + "type": "string", + "enum": [ + "TLS1_0", + "TLS1_1", + "TLS1_2" + ], + "x-ms-enum": { + "name": "MinimumTlsVersion", + "modelAsString": true + }, + "description": "Set the minimum TLS version to be permitted on requests to storage." }, "description": "The parameters used to create the storage account." }, @@ -2566,7 +2583,24 @@ "x-ms-client-name": "BlobRestoreStatus", "description": "Blob restore status", "readOnly": true - } + }, + "allowBlobPublicAccess": { + "type": "boolean", + "x-ms-client-name": "AllowBlobPublicAccess", + "description": "Allow or disallow public access to all blobs or containers in the storage account." + }, + "minimumTlsVersion": { + "type": "string", + "enum": [ + "TLS1_0", + "TLS1_1", + "TLS1_2" + ], + "x-ms-enum": { + "name": "MinimumTlsVersion", + "modelAsString": true + }, + "description": "Set the minimum TLS version to be permitted on requests to storage." }, "description": "Properties of the storage account." }, @@ -2733,7 +2767,24 @@ "$ref": "#/definitions/RoutingPreference", "x-ms-client-name": "RoutingPreference", "description": "Maintains information about the network routing choice opted by the user for data transfer" - } + }, + "allowBlobPublicAccess": { + "type": "boolean", + "x-ms-client-name": "AllowBlobPublicAccess", + "description": "Allow or disallow public access to all blobs or containers in the storage account." + }, + "minimumTlsVersion": { + "type": "string", + "enum": [ + "TLS1_0", + "TLS1_1", + "TLS1_2" + ], + "x-ms-enum": { + "name": "MinimumTlsVersion", + "modelAsString": true + }, + "description": "Set the minimum TLS version to be permitted on requests to storage." }, "description": "The parameters used when updating a storage account." }, From 6f1ef145e815170230827ef1bd4b5126ed923fe4 Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Fri, 12 Jun 2020 11:19:47 -0700 Subject: [PATCH 2/8] Adding allowBlobPublicAccess and minimumTlsVersion properties to april19 swagger version. --- .../stable/2019-04-01/storage.json | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json index 8ce581604c9e..ee510b403791 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json @@ -1451,6 +1451,24 @@ "modelAsString": true }, "description": "Allow large file shares if sets to Enabled. It cannot be disabled once it is enabled." + }, + "allowBlobPublicAccess": { + "type": "boolean", + "x-ms-client-name": "AllowBlobPublicAccess", + "description": "Allow or disallow public access to all blobs or containers in the storage account." + }, + "minimumTlsVersion": { + "type": "string", + "enum": [ + "TLS1_0", + "TLS1_1", + "TLS1_2" + ], + "x-ms-enum": { + "name": "MinimumTlsVersion", + "modelAsString": true + }, + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "The parameters used to create the storage account." @@ -1738,6 +1756,24 @@ "modelAsString": true }, "description": "Allow large file shares if sets to Enabled. It cannot be disabled once it is enabled." + }, + "allowBlobPublicAccess": { + "type": "boolean", + "x-ms-client-name": "AllowBlobPublicAccess", + "description": "Allow or disallow public access to all blobs or containers in the storage account." + }, + "minimumTlsVersion": { + "type": "string", + "enum": [ + "TLS1_0", + "TLS1_1", + "TLS1_2" + ], + "x-ms-enum": { + "name": "MinimumTlsVersion", + "modelAsString": true + }, + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "Properties of the storage account." @@ -1900,6 +1936,24 @@ "modelAsString": true }, "description": "Allow large file shares if sets to Enabled. It cannot be disabled once it is enabled." + }, + "allowBlobPublicAccess": { + "type": "boolean", + "x-ms-client-name": "AllowBlobPublicAccess", + "description": "Allow or disallow public access to all blobs or containers in the storage account." + }, + "minimumTlsVersion": { + "type": "string", + "enum": [ + "TLS1_0", + "TLS1_1", + "TLS1_2" + ], + "x-ms-enum": { + "name": "MinimumTlsVersion", + "modelAsString": true + }, + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "The parameters used when updating a storage account." From 49ffaa0bb7fe9e86254561aeb7364af85c1897ad Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Fri, 12 Jun 2020 11:40:29 -0700 Subject: [PATCH 3/8] validation fix, added example --- ...WithAllowBlobPublicAcessAndTlsVersion.json | 94 +++++++++++++++++++ ...WithAllowBlobPublicAcessAndTlsVersion.json | 94 +++++++++++++++++++ .../stable/2019-06-01/storage.json | 3 + 3 files changed, 191 insertions(+) create mode 100644 specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json create mode 100644 specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json new file mode 100644 index 000000000000..63967a5f80d8 --- /dev/null +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json @@ -0,0 +1,94 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "res9101", + "accountName": "sto4445", + "api-version": "2019-04-01", + "parameters": { + "sku": { + "name": "Standard_GRS" + }, + "kind": "Storage", + "location": "eastus", + "properties": { + "isHnsEnabled": true, + "allowBlobPublicAccess": true, + "minimumTlsVersion": "TLS1_2", + "encryption": { + "services": { + "file": { + "keyType": "Account", + "enabled": true + }, + "blob": { + "keyType": "Account", + "enabled": true + } + }, + "requireInfrastructureEncryption": false, + "keySource": "Microsoft.Storage" + } + }, + "tags": { + "key1": "value1", + "key2": "value2" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Storage/storageAccounts/sto4445", + "kind": "Storage", + "location": "eastus", + "name": "sto4445", + "properties": { + "isHnsEnabled": true, + "allowBlobPublicAccess": true, + "minimumTlsVersion": "TLS1_2", + "creationTime": "2017-05-24T13:25:33.4863236Z", + "primaryEndpoints": { + "web": "https://sto4445.web.core.windows.net/", + "dfs": "https://sto4445.dfs.core.windows.net/", + "blob": "https://sto4445.blob.core.windows.net/", + "file": "https://sto4445.file.core.windows.net/", + "queue": "https://sto4445.queue.core.windows.net/", + "table": "https://sto4445.table.core.windows.net/" + }, + "primaryLocation": "eastus2euap", + "provisioningState": "Succeeded", + "encryption": { + "services": { + "file": { + "keyType": "Account", + "enabled": true, + "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" + }, + "blob": { + "keyType": "Account", + "enabled": true, + "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" + } + }, + "requireInfrastructureEncryption": false, + "keySource": "Microsoft.Storage" + }, + "secondaryLocation": "centraluseuap", + "statusOfPrimary": "available", + "statusOfSecondary": "available", + "supportsHttpsTrafficOnly": true + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" + }, + "tags": { + "key1": "value1", + "key2": "value2" + }, + "type": "Microsoft.Storage/storageAccounts" + } + }, + "202": {} + } +} diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json new file mode 100644 index 000000000000..dba80ab6684b --- /dev/null +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json @@ -0,0 +1,94 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "resourceGroupName": "res9101", + "accountName": "sto4445", + "api-version": "2019-06-01", + "parameters": { + "sku": { + "name": "Standard_GRS" + }, + "kind": "Storage", + "location": "eastus", + "properties": { + "isHnsEnabled": true, + "allowBlobPublicAccess": true, + "minimumTlsVersion": "TLS1_2", + "encryption": { + "services": { + "file": { + "keyType": "Account", + "enabled": true + }, + "blob": { + "keyType": "Account", + "enabled": true + } + }, + "requireInfrastructureEncryption": false, + "keySource": "Microsoft.Storage" + } + }, + "tags": { + "key1": "value1", + "key2": "value2" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Storage/storageAccounts/sto4445", + "kind": "Storage", + "location": "eastus", + "name": "sto4445", + "properties": { + "isHnsEnabled": true, + "allowBlobPublicAccess": true, + "minimumTlsVersion": "TLS1_2", + "creationTime": "2017-05-24T13:25:33.4863236Z", + "primaryEndpoints": { + "web": "https://sto4445.web.core.windows.net/", + "dfs": "https://sto4445.dfs.core.windows.net/", + "blob": "https://sto4445.blob.core.windows.net/", + "file": "https://sto4445.file.core.windows.net/", + "queue": "https://sto4445.queue.core.windows.net/", + "table": "https://sto4445.table.core.windows.net/" + }, + "primaryLocation": "eastus2euap", + "provisioningState": "Succeeded", + "encryption": { + "services": { + "file": { + "keyType": "Account", + "enabled": true, + "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" + }, + "blob": { + "keyType": "Account", + "enabled": true, + "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" + } + }, + "requireInfrastructureEncryption": false, + "keySource": "Microsoft.Storage" + }, + "secondaryLocation": "centraluseuap", + "statusOfPrimary": "available", + "statusOfSecondary": "available", + "supportsHttpsTrafficOnly": true + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" + }, + "tags": { + "key1": "value1", + "key2": "value2" + }, + "type": "Microsoft.Storage/storageAccounts" + } + }, + "202": {} + } +} diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json index 191246ac75f5..1943aa6fa5e2 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json @@ -2149,6 +2149,7 @@ "modelAsString": true }, "description": "Set the minimum TLS version to be permitted on requests to storage." + } }, "description": "The parameters used to create the storage account." }, @@ -2601,6 +2602,7 @@ "modelAsString": true }, "description": "Set the minimum TLS version to be permitted on requests to storage." + } }, "description": "Properties of the storage account." }, @@ -2785,6 +2787,7 @@ "modelAsString": true }, "description": "Set the minimum TLS version to be permitted on requests to storage." + } }, "description": "The parameters used when updating a storage account." }, From 18280f16179c9acf504cc538e1769ea8f761bb92 Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Fri, 12 Jun 2020 11:45:27 -0700 Subject: [PATCH 4/8] filename correction --- ...orageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json} | 0 ...orageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/{StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json => StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json} (100%) rename specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/{StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json => StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json} (100%) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json similarity index 100% rename from specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json rename to specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json similarity index 100% rename from specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAcessAndTlsVersion.json rename to specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json From f11af0a74eba0b7a2b9d8d7c8eb5ede0065f9a2e Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Fri, 12 Jun 2020 12:57:02 -0700 Subject: [PATCH 5/8] Ran prettier check, Moved the example to StorageAccountCreate --- .../examples/StorageAccountCreate.json | 6 +- ...ithAllowBlobPublicAccessAndTlsVersion.json | 94 ------------------- .../stable/2019-04-01/storage.json | 6 +- .../examples/StorageAccountCreate.json | 4 + ...ithAllowBlobPublicAccessAndTlsVersion.json | 94 ------------------- .../stable/2019-06-01/storage.json | 6 +- 6 files changed, 15 insertions(+), 195 deletions(-) delete mode 100644 specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json delete mode 100644 specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreate.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreate.json index 716fd1ae6ced..d3930f349262 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreate.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreate.json @@ -11,7 +11,9 @@ "kind": "Storage", "location": "eastus2euap", "properties": { - "isHnsEnabled": true + "isHnsEnabled": true, + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2" }, "tags": { "key1": "value1", @@ -28,6 +30,8 @@ "name": "sto4445", "properties": { "isHnsEnabled": true, + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2", "creationTime": "2017-05-24T13:25:33.4863236Z", "primaryEndpoints": { "web": "https://sto4445.web.core.windows.net/", diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json deleted file mode 100644 index 63967a5f80d8..000000000000 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "parameters": { - "subscriptionId": "{subscription-id}", - "resourceGroupName": "res9101", - "accountName": "sto4445", - "api-version": "2019-04-01", - "parameters": { - "sku": { - "name": "Standard_GRS" - }, - "kind": "Storage", - "location": "eastus", - "properties": { - "isHnsEnabled": true, - "allowBlobPublicAccess": true, - "minimumTlsVersion": "TLS1_2", - "encryption": { - "services": { - "file": { - "keyType": "Account", - "enabled": true - }, - "blob": { - "keyType": "Account", - "enabled": true - } - }, - "requireInfrastructureEncryption": false, - "keySource": "Microsoft.Storage" - } - }, - "tags": { - "key1": "value1", - "key2": "value2" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Storage/storageAccounts/sto4445", - "kind": "Storage", - "location": "eastus", - "name": "sto4445", - "properties": { - "isHnsEnabled": true, - "allowBlobPublicAccess": true, - "minimumTlsVersion": "TLS1_2", - "creationTime": "2017-05-24T13:25:33.4863236Z", - "primaryEndpoints": { - "web": "https://sto4445.web.core.windows.net/", - "dfs": "https://sto4445.dfs.core.windows.net/", - "blob": "https://sto4445.blob.core.windows.net/", - "file": "https://sto4445.file.core.windows.net/", - "queue": "https://sto4445.queue.core.windows.net/", - "table": "https://sto4445.table.core.windows.net/" - }, - "primaryLocation": "eastus2euap", - "provisioningState": "Succeeded", - "encryption": { - "services": { - "file": { - "keyType": "Account", - "enabled": true, - "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" - }, - "blob": { - "keyType": "Account", - "enabled": true, - "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" - } - }, - "requireInfrastructureEncryption": false, - "keySource": "Microsoft.Storage" - }, - "secondaryLocation": "centraluseuap", - "statusOfPrimary": "available", - "statusOfSecondary": "available", - "supportsHttpsTrafficOnly": true - }, - "sku": { - "name": "Standard_GRS", - "tier": "Standard" - }, - "tags": { - "key1": "value1", - "key2": "value2" - }, - "type": "Microsoft.Storage/storageAccounts" - } - }, - "202": {} - } -} diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json index ee510b403791..c8da1288f9f9 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json @@ -1468,7 +1468,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "The parameters used to create the storage account." @@ -1773,7 +1773,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "Properties of the storage account." @@ -1953,7 +1953,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "The parameters used when updating a storage account." diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json index 13f6c5388b0b..0151d8284d76 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreate.json @@ -12,6 +12,8 @@ "location": "eastus", "properties": { "isHnsEnabled": true, + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2", "routingPreference": { "routingChoice": "MicrosoftRouting", "publishMicrosoftEndpoints": true, @@ -47,6 +49,8 @@ "name": "sto4445", "properties": { "isHnsEnabled": true, + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2", "creationTime": "2017-05-24T13:25:33.4863236Z", "primaryEndpoints": { "web": "https://sto4445.web.core.windows.net/", diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json deleted file mode 100644 index dba80ab6684b..000000000000 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountCreateWithAllowBlobPublicAccessAndTlsVersion.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "parameters": { - "subscriptionId": "{subscription-id}", - "resourceGroupName": "res9101", - "accountName": "sto4445", - "api-version": "2019-06-01", - "parameters": { - "sku": { - "name": "Standard_GRS" - }, - "kind": "Storage", - "location": "eastus", - "properties": { - "isHnsEnabled": true, - "allowBlobPublicAccess": true, - "minimumTlsVersion": "TLS1_2", - "encryption": { - "services": { - "file": { - "keyType": "Account", - "enabled": true - }, - "blob": { - "keyType": "Account", - "enabled": true - } - }, - "requireInfrastructureEncryption": false, - "keySource": "Microsoft.Storage" - } - }, - "tags": { - "key1": "value1", - "key2": "value2" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Storage/storageAccounts/sto4445", - "kind": "Storage", - "location": "eastus", - "name": "sto4445", - "properties": { - "isHnsEnabled": true, - "allowBlobPublicAccess": true, - "minimumTlsVersion": "TLS1_2", - "creationTime": "2017-05-24T13:25:33.4863236Z", - "primaryEndpoints": { - "web": "https://sto4445.web.core.windows.net/", - "dfs": "https://sto4445.dfs.core.windows.net/", - "blob": "https://sto4445.blob.core.windows.net/", - "file": "https://sto4445.file.core.windows.net/", - "queue": "https://sto4445.queue.core.windows.net/", - "table": "https://sto4445.table.core.windows.net/" - }, - "primaryLocation": "eastus2euap", - "provisioningState": "Succeeded", - "encryption": { - "services": { - "file": { - "keyType": "Account", - "enabled": true, - "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" - }, - "blob": { - "keyType": "Account", - "enabled": true, - "lastEnabledTime": "2019-12-11T20:49:31.7036140Z" - } - }, - "requireInfrastructureEncryption": false, - "keySource": "Microsoft.Storage" - }, - "secondaryLocation": "centraluseuap", - "statusOfPrimary": "available", - "statusOfSecondary": "available", - "supportsHttpsTrafficOnly": true - }, - "sku": { - "name": "Standard_GRS", - "tier": "Standard" - }, - "tags": { - "key1": "value1", - "key2": "value2" - }, - "type": "Microsoft.Storage/storageAccounts" - } - }, - "202": {} - } -} diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json index 1943aa6fa5e2..b2fa7d9674f6 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json @@ -2148,7 +2148,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "The parameters used to create the storage account." @@ -2601,7 +2601,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "Properties of the storage account." @@ -2786,7 +2786,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage." } }, "description": "The parameters used when updating a storage account." From d375c95fa770fabf48ae51ef67f65542cc5fe85f Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Mon, 15 Jun 2020 11:14:16 -0700 Subject: [PATCH 6/8] Updating comments --- .../Microsoft.Storage/stable/2019-04-01/storage.json | 4 ++-- .../Microsoft.Storage/stable/2019-06-01/storage.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json index c8da1288f9f9..68a1a4abcccf 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json @@ -1455,7 +1455,7 @@ "allowBlobPublicAccess": { "type": "boolean", "x-ms-client-name": "AllowBlobPublicAccess", - "description": "Allow or disallow public access to all blobs or containers in the storage account." + "description": "Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is true for this property." }, "minimumTlsVersion": { "type": "string", @@ -1468,7 +1468,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage. The default interpretation is TLS 1.0 for this property." } }, "description": "The parameters used to create the storage account." diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json index b2fa7d9674f6..691e9739b29c 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json @@ -2135,7 +2135,7 @@ "allowBlobPublicAccess": { "type": "boolean", "x-ms-client-name": "AllowBlobPublicAccess", - "description": "Allow or disallow public access to all blobs or containers in the storage account." + "description": "Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is true for this property." }, "minimumTlsVersion": { "type": "string", @@ -2148,7 +2148,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage. The default interpretation is TLS 1.0 for this property." } }, "description": "The parameters used to create the storage account." From 6d6ccff47614fd8ae245b6caf0bece69b54d7dac Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Mon, 15 Jun 2020 11:47:48 -0700 Subject: [PATCH 7/8] Updating description --- .../Microsoft.Storage/stable/2019-04-01/storage.json | 8 ++++---- .../Microsoft.Storage/stable/2019-06-01/storage.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json index 68a1a4abcccf..e1cf321fdfa3 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json @@ -1760,7 +1760,7 @@ "allowBlobPublicAccess": { "type": "boolean", "x-ms-client-name": "AllowBlobPublicAccess", - "description": "Allow or disallow public access to all blobs or containers in the storage account." + "description": "Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is true for this property." }, "minimumTlsVersion": { "type": "string", @@ -1773,7 +1773,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage. The default interpretation is TLS 1.0 for this property." } }, "description": "Properties of the storage account." @@ -1940,7 +1940,7 @@ "allowBlobPublicAccess": { "type": "boolean", "x-ms-client-name": "AllowBlobPublicAccess", - "description": "Allow or disallow public access to all blobs or containers in the storage account." + "description": "Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is true for this property." }, "minimumTlsVersion": { "type": "string", @@ -1953,7 +1953,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage. The default interpretation is TLS 1.0 for this property." } }, "description": "The parameters used when updating a storage account." diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json index 691e9739b29c..557bbcdf2e98 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json @@ -2588,7 +2588,7 @@ "allowBlobPublicAccess": { "type": "boolean", "x-ms-client-name": "AllowBlobPublicAccess", - "description": "Allow or disallow public access to all blobs or containers in the storage account." + "description": "Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is true for this property." }, "minimumTlsVersion": { "type": "string", @@ -2601,7 +2601,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage. The default interpretation is TLS 1.0 for this property." } }, "description": "Properties of the storage account." @@ -2773,7 +2773,7 @@ "allowBlobPublicAccess": { "type": "boolean", "x-ms-client-name": "AllowBlobPublicAccess", - "description": "Allow or disallow public access to all blobs or containers in the storage account." + "description": "Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is true for this property." }, "minimumTlsVersion": { "type": "string", @@ -2786,7 +2786,7 @@ "name": "MinimumTlsVersion", "modelAsString": true }, - "description": "Set the minimum TLS version to be permitted on requests to storage." + "description": "Set the minimum TLS version to be permitted on requests to storage. The default interpretation is TLS 1.0 for this property." } }, "description": "The parameters used when updating a storage account." From 52aba44796b52af6a51142f555ed6803805fd781 Mon Sep 17 00:00:00 2001 From: Himanshu Chhabra Date: Tue, 16 Jun 2020 10:10:23 -0700 Subject: [PATCH 8/8] Added update account example --- .../stable/2019-04-01/examples/StorageAccountUpdate.json | 4 ++++ .../stable/2019-06-01/examples/StorageAccountUpdate.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountUpdate.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountUpdate.json index 35fa48432ba7..9b5ed0641d32 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountUpdate.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountUpdate.json @@ -7,6 +7,8 @@ "monitor": "true", "parameters": { "properties": { + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2", "networkAcls": { "defaultAction": "Allow" }, @@ -33,6 +35,8 @@ "name": "sto8596", "properties": { "isHnsEnabled": true, + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2", "creationTime": "2017-06-01T02:42:41.7633306Z", "networkAcls": { "bypass": "AzureServices", diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json index 2a64ed59b064..46b35b050ae5 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json @@ -7,6 +7,8 @@ "monitor": "true", "parameters": { "properties": { + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2", "networkAcls": { "defaultAction": "Allow" }, @@ -40,6 +42,8 @@ "name": "sto8596", "properties": { "isHnsEnabled": true, + "allowBlobPublicAccess": false, + "minimumTlsVersion": "TLS1_2", "creationTime": "2017-06-01T02:42:41.7633306Z", "networkAcls": { "bypass": "AzureServices",