-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dependabot/github_actions/peter-evans/crea…
…te-pull-request-6
- Loading branch information
Showing
32 changed files
with
354 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 16 additions & 18 deletions
34
...anager/default_azure_storage_account_network_access_is_too_permissive/test/negative1.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,21 @@ | ||
| { | ||
| "document": [ | ||
| "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "resources": [ | ||
| { | ||
| "resources": [ | ||
| { | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "negative1", | ||
| "properties": { | ||
| "publicNetworkAccess": "Disabled" | ||
| }, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| ] | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "negative1", | ||
| "properties": { | ||
| "publicNetworkAccess": "Disabled" | ||
| }, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| ] | ||
| } |
36 changes: 17 additions & 19 deletions
36
...anager/default_azure_storage_account_network_access_is_too_permissive/test/negative2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| { | ||
| "document": [ | ||
| "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "resources": [ | ||
| { | ||
| "resources": [ | ||
| { | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "negative2", | ||
| "properties": { | ||
| "networkAcls": { | ||
| "defaultAction": "Deny" | ||
| } | ||
| }, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "negative2", | ||
| "properties": { | ||
| "networkAcls": { | ||
| "defaultAction": "Deny" | ||
| } | ||
| ] | ||
| }, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| ] | ||
| } |
30 changes: 14 additions & 16 deletions
30
...anager/default_azure_storage_account_network_access_is_too_permissive/test/positive2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,19 @@ | ||
| { | ||
| "document": [ | ||
| "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "resources": [ | ||
| { | ||
| "resources": [ | ||
| { | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "positive2", | ||
| "properties": {}, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| ] | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "positive2", | ||
| "properties": {}, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| ] | ||
| } |
34 changes: 16 additions & 18 deletions
34
...anager/default_azure_storage_account_network_access_is_too_permissive/test/positive3.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,21 @@ | ||
| { | ||
| "document": [ | ||
| "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "resources": [ | ||
| { | ||
| "resources": [ | ||
| { | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "positive3", | ||
| "properties": { | ||
| "publicNetworkAccess": "Enabled" | ||
| }, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| ] | ||
| "apiVersion": "[variables('storageApiVersion')]", | ||
| "dependsOn": [], | ||
| "kind": "Storage", | ||
| "location": "[variables('computeLocation')]", | ||
| "name": "positive3", | ||
| "properties": { | ||
| "publicNetworkAccess": "Enabled" | ||
| }, | ||
| "sku": { | ||
| "name": "[parameters('supportLogStorageAccountType')]" | ||
| }, | ||
| "tags": {}, | ||
| "type": "Microsoft.Storage/storageAccounts" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
...zureResourceManager/storage_blob_service_container_with_public_access/test/positive7.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| { | ||
| "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "parameters": { | ||
| "existingVNETName": { | ||
| "type": "string", | ||
| "metadata": { | ||
| "description": "Name of the virtual network to use for cloud shell containers." | ||
| } | ||
| }, | ||
| "existingStorageSubnetName": { | ||
| "type": "string", | ||
| "metadata": { | ||
| "description": "Name of the subnet to use for storage account." | ||
| } | ||
| }, | ||
| "existingContainerSubnetName": { | ||
| "type": "string", | ||
| "metadata": { | ||
| "description": "Name of the subnet to use for cloud shell containers." | ||
| } | ||
| }, | ||
| "storageAccountName": { | ||
| "type": "string", | ||
| "metadata": { | ||
| "description": "Name of the storage account in subnet." | ||
| } | ||
| }, | ||
| "location": { | ||
| "type": "string", | ||
| "defaultValue": "[resourceGroup().location]", | ||
| "metadata": { | ||
| "description": "Location for all resources." | ||
| } | ||
| } | ||
| }, | ||
| "variables": { | ||
| "containerSubnetRef": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('existingVNETName'), parameters('existingContainerSubnetName'))]", | ||
| "storageSubnetRef": "[resourceId('Microsoft.Network/virtualNetworks/subnets', parameters('existingVNETName'), parameters('existingStorageSubnetName'))]" | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "type": "Microsoft.Storage/storageAccounts", | ||
| "apiVersion": "2019-06-01", | ||
| "name": "[parameters('storageAccountName')]", | ||
| "location": "[parameters('location')]", | ||
| "sku": { | ||
| "name": "Standard_LRS", | ||
| "tier": "Standard" | ||
| }, | ||
| "kind": "StorageV2", | ||
| "properties": { | ||
| "networkAcls": { | ||
| "defaultAction": "Deny" | ||
| }, | ||
| "supportsHttpsTrafficOnly": true, | ||
| "encryption": { | ||
| "services": { | ||
| "file": { | ||
| "keyType": "Account", | ||
| "enabled": true | ||
| }, | ||
| "blob": { | ||
| "keyType": "Account", | ||
| "enabled": true | ||
| } | ||
| }, | ||
| "keySource": "Microsoft.Storage" | ||
| }, | ||
| "accessTier": "Cool" | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "type": "blobServices", | ||
| "apiVersion": "2019-06-01", | ||
| "name": "[concat(parameters('storageAccountName'), '/default')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]" | ||
| ], | ||
| "sku": { | ||
| "name": "Standard_LRS", | ||
| "tier": "Standard" | ||
| }, | ||
| "properties": { | ||
| "deleteRetentionPolicy": { | ||
| "enabled": false | ||
| } | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "type": "containers", | ||
| "apiVersion": "2019-06-01", | ||
| "name": "container", | ||
| "properties": { | ||
| "denyEncryptionScopeOverride": true, | ||
| "publicAccess": "Blob", | ||
| "metadata": {} | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.