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

Bug: Generated Values in _policyAssignmentsBicepInput.txt are incorrect #427

Merged
merged 7 commits into from
Jan 20, 2023
Merged

Bug: Generated Values in _policyAssignmentsBicepInput.txt are incorrect #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
78030ad
correct loadjsoncontent path depth
mbrat2005 Jan 5, 2023
bf15ba1
correct mg id to reference varTopLevelManagementGroupResourceId
mbrat2005 Jan 5, 2023
960c9d5
correct loadjsoncontent path depth - china
mbrat2005 Jan 5, 2023
f31cd62
test manual workflow execution
mbrat2005 Jan 5, 2023
a042590
test manual workflow execution china
mbrat2005 Jan 5, 2023
f694b32
Revert "test manual workflow execution china"
mbrat2005 Jan 5, 2023
c61d789
Revert "test manual workflow execution"
mbrat2005 Jan 5, 2023
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/scripts/Invoke-PolicyToBicep-China.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function New-PolicyAssignmentsBicepInputTxtFile {
$policyAssignmentNameNoHyphens = $policyAssignmentName.replace("-", "")

Write-Information "==> Adding '$policyAssignmentName' to '$PWD/$assignmentsTxtFileName'" -InformationAction Continue
Add-Content -Path "$rootPath/$assignmentsLongPath/$assignmentsTxtFileName" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionId: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: loadJsonContent('../../policy/$assignmentsLongPath/$fileName')`r`n}`r`n"
Add-Content -Path "$rootPath/$assignmentsLongPath/$assignmentsTxtFileName" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionId: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: loadJsonContent('../../../policy/$assignmentsLongPath/$fileName')`r`n}`r`n"
}

Write-Information "====> Running '$assignmentsTxtFileName' through Line Endings" -InformationAction Continue
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/Invoke-PolicyToBicep.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ function New-PolicyAssignmentsBicepInputTxtFile {
$policyAssignmentNameNoHyphens = $policyAssignmentName.replace("-", "")

Write-Information "==> Adding '$policyAssignmentName' to '$PWD/$assignmentsTxtFileName'" -InformationAction Continue
Add-Content -Path "$rootPath/$assignmentsLongPath/$assignmentsTxtFileName" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionId: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: loadJsonContent('../../policy/$assignmentsLongPath/$fileName')`r`n}`r`n"
Add-Content -Path "$rootPath/$assignmentsLongPath/$assignmentsTxtFileName" -Encoding "utf8" -Value "var varPolicyAssignment$policyAssignmentNameNoHyphens = {`r`n`tdefinitionId: '$policyAssignmentDefinitionID'`r`n`tlibDefinition: loadJsonContent('../../../policy/$assignmentsLongPath/$fileName')`r`n}`r`n"
}

Write-Information "====> Running '$assignmentsTxtFileName' through Line Endings" -InformationAction Continue
Expand Down
2 changes: 1 addition & 1 deletion ...nments/lib/china/policy_assignments/policy_assignment_es_deny_appgw_without_waf.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policyDefinitions/Deny-AppGW-Without-WAF",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-AppGW-Without-WAF",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...gnments/lib/china/policy_assignments/policy_assignment_es_deny_public_endpoints.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"displayName": "Public network access should be disabled for PaaS services",
"notScopes": [],
"parameters": {},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policySetDefinitions/Deny-PublicPaaSEndpoints",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deny-PublicPaaSEndpoints",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...nments/lib/china/policy_assignments/policy_assignment_es_deny_rdp_from_internet.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policyDefinitions/Deny-RDP-From-Internet",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-RDP-From-Internet",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ments/lib/china/policy_assignments/policy_assignment_es_deny_subnet_without_nsg.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Nsg",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Nsg",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ments/lib/china/policy_assignments/policy_assignment_es_deny_subnet_without_udr.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Udr",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Udr",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ssignments/lib/china/policy_assignments/policy_assignment_es_deploy_mdfc_config.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"value": "DeployIfNotExists"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-MDFC-Config",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-MDFC-Config",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ents/lib/china/policy_assignments/policy_assignment_es_deploy_private_dns_zones.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"value": "${private_dns_zone_prefix}privatelink.search.windows.net"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Private-DNS-Zones",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Private-DNS-Zones",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ignments/lib/china/policy_assignments/policy_assignment_es_deploy_resource_diag.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/${parTopLevelManagementGroupPrefix}-mgmt/providers/Microsoft.OperationalInsights/workspaces/${parTopLevelManagementGroupPrefix}-la"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Diagnostics-LogAnalytics",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Diagnostics-LogAnalytics",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...y/assignments/lib/china/policy_assignments/policy_assignment_es_enforce_tls_ssl.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"displayName": "Deny or Deploy and append TLS requirements and SSL enforcement on resources without Encryption in transit",
"notScopes": [],
"parameters": {},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelMGId}/providers/Microsoft.Authorization/policySetDefinitions/Enforce-EncryptTransit",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Enforce-EncryptTransit",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion .../assignments/lib/policy_assignments/policy_assignment_es_deny_appgw_without_waf.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policyDefinitions/Deny-AppGW-Without-WAF",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-AppGW-Without-WAF",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...signments/lib/policy_assignments/policy_assignment_es_deny_databricks_public_ip.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Databricks-NoPublicIp",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Databricks-NoPublicIp",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...icy/assignments/lib/policy_assignments/policy_assignment_es_deny_databricks_sku.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Databricks-Sku",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Databricks-Sku",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...cy/assignments/lib/policy_assignments/policy_assignment_es_deny_databricks_vnet.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Databricks-VirtualNetwork",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Databricks-VirtualNetwork",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...y/assignments/lib/policy_assignments/policy_assignment_es_deny_public_endpoints.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"displayName": "Public network access should be disabled for PaaS services",
"notScopes": [],
"parameters": {},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/Deny-PublicPaaSEndpoints",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deny-PublicPaaSEndpoints",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion .../assignments/lib/policy_assignments/policy_assignment_es_deny_rdp_from_internet.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policyDefinitions/Deny-RDP-From-Internet",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-RDP-From-Internet",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...assignments/lib/policy_assignments/policy_assignment_es_deny_subnet_without_nsg.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Nsg",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Nsg",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...assignments/lib/policy_assignments/policy_assignment_es_deny_subnet_without_udr.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "Deny"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Udr",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policyDefinitions/Deny-Subnet-Without-Udr",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...licy/assignments/lib/policy_assignments/policy_assignment_es_deploy_mdfc_config.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"value": "DeployIfNotExists"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-MDFC-Config",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-MDFC-Config",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ssignments/lib/policy_assignments/policy_assignment_es_deploy_private_dns_zones.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"value": "${varPrivateDnsZonesFinalResourceIds}.azureCognitiveSearchPrivateDnsZoneId]"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Private-DNS-Zones",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Private-DNS-Zones",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion ...cy/assignments/lib/policy_assignments/policy_assignment_es_deploy_resource_diag.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"value": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/${parTopLevelManagementGroupPrefix}-mgmt/providers/Microsoft.OperationalInsights/workspaces/${parTopLevelManagementGroupPrefix}-la"
}
},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Diagnostics-LogAnalytics",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Deploy-Diagnostics-LogAnalytics",
"scope": null,
"enforcementMode": "Default"
},
Expand Down
2 changes: 1 addition & 1 deletion .../policy/assignments/lib/policy_assignments/policy_assignment_es_enforce_tls_ssl.tmpl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"displayName": "Deny or Deploy and append TLS requirements and SSL enforcement on resources without Encryption in transit",
"notScopes": [],
"parameters": {},
"policyDefinitionId": "${modManagementGroups.outputs.outTopLevelManagementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/Enforce-EncryptTransit",
"policyDefinitionId": "${varTopLevelManagementGroupResourceId}/providers/Microsoft.Authorization/policySetDefinitions/Enforce-EncryptTransit",
"scope": null,
"enforcementMode": "Default"
},
Expand Down