Skip to content

Add Data Landing Zone Subs as Input #267

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

Merged
Marvin Buss (marvinbuss) merged 2 commits into from
Jan 10, 2022
Merged

Add Data Landing Zone Subs as Input #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ec7340
Add Data Landing Zone Subs as Input
marvinbuss Dec 23, 2021
95f6ecc
Merge branch 'main' into marvinbuss/add_dlz_subscriptions
marvinbuss Dec 23, 2021
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
2 changes: 1 addition & 1 deletion .github/linters/.arm-ttk.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@{
# Test = @( )
Skip = @(
'Template Should Not Contain Blanks',
'Template Should Not Contain Blanks'
Comment thread
marvinbuss marked this conversation as resolved.
'DeploymentTemplate Must Not Contain Hardcoded Uri'
'DependsOn Best Practices'
'IDs Should Be Derived From ResourceIDs'
Expand Down
3 changes: 3 additions & 0 deletions docs/reference/dataManagementAnalytics.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ resource dataLandingZoneDeployment 'Microsoft.Resources/deployments@2021-04-01'
deploySelfHostedIntegrationRuntimes: {
value: true
}
dataLandingZoneSubscriptionIds: {
value: [ for item in dataLandingZoneDetails: item.subscription ]
}
privateDnsZoneIdKeyVault: {
value: reference(dataManagementZoneDeployment.name).outputs.privateDnsZoneIdKeyVault.value
}
Expand Down
67 changes: 34 additions & 33 deletions docs/reference/dataManagementAnalytics.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.1008.15138",
"templateHash": "13247179156562340716"
"version": "0.4.1124.51302",
"templateHash": "3074724964256243104"
}
},
"parameters": {
Expand Down Expand Up @@ -88,7 +88,6 @@
]
}
},
"functions": [],
"variables": {
"dataManagementZoneTemplateLink": "https://raw.githubusercontent.com/Azure/data-management-zone/main/infra/main.json",
"dataLandingZoneTemplateLink": "https://raw.githubusercontent.com/Azure/data-landing-zone/main/infra/main.json"
Expand Down Expand Up @@ -263,6 +262,15 @@
"deploySelfHostedIntegrationRuntimes": {
"value": true
},
"dataLandingZoneSubscriptionIds": {
"copy": [
{
"name": "value",
"count": "[length(parameters('dataLandingZoneDetails'))]",
"input": "[parameters('dataLandingZoneDetails')[copyIndex('value')].subscription]"
}
]
},
"privateDnsZoneIdKeyVault": {
"value": "[reference(format('dataManagementZoneDeployment-{0}', deployment().location)).outputs.privateDnsZoneIdKeyVault.value]"
},
Expand Down Expand Up @@ -302,7 +310,7 @@
{
"condition": "[parameters('enableBastionHostDeployment')]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2020-10-01",
"name": "[format('bastionHostDeployment-{0}', deployment().location)]",
"subscriptionId": "[parameters('dataLandingZoneDetails')[0].subscription]",
"location": "[deployment().location]",
Expand Down Expand Up @@ -358,8 +366,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "12653787604786881755"
"version": "0.4.1124.51302",
"templateHash": "5067044301937855137"
}
},
"parameters": {
Expand Down Expand Up @@ -460,7 +468,6 @@
}
}
},
"functions": [],
"variables": {
"name": "[toLower(format('{0}-{1}', parameters('prefix'), parameters('environment')))]",
"tagsDefault": {
Expand All @@ -486,7 +493,7 @@
},
{
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2020-10-01",
"name": "networkServices",
"subscriptionId": "[variables('vnetSubscriptionId')]",
"resourceGroup": "[variables('vnetResourceGroupName')]",
Expand Down Expand Up @@ -527,8 +534,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "10187757659530357192"
"version": "0.4.1124.51302",
"templateHash": "8836199328749372338"
}
},
"parameters": {
Expand Down Expand Up @@ -559,7 +566,6 @@
"type": "string"
}
},
"functions": [],
"resources": [
{
"type": "Microsoft.Network/networkSecurityGroups",
Expand Down Expand Up @@ -786,7 +792,7 @@
},
{
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2020-10-01",
"name": "bastionServices",
"resourceGroup": "[format('{0}-bastion', variables('name'))]",
"properties": {
Expand All @@ -811,10 +817,10 @@
"value": "[parameters('virtualMachineImage')]"
},
"bastionSubnetId": {
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('vnetSubscriptionId'), variables('vnetResourceGroupName')), 'Microsoft.Resources/deployments', 'networkServices'), '2020-06-01').outputs.bastionSubnetId.value]"
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('vnetSubscriptionId'), variables('vnetResourceGroupName')), 'Microsoft.Resources/deployments', 'networkServices'), '2020-10-01').outputs.bastionSubnetId.value]"
},
"jumpboxSubnetId": {
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('vnetSubscriptionId'), variables('vnetResourceGroupName')), 'Microsoft.Resources/deployments', 'networkServices'), '2020-06-01').outputs.jumpboxSubnetId.value]"
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('vnetSubscriptionId'), variables('vnetResourceGroupName')), 'Microsoft.Resources/deployments', 'networkServices'), '2020-10-01').outputs.jumpboxSubnetId.value]"
},
"administratorUsername": {
"value": "[parameters('administratorUsername')]"
Expand All @@ -829,8 +835,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "2672844143716454115"
"version": "0.4.1124.51302",
"templateHash": "5443161126409397717"
}
},
"parameters": {
Expand Down Expand Up @@ -869,15 +875,14 @@
"type": "secureString"
}
},
"functions": [],
"variables": {
"bastion001Name": "[format('{0}-bastion001', parameters('prefix'))]",
"virtualMachine001Name": "[format('{0}-vm001', parameters('prefix'))]"
},
"resources": [
{
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2020-10-01",
"name": "bastion001",
"properties": {
"expressionEvaluationOptions": {
Expand All @@ -904,8 +909,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "9194233898920649047"
"version": "0.4.1124.51302",
"templateHash": "5304528866008257447"
}
},
"parameters": {
Expand All @@ -922,7 +927,6 @@
"type": "string"
}
},
"functions": [],
"variables": {
"publicIpName": "[format('{0}-pip', parameters('bastionName'))]"
},
Expand Down Expand Up @@ -978,7 +982,7 @@
},
{
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2020-10-01",
"name": "virtualMachine001",
"properties": {
"expressionEvaluationOptions": {
Expand Down Expand Up @@ -1017,8 +1021,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "8684162141135901545"
"version": "0.4.1124.51302",
"templateHash": "7161877090365327851"
}
},
"parameters": {
Expand Down Expand Up @@ -1054,7 +1058,6 @@
"type": "string"
}
},
"functions": [],
"variables": {
"nicName": "[format('{0}-nic', parameters('virtualmachineName'))]",
"diskName": "[format('{0}-disk', parameters('virtualmachineName'))]",
Expand Down Expand Up @@ -1167,7 +1170,7 @@
"count": "[length(range(0, length(parameters('dataLandingZoneDetails'))))]"
},
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2020-10-01",
"name": "[format('vnetPeeringDeployment-{0}-{1}', range(0, length(parameters('dataLandingZoneDetails')))[copyIndex()], deployment().location)]",
"location": "[deployment().location]",
"properties": {
Expand Down Expand Up @@ -1195,8 +1198,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "1258334118365795592"
"version": "0.4.1124.51302",
"templateHash": "13977441074455205991"
}
},
"parameters": {
Expand All @@ -1207,7 +1210,6 @@
"type": "array"
}
},
"functions": [],
"variables": {
"sourceVnetSubscriptionId": "[split(parameters('sourceVnetId'), '/')[2]]",
"sourceVnetResourceGroupName": "[split(parameters('sourceVnetId'), '/')[4]]"
Expand All @@ -1219,7 +1221,7 @@
"count": "[length(parameters('destinationVnetIds'))]"
},
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2020-10-01",
"name": "[format('vnetPeering{0}', copyIndex())]",
"subscriptionId": "[variables('sourceVnetSubscriptionId')]",
"resourceGroup": "[variables('sourceVnetResourceGroupName')]",
Expand All @@ -1242,8 +1244,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.4.1008.15138",
"templateHash": "10472092457843784458"
"version": "0.4.1124.51302",
"templateHash": "9720784943349899862"
}
},
"parameters": {
Expand All @@ -1254,7 +1256,6 @@
"type": "string"
}
},
"functions": [],
"variables": {
"sourceVnetName": "[if(greaterOrEquals(length(split(parameters('sourceVnetId'), '/')), 9), last(split(parameters('sourceVnetId'), '/')), 'incorrectSegmentLength')]",
"destinationVnetName": "[if(greaterOrEquals(length(split(parameters('destinationVnetId'), '/')), 9), last(split(parameters('destinationVnetId'), '/')), 'incorrectSegmentLength')]"
Expand Down