diff --git a/.pipelines/policy.yml b/.pipelines/policy.yml index 53a7c329..ab3a346e 100644 --- a/.pipelines/policy.yml +++ b/.pipelines/policy.yml @@ -126,4 +126,3 @@ stages: deployOperation: ${{ variables['deployOperation'] }} policyAssignmentManagementGroupScope: $(var-topLevelManagementGroupName) workingDir: $(System.DefaultWorkingDirectory)/policy/builtin/assignments - diff --git a/.pipelines/templates/steps/assign-policy.yml b/.pipelines/templates/steps/assign-policy.yml index db0ab333..91f8c484 100644 --- a/.pipelines/templates/steps/assign-policy.yml +++ b/.pipelines/templates/steps/assign-policy.yml @@ -35,9 +35,18 @@ steps: inlineScript: | $(var-bashPreInjectScript) - echo "Populating templated parameters in ${{ policy }}.parameters.json" + parameterFileName='' - cp ${{ policy }}.parameters.json ${{ policy }}.populated.parameters.json + if [ -f '${{ policy }}-${{ parameters.policyAssignmentManagementGroupScope }}.parameters.json' ] + then + parameterFileName='${{ policy }}-${{ parameters.policyAssignmentManagementGroupScope }}.parameters.json' + else + parameterFileName='${{ policy }}.parameters.json' + fi + + echo "Populating templated parameters: $parameterFileName" + + cp $parameterFileName ${{ policy }}.populated.parameters.json sed -i 's~{{var-topLevelManagementGroupName}}~$(var-topLevelManagementGroupName)~g' ${{ policy }}.populated.parameters.json