Skip to content
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

Jump to bottom

Fix Organizational Azure ARM template #2028

Merged
merged 11 commits into from
Mar 13, 2024
Merged

Fix Organizational Azure ARM template #2028

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6499b50
fix Azure ARM template for organizations
kubasobon Mar 11, 2024
865c575
generate dev file
kubasobon Mar 11, 2024
c5f4dda
Merge branch 'main' into fix-azure-arm-org
kubasobon Mar 11, 2024
6652686
only subscriptions
kubasobon Mar 12, 2024
ae7ab91
Merge branch 'fix-azure-arm-org' of github.com:kubasobon/cloudbeat in…
kubasobon Mar 12, 2024
f0e780a
fix template typos
kubasobon Mar 12, 2024
dfca8ef
pass ManagementGroup ID as parameter
kubasobon Mar 12, 2024
425783d
generate dev template
kubasobon Mar 12, 2024
b283424
add 2 missing permissions
kubasobon Mar 13, 2024
5bc44f4
Merge branch 'main' into fix-azure-arm-org
kubasobon Mar 13, 2024
0a320ff
Merge branch 'main' into fix-azure-arm-org
kubasobon Mar 13, 2024
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
54 changes: 34 additions & 20 deletions deploy/azure/ARM-for-organization-account.dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
},
"variables": {
"resourceGroupDeployment": "[concat('resource-group-deployment-', deployment().location)]",
"roleAssignmentDeployment": "[concat('role-assignment-deployment-', deployment().name)]",
"roleGUID": "[guid(subscription().subscriptionId)]"
"roleAssignmentDeployment": "[concat('role-assignment-deployment-', deployment().location)]",
"roleGUID": "[guid(parameters('SubscriptionId'))]"
},
"resources": [
{
Expand Down Expand Up @@ -106,6 +106,12 @@
},
"mode": "Incremental",
"parameters": {
"AdditionalRoleGUID": {
"value": "[variables('roleGUID')]"
},
"ManagementGroupID": {
"value": "[managementGroup().id]"
},
"ResourceGroupName": {
"value": "[parameters('ResourceGroupName')]"
},
Expand All @@ -117,6 +123,12 @@
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"AdditionalRoleGUID": {
"type": "string"
},
"ManagementGroupID": {
"type": "string"
},
"ResourceGroupName": {
"type": "string"
},
Expand All @@ -128,7 +140,7 @@
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"name": "[guid(managementGroup().id, parameters('SubscriptionId'), parameters('ResourceGroupName'), deployment().name)]",
"name": "[guid(parameters('ManagementGroupID'), parameters('SubscriptionId'), parameters('ResourceGroupName'), deployment().name, 'securityaudit')]",
"properties": {
"roleDefinitionId": "/providers/Microsoft.Authorization/roleDefinitions/acdd72a7-3385-48ef-bd42-f606fba81ae7",
"principalId": "[reference(resourceId(parameters('SubscriptionId'), parameters('ResourceGroupName'), 'Microsoft.Compute/virtualMachines', 'cloudbeatVM'), '2019-07-01', 'Full').identity.principalId]",
Expand All @@ -138,10 +150,10 @@
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"name": "[guid(subscription().id, parameters('ResourceGroupName'), deployment().name)]",
"name": "[guid(parameters('SubscriptionId'), parameters('ResourceGroupName'), deployment().name, 'additional-role')]",
"properties": {
"roleDefinitionId": "[concat('/providers/Microsoft.Authorization/roleDefinitions/', variables('roleGUID'))]",
"principalId": "[reference(resourceId(subscription().subscriptionId, parameters('ResourceGroupName'), 'Microsoft.Compute/virtualMachines', 'cloudbeatVM'), '2019-07-01', 'Full').identity.principalId]",
"roleDefinitionId": "[concat('/providers/Microsoft.Authorization/roleDefinitions/', parameters('AdditionalRoleGUID'))]",
"principalId": "[reference(resourceId(parameters('SubscriptionId'), parameters('ResourceGroupName'), 'Microsoft.Compute/virtualMachines', 'cloudbeatVM'), '2019-07-01', 'Full').identity.principalId]",
"principalType": "ServicePrincipal"
}
}
Expand All @@ -163,10 +175,20 @@
"expressionEvaluationOptions": {
"scope": "inner"
},
"parameters": {
"PublicKeyDevOnly": {
"value": "[parameters('PublicKeyDevOnly')]"
}
},
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"PublicKeyDevOnly": {
"type": "string"
}
},
"resources": [
{
"type": "Microsoft.Compute/virtualMachines",
Expand Down Expand Up @@ -294,10 +316,12 @@
{
"type": "Microsoft.Authorization/roleDefinitions",
"apiVersion": "2022-04-01",
"name": "[variables('roleGUID')]",
"name": "[parameters('AdditionalRoleGUID')]",
"properties": {
"assignableScopes": [
"/"
"[parameters('ManagementGroupID')]",
"[concat('/subscriptions/', parameters('SubscriptionId'))]",
"[concat('/subscriptions/', parameters('SubscriptionId'), '/resourcegroups/', parameters('ResourceGroupName'))]"
],
"description": "Additional read permissions for cloudbeatVM",
"permissions": [
Expand All @@ -311,7 +335,7 @@
}
],
"roleName": "cloudbeatVM additional permissions",
"type": "Microsoft.Authorization/roleDefinitions"
"type": "CustomRole"
}
},
{
Expand Down Expand Up @@ -346,17 +370,7 @@
]
}
}
],
"parameters": {
"PublicKeyDevOnly": {
"type": "string"
}
}
},
"parameters": {
"PublicKeyDevOnly": {
"value": "[parameters('PublicKeyDevOnly')]"
}
]
}
},
"dependsOn": [
Expand Down
60 changes: 51 additions & 9 deletions deploy/azure/ARM-for-organization-account.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
},
"variables": {
"resourceGroupDeployment": "[concat('resource-group-deployment-', deployment().location)]",
"roleAssignmentDeployment": "[concat('role-assignment-deployment-', deployment().name)]",
"roleGUID": "[guid(subscription().subscriptionId)]"
"roleAssignmentDeployment": "[concat('role-assignment-deployment-', deployment().location)]",
"roleGUID": "[guid(parameters('SubscriptionId'))]"
},
"resources": [
{
Expand Down Expand Up @@ -100,6 +100,12 @@
},
"mode": "Incremental",
"parameters": {
"AdditionalRoleGUID": {
"value": "[variables('roleGUID')]"
},
"ManagementGroupID": {
"value": "[managementGroup().id]"
},
"ResourceGroupName": {
"value": "[parameters('ResourceGroupName')]"
},
Expand All @@ -111,6 +117,12 @@
"$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"AdditionalRoleGUID": {
"type": "string"
},
"ManagementGroupID": {
"type": "string"
},
"ResourceGroupName": {
"type": "string"
},
Expand All @@ -122,7 +134,7 @@
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"name": "[guid(managementGroup().id, parameters('SubscriptionId'), parameters('ResourceGroupName'), deployment().name)]",
"name": "[guid(parameters('ManagementGroupID'), parameters('SubscriptionId'), parameters('ResourceGroupName'), deployment().name, 'securityaudit')]",
"properties": {
"roleDefinitionId": "/providers/Microsoft.Authorization/roleDefinitions/acdd72a7-3385-48ef-bd42-f606fba81ae7",
"principalId": "[reference(resourceId(parameters('SubscriptionId'), parameters('ResourceGroupName'), 'Microsoft.Compute/virtualMachines', 'cloudbeatVM'), '2019-07-01', 'Full').identity.principalId]",
Expand All @@ -132,10 +144,10 @@
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"name": "[guid(subscription().id, parameters('ResourceGroupName'), deployment().name)]",
"name": "[guid(parameters('SubscriptionId'), parameters('ResourceGroupName'), deployment().name, 'additional-role')]",
"properties": {
"roleDefinitionId": "[concat('/providers/Microsoft.Authorization/roleDefinitions/', variables('roleGUID'))]",
"principalId": "[reference(resourceId(subscription().subscriptionId, parameters('ResourceGroupName'), 'Microsoft.Compute/virtualMachines', 'cloudbeatVM'), '2019-07-01', 'Full').identity.principalId]",
"roleDefinitionId": "[concat('/providers/Microsoft.Authorization/roleDefinitions/', parameters('AdditionalRoleGUID'))]",
"principalId": "[reference(resourceId(parameters('SubscriptionId'), parameters('ResourceGroupName'), 'Microsoft.Compute/virtualMachines', 'cloudbeatVM'), '2019-07-01', 'Full').identity.principalId]",
"principalType": "ServicePrincipal"
}
}
Expand All @@ -157,10 +169,38 @@
"expressionEvaluationOptions": {
"scope": "inner"
},
"parameters": {
"AdditionalRoleGUID": {
"value": "[variables('roleGUID')]"
},
"ManagementGroupID": {
"value": "[managementGroup().id]"
},
"ResourceGroupName": {
"value": "[parameters('ResourceGroupName')]"
},
"SubscriptionId": {
"value": "[parameters('SubscriptionId')]"
}
},
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"AdditionalRoleGUID": {
"type": "string"
},
"ManagementGroupID": {
"type": "string"
},
"ResourceGroupName": {
"type": "string"
},
"SubscriptionId": {
"type": "string"
}
},
"resources": [
{
"type": "Microsoft.Compute/virtualMachines",
Expand Down Expand Up @@ -293,10 +333,12 @@
{
"type": "Microsoft.Authorization/roleDefinitions",
"apiVersion": "2022-04-01",
"name": "[variables('roleGUID')]",
"name": "[parameters('AdditionalRoleGUID')]",
"properties": {
"assignableScopes": [
"/"
"[parameters('ManagementGroupID')]",
"[concat('/subscriptions/', parameters('SubscriptionId'))]",
"[concat('/subscriptions/', parameters('SubscriptionId'), '/resourcegroups/', parameters('ResourceGroupName'))]"
],
"description": "Additional read permissions for cloudbeatVM",
"permissions": [
Expand All @@ -310,7 +352,7 @@
}
],
"roleName": "cloudbeatVM additional permissions",
"type": "Microsoft.Authorization/roleDefinitions"
"type": "CustomRole"
}
}
]
Expand Down
Loading