Merge pull request #950 from Azure/feature/apy/Get-AzExemptions_Fix946

fixed issue with exemptions output and starterkit remediation yaml

Author: apybar

Scripts/Helpers/Get-CustomMetadata.ps1

@@ -7,16 +7,16 @@ function Get-CustomMetadata {
 
     # remove system generated metadata
     $metadataTemp = ConvertTo-HashTable $Metadata
-    if ($metadataTemp.ContainsKey("createdBy")) {
+    if ($metadataTemp.Keys -contains "createdBy") {
         $metadataTemp.Remove("createdBy")
     }
-    if ($metadataTemp.ContainsKey("createdOn")) {
+    if ($metadataTemp.Keys -contains "createdOn") {
         $metadataTemp.Remove("createdOn")
     }
-    if ($metadataTemp.ContainsKey("updatedBy")) {
+    if ($metadataTemp.Keys -contains "updatedBy") {
         $metadataTemp.Remove("updatedBy")
     }
-    if ($metadataTemp.ContainsKey("updatedOn")) {
+    if ($metadataTemp.Keys -contains "updatedOn") {
         $metadataTemp.Remove("updatedOn")
     }
     if ($null -ne $Remove) {

Scripts/Helpers/Out-PolicyExemptions.ps1

@@ -158,12 +158,14 @@ function Out-PolicyExemptions {
             }
             # Logic to force the order of the Metadata property (DeployedBy first, then epacMetadata)
             foreach ($array in $jsonArray) {
-                $meta = $array.Metadata
-                $orderedMeta = [ordered]@{
-                    deployedBy   = $meta['deployedBy']
-                    epacMetadata = $meta['epacMetadata']
+                if ($null -ne $array.Metadata) {
+                    $meta = $array.Metadata
+                    $orderedMeta = [ordered]@{
+                        deployedBy   = $meta['deployedBy']
+                        epacMetadata = $meta['epacMetadata']
+                    }
+                    $array.Metadata = $orderedMeta
                 }
-                $array.Metadata = $orderedMeta
             }
             $jsonFile = "$stem.$FileExtension"
             if (Test-Path $jsonFile) {
@@ -193,14 +195,16 @@ function Out-PolicyExemptions {
             }
             # Logic to force the order of the Metadata property (DeployedBy first, then epacMetadata)
             foreach ($array in $excelArray) {
-                $metaString = $array.Metadata
-                $meta = $metaString | ConvertFrom-Json -Depth 100
-                $orderedMeta = [ordered]@{
-                    deployedBy   = $meta.deployedBy
-                    epacMetadata = $meta.epacMetadata
+                if ($null -ne $array.Metadata) {
+                    $metaString = $array.Metadata
+                    $meta = $metaString | ConvertFrom-Json -Depth 100
+                    $orderedMeta = [ordered]@{
+                        deployedBy   = $meta.deployedBy
+                        epacMetadata = $meta.epacMetadata
+                    }
+                    $orderedMetadata = (ConvertTo-Json $orderedMeta -Depth 100 -Compress).ToString()
+                    $array.Metadata = $orderedMetadata
                 }
-                $orderedMetadata = (ConvertTo-Json $orderedMeta -Depth 100 -Compress).ToString()
-                $array.Metadata = $orderedMetadata
             }
             $csvFile = "$stem.csv"
             if (Test-Path $csvFile) {
@@ -246,12 +250,14 @@ function Out-PolicyExemptions {
             }
             # Logic to force the order of the Metadata property (DeployedBy first, then epacMetadata)
             foreach ($array in $jsonArray) {
-                $meta = $array.Metadata
-                $orderedMeta = [ordered]@{
-                    deployedBy   = $meta['deployedBy']
-                    epacMetadata = $meta['epacMetadata']
+                if ($null -ne $array.Metadata) {
+                    $meta = $array.Metadata
+                    $orderedMeta = [ordered]@{
+                        deployedBy   = $meta['deployedBy']
+                        epacMetadata = $meta['epacMetadata']
+                    }
+                    $array.Metadata = $orderedMeta
                 }
-                $array.Metadata = $orderedMeta
             }
             $jsonFile = "$stem.$FileExtension"
             if (Test-Path $jsonFile) {
@@ -283,14 +289,16 @@ function Out-PolicyExemptions {
             }
             # Logic to force the order of the Metadata property (DeployedBy first, then epacMetadata)
             foreach ($array in $excelArray) {
-                $metaString = $array.Metadata
-                $meta = $metaString | ConvertFrom-Json -Depth 100
-                $orderedMeta = [ordered]@{
-                    deployedBy   = $meta.deployedBy
-                    epacMetadata = $meta.epacMetadata
+                if ($null -ne $array.Metadata) {
+                    $metaString = $array.Metadata
+                    $meta = $metaString | ConvertFrom-Json -Depth 100
+                    $orderedMeta = [ordered]@{
+                        deployedBy   = $meta.deployedBy
+                        epacMetadata = $meta.epacMetadata
+                    }
+                    $orderedMetadata = (ConvertTo-Json $orderedMeta -Depth 100 -Compress).ToString()
+                    $array.Metadata = $orderedMetadata
                 }
-                $orderedMetadata = (ConvertTo-Json $orderedMeta -Depth 100 -Compress).ToString()
-                $array.Metadata = $orderedMetadata
             }
             $csvFile = "$stem.csv"
             if (Test-Path $csvFile) {

StarterKit/Pipelines/AzureDevOps/GitHub-Flow/epac-remediation-pipeline.yml

@@ -33,7 +33,7 @@ schedules:
 
 stages:
   - ${{ each pacEnvironment in parameters.pacEnvironmentsToRemediate }}:
-    - stage: Remediate${{ pacEnvironment }}
+    - stage: Remediate ${{ replace(pacEnvironment, '-', '') }}
       dependsOn: []
       displayName: "Remediate ${{ pacEnvironment }} environment"
       jobs:
@@ -43,4 +43,4 @@ stages:
             - template: templates/remediate.yml
               parameters:
                 serviceConnection: $(remediationServiceConnection)
-                pacEnvironmentSelector: ${{ pacEnvironment }}
+                pacEnvironmentSelector: ${{ pacEnvironment }}

StarterKit/Pipelines/AzureDevOps/Release-Flow/epac-remediation-pipeline.yml

@@ -34,7 +34,7 @@ schedules:
 
 stages:
   - ${{ each pacEnvironment in parameters.pacEnvironmentsToRemediate }}:
-    - stage: Remediate${{ pacEnvironment }}
+    - stage: Remediate ${{ replace(pacEnvironment, '-', '') }}
       dependsOn: []
       displayName: "Remediate ${{ pacEnvironment }} environment"
       jobs: