Skip to content

Updated Storage Templates #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Updated Storage Templates #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18892e4
Updated Storage Templates
marvinbuss Feb 2, 2022
d8a5acd
linting
marvinbuss Feb 11, 2022
4e1aaa8
Merge branch 'main' of https://github.com/Azure/data-product-analytic…
marvinbuss Feb 11, 2022
2d7d718
updated storage to allow creating CIs
marvinbuss Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 51 additions & 42 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "14598885533275990095"
"version": "0.4.1272.37030",
"templateHash": "10494039121862566339"
}
},
"parameters": {
Expand Down Expand Up @@ -346,8 +346,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "13895317050613293148"
"version": "0.4.1272.37030",
"templateHash": "5013879991171743096"
}
},
"parameters": {
Expand Down Expand Up @@ -519,8 +519,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "1475585971495335452"
"version": "0.4.1272.37030",
"templateHash": "5845828490557564924"
}
},
"parameters": {
Expand Down Expand Up @@ -867,7 +867,7 @@
"value": "[parameters('synapseDefaultStorageAccountFileSystemId')]"
},
"synapseId": {
"value": "[if(equals(parameters('processingService'), 'synapse'), reference(resourceId('Microsoft.Resources/deployments', 'synapse001'), '2020-10-01').outputs.synapseId.value, '')]"
"value": "[if(equals(parameters('processingService'), 'synapse'), reference(resourceId('Microsoft.Resources/deployments', 'synapse001')).outputs.synapseId.value, '')]"
}
},
"template": {
Expand All @@ -876,8 +876,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "17584063900477479467"
"version": "0.4.1272.37030",
"templateHash": "4535135918647961980"
}
},
"parameters": {
Expand Down Expand Up @@ -937,7 +937,7 @@
"value": "[variables('datafactory001Name')]"
},
"keyVault001Id": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault001'), '2020-10-01').outputs.keyvaultId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault001')).outputs.keyvaultId.value]"
},
"privateDnsZoneIdDataFactory": {
"value": "[parameters('privateDnsZoneIdDataFactory')]"
Expand All @@ -955,7 +955,7 @@
"value": "[parameters('purviewManagedEventHubId')]"
},
"machineLearning001Id": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'machineLearning001'), '2020-10-01').outputs.machineLearningId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'machineLearning001')).outputs.machineLearningId.value]"
}
},
"template": {
Expand All @@ -964,8 +964,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "8903592133998705977"
"version": "0.4.1272.37030",
"templateHash": "4658994371289046641"
}
},
"parameters": {
Expand Down Expand Up @@ -1355,8 +1355,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "14497077229040500861"
"version": "0.4.1272.37030",
"templateHash": "390418905763272326"
}
},
"parameters": {
Expand Down Expand Up @@ -1527,8 +1527,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "7020391773370407540"
"version": "0.4.1272.37030",
"templateHash": "10783497108252025858"
}
},
"parameters": {
Expand Down Expand Up @@ -1693,8 +1693,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "15263814874918461179"
"version": "0.4.1272.37030",
"templateHash": "7685666168919205168"
}
},
"parameters": {
Expand Down Expand Up @@ -1774,8 +1774,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "9462754811042758050"
"version": "0.4.1272.37030",
"templateHash": "10998052295333890969"
}
},
"parameters": {
Expand Down Expand Up @@ -1939,8 +1939,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "16200407904616843158"
"version": "0.4.1272.37030",
"templateHash": "4700328157546838775"
}
},
"parameters": {
Expand Down Expand Up @@ -1993,7 +1993,7 @@
"resources": [
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2021-04-01",
"apiVersion": "2021-06-01",
"name": "[variables('storageNameCleaned')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand All @@ -2009,6 +2009,7 @@
"allowBlobPublicAccess": false,
"allowCrossTenantReplication": false,
"allowSharedKeyAccess": true,
"defaultToOAuthAuthentication": true,
"encryption": {
"keySource": "Microsoft.Storage",
"requireInfrastructureEncryption": false,
Expand All @@ -2031,6 +2032,9 @@
}
}
},
"immutableStorageWithVersioning": {
"enabled": false
},
"isHnsEnabled": false,
"isNfsV3Enabled": false,
"keyPolicy": {
Expand All @@ -2039,7 +2043,7 @@
"largeFileSharesState": "Disabled",
"minimumTlsVersion": "TLS1_2",
"networkAcls": {
"bypass": "Metrics",
"bypass": "AzureServices",
"defaultAction": "Deny",
"ipRules": [],
"virtualNetworkRules": []
Expand All @@ -2049,12 +2053,13 @@
"publishInternetEndpoints": false,
"publishMicrosoftEndpoints": false
},
"publicNetworkAccess": "Disabled",
"supportsHttpsTrafficOnly": true
}
},
{
"type": "Microsoft.Storage/storageAccounts/managementPolicies",
"apiVersion": "2021-02-01",
"apiVersion": "2021-06-01",
"name": "[format('{0}/{1}', variables('storageNameCleaned'), 'default')]",
"properties": {
"policy": {
Expand Down Expand Up @@ -2098,7 +2103,7 @@
},
{
"type": "Microsoft.Storage/storageAccounts/blobServices",
"apiVersion": "2021-02-01",
"apiVersion": "2021-06-01",
"name": "[format('{0}/{1}', variables('storageNameCleaned'), 'default')]",
"properties": {
"containerDeleteRetentionPolicy": {
Expand All @@ -2107,6 +2112,10 @@
},
"cors": {
"corsRules": []
},
"deleteRetentionPolicy": {
"enabled": true,
"days": 7
}
},
"dependsOn": [
Expand All @@ -2119,7 +2128,7 @@
"count": "[length(parameters('storageContainerNames'))]"
},
"type": "Microsoft.Storage/storageAccounts/blobServices/containers",
"apiVersion": "2021-02-01",
"apiVersion": "2021-06-01",
"name": "[format('{0}/{1}/{2}', variables('storageNameCleaned'), 'default', parameters('storageContainerNames')[copyIndex()])]",
"properties": {
"publicAccess": "None",
Expand Down Expand Up @@ -2257,16 +2266,16 @@
"value": "[variables('machineLearning001Name')]"
},
"applicationInsightsId": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'applicationInsights001'), '2020-10-01').outputs.applicationInsightsId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'applicationInsights001')).outputs.applicationInsightsId.value]"
},
"containerRegistryId": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'containerRegistry001'), '2020-10-01').outputs.containerRegistryId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'containerRegistry001')).outputs.containerRegistryId.value]"
},
"keyVaultId": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault001'), '2020-10-01').outputs.keyvaultId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault001')).outputs.keyvaultId.value]"
},
"storageAccountId": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'storage001'), '2020-10-01').outputs.storageId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'storage001')).outputs.storageId.value]"
},
"datalakeFileSystemIds": {
"value": "[parameters('datalakeFileSystemIds')]"
Expand All @@ -2284,10 +2293,10 @@
"value": "[parameters('databricksWorkspaceUrl')]"
},
"synapseId": {
"value": "[if(equals(parameters('processingService'), 'synapse'), reference(resourceId('Microsoft.Resources/deployments', 'synapse001'), '2020-10-01').outputs.synapseId.value, '')]"
"value": "[if(equals(parameters('processingService'), 'synapse'), reference(resourceId('Microsoft.Resources/deployments', 'synapse001')).outputs.synapseId.value, '')]"
},
"synapseBigDataPoolId": {
"value": "[if(equals(parameters('processingService'), 'synapse'), reference(resourceId('Microsoft.Resources/deployments', 'synapse001'), '2020-10-01').outputs.synapseBigDataPool001Id.value, '')]"
"value": "[if(equals(parameters('processingService'), 'synapse'), reference(resourceId('Microsoft.Resources/deployments', 'synapse001')).outputs.synapseBigDataPool001Id.value, '')]"
},
"machineLearningComputeInstance001AdministratorObjectId": {
"value": "[parameters('machineLearningComputeInstance001AdministratorObjectId')]"
Expand All @@ -2311,8 +2320,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "14064910724988098449"
"version": "0.4.1272.37030",
"templateHash": "2625581626341947011"
}
},
"parameters": {
Expand Down Expand Up @@ -2755,7 +2764,7 @@
"value": "[parameters('externalContainerRegistryId')]"
},
"machineLearningId": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'machineLearning001'), '2020-10-01').outputs.machineLearningId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'machineLearning001')).outputs.machineLearningId.value]"
}
},
"template": {
Expand All @@ -2764,8 +2773,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "14462268884464265429"
"version": "0.4.1272.37030",
"templateHash": "6095886941970314891"
}
},
"parameters": {
Expand Down Expand Up @@ -2818,7 +2827,7 @@
"mode": "Incremental",
"parameters": {
"machineLearningId": {
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'machineLearning001'), '2020-10-01').outputs.machineLearningId.value]"
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'machineLearning001')).outputs.machineLearningId.value]"
},
"storageAccountFileSystemId": {
"value": "[parameters('datalakeFileSystemIds')[copyIndex()]]"
Expand All @@ -2830,8 +2839,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "15329536860223583620"
"version": "0.4.1272.37030",
"templateHash": "9185402326525362659"
}
},
"parameters": {
Expand Down
23 changes: 14 additions & 9 deletions infra/modules/services/storage.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var storagePrivateEndpointNameBlob = '${storage.name}-blob-private-endpoint'
var storagePrivateEndpointNameFile = '${storage.name}-file-private-endpoint'

// Resources
resource storage 'Microsoft.Storage/storageAccounts@2021-04-01' = {
resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
name: storageNameCleaned
location: location
tags: tags
Expand All @@ -48,6 +48,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2021-04-01' = {
allowBlobPublicAccess: false
allowCrossTenantReplication: false
allowSharedKeyAccess: true
defaultToOAuthAuthentication: true
encryption: {
keySource: 'Microsoft.Storage'
requireInfrastructureEncryption: false
Expand All @@ -70,6 +71,9 @@ resource storage 'Microsoft.Storage/storageAccounts@2021-04-01' = {
}
}
}
immutableStorageWithVersioning: {
enabled: false
}
isHnsEnabled: false
isNfsV3Enabled: false
keyPolicy: {
Expand All @@ -78,7 +82,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2021-04-01' = {
largeFileSharesState: 'Disabled'
minimumTlsVersion: 'TLS1_2'
networkAcls: {
bypass: 'Metrics'
bypass: 'AzureServices'
defaultAction: 'Deny'
ipRules: []
virtualNetworkRules: []
Expand All @@ -88,11 +92,12 @@ resource storage 'Microsoft.Storage/storageAccounts@2021-04-01' = {
publishInternetEndpoints: false
publishMicrosoftEndpoints: false
}
publicNetworkAccess: 'Disabled'
supportsHttpsTrafficOnly: true
}
}

resource storageManagementPolicies 'Microsoft.Storage/storageAccounts/managementPolicies@2021-02-01' = {
resource storageManagementPolicies 'Microsoft.Storage/storageAccounts/managementPolicies@2021-06-01' = {
parent: storage
name: 'default'
properties: {
Expand Down Expand Up @@ -155,7 +160,7 @@ resource storageManagementPolicies 'Microsoft.Storage/storageAccounts/management
}
}

resource storageBlobServices 'Microsoft.Storage/storageAccounts/blobServices@2021-02-01' = {
resource storageBlobServices 'Microsoft.Storage/storageAccounts/blobServices@2021-06-01' = {
parent: storage
name: 'default'
properties: {
Expand All @@ -172,10 +177,10 @@ resource storageBlobServices 'Microsoft.Storage/storageAccounts/blobServices@202
// retentionInDays: 7
// }
// defaultServiceVersion: ''
// deleteRetentionPolicy: {
// enabled: true
// days: 7
// }
deleteRetentionPolicy: {
enabled: true
days: 7
}
// isVersioningEnabled: true
// lastAccessTimeTrackingPolicy: {
// name: 'AccessTimeTracking'
Expand All @@ -192,7 +197,7 @@ resource storageBlobServices 'Microsoft.Storage/storageAccounts/blobServices@202
}
}

resource storageContainers 'Microsoft.Storage/storageAccounts/blobServices/containers@2021-02-01' = [for storageContainerName in storageContainerNames: {
resource storageContainers 'Microsoft.Storage/storageAccounts/blobServices/containers@2021-06-01' = [for storageContainerName in storageContainerNames: {
parent: storageBlobServices
name: storageContainerName
properties: {
Expand Down