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

Adding the policy definition version to the reconstructed policy definition object and check for the version element in 4 places. #891

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+17 −22
Open

Adding the policy definition version to the reconstructed policy definition object and check for the version element in 4 places. #891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bd36fa
add version to splatted $definition object
JerJon Feb 24, 2025
b291844
comment update
JerJon Feb 24, 2025
852c99d
compare policy set with policy set
JerJon Mar 3, 2025
dcf90c8
Merge branch 'main' of https://github.com/Azure/enterprise-azure-poli…
JerJon Mar 3, 2025
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
6 changes: 4 additions & 2 deletions Scripts/Helpers/Build-PolicyPlan.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@ function Build-PolicyPlan {

$definitionProperties = Get-PolicyResourceProperties -PolicyResource $definitionObject
$name = $definitionObject.name

$id = "$deploymentRootScope/providers/Microsoft.Authorization/policyDefinitions/$name"
$displayName = $definitionProperties.displayName
$description = $definitionProperties.description
$metadata = Get-DeepCloneAsOrderedHashtable $definitionProperties.metadata
$mode = $definitionProperties.mode
$version = $definitionProperties.version
$parameters = $definitionProperties.parameters
$policyRule = $definitionProperties.policyRule
if ($null -ne $metadata) {
Expand Down Expand Up @@ -114,6 +115,7 @@ function Build-PolicyPlan {
displayName = $displayName
description = $description
mode = $mode
version = $version
metadata = $metadata
parameters = $parameters
policyRule = $policyRule
Expand Down Expand Up @@ -193,7 +195,7 @@ function Build-PolicyPlan {
Write-Information "New '$($displayName)'"
}
}


$strategy = $PacEnvironment.desiredState.strategy
foreach ($id in $deleteCandidates.Keys) {
Expand Down
2 changes: 2 additions & 0 deletions Scripts/Helpers/Build-PolicySetPlan.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ function Build-PolicySetPlan {
$displayName = $definitionProperties.displayName
$description = $definitionProperties.description
$metadata = Get-DeepCloneAsOrderedHashtable $definitionProperties.metadata
$version = $definitionProperties.version
$parameters = $definitionProperties.parameters
$policyDefinitions = $definitionProperties.policyDefinitions
$policyDefinitionGroups = $definitionProperties.policyDefinitionGroups
Expand Down Expand Up @@ -182,6 +183,7 @@ function Build-PolicySetPlan {
displayName = $displayName
description = $description
metadata = $metadata
version = $version
parameters = $parameters
policyDefinitions = $policyDefinitionsFinal
policyDefinitionGroups = $policyDefinitionGroupsFinal
Expand Down
24 changes: 15 additions & 9 deletions Scripts/Helpers/Confirm-PolicyDefinitionsInPolicySetMatch.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,21 @@ function Confirm-PolicyDefinitionsInPolicySetMatch {
}
if ($null -ne $item2.definitionVersion) {
# ignore auto-generated definitionVersion, only compare if Policy definition entry has a definitionVersion
$deployedPolicyDefinitionVersion = $Definitions[$item1.policyDefinitionId].properties.version
if ($null -eq $deployedPolicyDefinitionVersion) {
# Custom policy definition - version is in a different place
$deployedPolicyDefinitionVersion = $Definitions[$item1.policyDefinitionId].metadata.version
if ($null -eq $Definitions[$item1.policyDefinitionId].properties) {
# The properties object does not exist, it probably has been splatted
$deployedPolicyDefinitionVersion = $Definitions[$item1.policyDefinitionId].version
if ($null -eq $deployedPolicyDefinitionVersion) {
# If the version is not found it could be in metadata.version
$deployedPolicyDefinitionVersion = $Definitions[$item1.policyDefinitionId].metadata.version
}
}
else {
$deployedPolicyDefinitionVersion = $Definitions[$item1.policyDefinitionId].properties.version
if ($null -eq $deployedPolicyDefinitionVersion) {
# Policy definition entry does not have a properties.version, it could be in properties.metadata.version
$deployedPolicyDefinitionVersion = $Definitions[$item1.policyDefinitionId].properties.metadata.version
}
}
# $definitionVersionMatches = $item1.definitionVersion -eq $item2.definitionVersion
# if (!$definitionVersionMatches) {
# return $false
# }
$definitionVersionMatches = Compare-SemanticVersion -Version1 $deployedPolicyDefinitionVersion -Version2 $item2.definitionVersion
if ($definitionVersionMatches -ne 0) {
Write-Verbose "Definition Id: $($item1.policyDefinitionId)"
Expand Down Expand Up @@ -79,7 +85,7 @@ function Confirm-PolicyDefinitionsInPolicySetMatch {
return $false
}
}

$parametersUsageMatches = Confirm-ParametersUsageMatches `
-ExistingParametersObj $item1.parameters `
-DefinedParametersObj $item2.parameters `
Expand Down