Merge pull request #144 from martyh888/feature/improve-Operation-Impo…

…rt-Scripts Feature/improve operation import scripts
Azure · Feb 2, 2023 · f506bc7 · f506bc7
2 parents 49a2d6d + 7caeca2
commit f506bc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Scripts/Operations/New-EPACPolicyAssignmentDefinition.ps1 b/Scripts/Operations/New-EPACPolicyAssignmentDefinition.ps1
@@ -17,6 +17,8 @@ Param(
     [string]$OutputFolder
 )
 
+. "$PSScriptRoot/../Helpers/ConvertTo-HashTable.ps1" 
+
 $PolicyAssignment = Get-AzPolicyAssignment -Id $PolicyAssignmentId
 if ($PolicyAssignment) {
     if ($PolicyAssignment.Properties.PolicyDefinitionId -match "Microsoft.Authorization/policyDefinitions") {

diff --git a/Scripts/Operations/New-EPACPolicyDefinition.ps1 b/Scripts/Operations/New-EPACPolicyDefinition.ps1
@@ -19,9 +19,9 @@ Param(
 
 if ($PolicyDefinitionId -match "Microsoft.Authorization/policyDefinitions") {
     $policyDefinition = Get-AzPolicyDefinition -Id $PolicyDefinitionId
-    $baseTemplate = @{
+    $baseTemplate = [ordered]@{
         name       = $PolicyDefinition.name
-        properties = $policyDefinition.Properties | Select-Object Description, DisplayName, Mode, Parameters, PolicyRule, @{n = "Metadata"; e = { $_.Metadata | Select-Object Version, Category } }
+        properties = $policyDefinition.Properties | Select-Object DisplayName, Mode, Description, @{n = "Metadata"; e = { $_.Metadata | Select-Object Version, Category } }, Parameters, PolicyRule
     }
     if ($OutputFolder) {
         $baseTemplate | ConvertTo-Json -Depth 50 | Out-File "$OutputFolder\$($policyDefinition.Name).json"
@@ -33,9 +33,9 @@ if ($PolicyDefinitionId -match "Microsoft.Authorization/policyDefinitions") {
 
 if ($PolicyDefinitionId -match "Microsoft.Authorization/policySetDefinitions") {
     $policyDefinition = Get-AzPolicySetDefinition -Id $PolicyDefinitionId
-    $baseTemplate = @{
+    $baseTemplate = [ordered]@{
         name       = $PolicyDefinition.Name
-        properties = $policyDefinition.Properties | Select-Object Description, DisplayName, Mode, PolicyDefinitionGroups, Parameters, PolicyDefinitions, @{n = "Metadata"; e = { $_.Metadata | Select-Object Version, Category } }
+        properties = $policyDefinition.Properties | Select-Object DisplayName, Description, @{n = "Metadata"; e = { $_.Metadata | Select-Object Version, Category } }, PolicyDefinitionGroups, Parameters, PolicyDefinitions
     }
     $baseTemplate.properties.PolicyDefinitions | Foreach-Object {
         $_ | Add-Member -Type NoteProperty -Name policyDefinitionName -Value $_.policyDefinitionId.Split("/")[-1]