Implemented Export-NonComplianceReports.ps1 (#288)

Azure · Jul 16, 2023 · 46db098 · 46db098
1 parent d87eead
commit 46db098
Show file tree

Hide file tree

Showing 4 changed files with 403 additions and 22 deletions.
diff --git a/Scripts/Helpers/Get-AzPolicyResources.ps1 b/Scripts/Helpers/Get-AzPolicyResources.ps1
@@ -248,11 +248,11 @@ function Get-AzPolicyResources {
             }
         }
         $numberPolicyResourcesProcessed++
-        if ($numberPolicyResourcesProcessed % 500 -eq 0) {
+        if ($numberPolicyResourcesProcessed % 1000 -eq 0) {
             Write-Information "Processed $numberPolicyResourcesProcessed Policy resources"
         }
     }
-    if ($numberPolicyResourcesProcessed % 500 -ne 0) {
+    if ($numberPolicyResourcesProcessed % 1000 -ne 0) {
         Write-Information "Processed $numberPolicyResourcesProcessed Policy resources"
     }
 

diff --git a/Scripts/Helpers/Search-AzGraphAllItems.ps1 b/Scripts/Helpers/Search-AzGraphAllItems.ps1
@@ -11,10 +11,16 @@ function Search-AzGraphAllItems {
     $null = $data.AddRange($result.Data)
     while ($null -ne $result.SkipToken) {
         # More data available, SkipToken will allow the next query in this loop to continue where the last invocation ended
-        Write-Information "Retrieved $($data.Count) $ProgressItemName"
+        $count = $data.Count
+        if ($count % 2000 -eq 0) {
+            Write-Information "Retrieved $count $ProgressItemName"
+        }
         $result = Search-AzGraph $Query -First 1000 -SkipToken $result.SkipToken  @scope
         $null = $data.AddRange($result.Data)
     }
-    Write-Information "Retrieved $($data.Count) $ProgressItemName"
+    $count = $data.Count
+    if ($count % 2000 -ne 0) {
+        Write-Information "Retrieved $($count) $ProgressItemName"
+    }
     return $data
 }
diff --git a/Scripts/Operations/Create-AzRemediationTasks.ps1 b/Scripts/Operations/Create-AzRemediationTasks.ps1
@@ -56,26 +56,28 @@ $result = @() + (Search-AzGraphAllItems -Query $query -Scope @{ UseTenantScope =
 Write-Information ""
 
 $remediationsList = [System.Collections.ArrayList]::new()
-# Only create remediation task owned by this Policy as Code repo
-$scopeTable = Get-AzScopeTree -PacEnvironment $pacEnvironment
-$deployedPolicyResources = Get-AzPolicyResources -PacEnvironment $pacEnvironment -ScopeTable $scopeTable -SkipExemptions -SkipRoleAssignments
-$managedAssignments = $deployedPolicyResources.policyassignments.managed
-$allAssignments = $deployedPolicyResources.policyassignments.all
-$strategy = $pacEnvironment.desiredState.strategy
-foreach ($entry in $result) {
-    $policyAssignmentId = $entry.properties_policyAssignmentId
-    if ($OnlyCheckManagedAssignments) {
-        if ($managedAssignments.ContainsKey($policyAssignmentId)) {
-            $managedAssignment = $managedAssignments.$policyAssignmentId
-            $assignmentPacOwner = $managedAssignment.pacOwner
-            if ($assignmentPacOwner -eq "thisPaC" -or ($assignmentPacOwner -eq "unknownOwner" -and $strategy -eq "full")) {
-                $null = $remediationsList.Add($entry)
+if ($result.Count -gt 0) {
+    # Only create remediation task owned by this Policy as Code repo
+    $scopeTable = Get-AzScopeTree -PacEnvironment $pacEnvironment
+    $deployedPolicyResources = Get-AzPolicyResources -PacEnvironment $pacEnvironment -ScopeTable $scopeTable -SkipExemptions -SkipRoleAssignments
+    $managedAssignments = $deployedPolicyResources.policyassignments.managed
+    $allAssignments = $deployedPolicyResources.policyassignments.all
+    $strategy = $pacEnvironment.desiredState.strategy
+    foreach ($entry in $result) {
+        $policyAssignmentId = $entry.properties_policyAssignmentId
+        if ($OnlyCheckManagedAssignments) {
+            if ($managedAssignments.ContainsKey($policyAssignmentId)) {
+                $managedAssignment = $managedAssignments.$policyAssignmentId
+                $assignmentPacOwner = $managedAssignment.pacOwner
+                if ($assignmentPacOwner -eq "thisPaC" -or ($assignmentPacOwner -eq "unknownOwner" -and $strategy -eq "full")) {
+                    $null = $remediationsList.Add($entry)
+                }
             }
         }
-    }
-    else {
-        if ($allAssignments.ContainsKey($policyAssignmentId)) {
-            $null = $remediationsList.Add($entry)
+        else {
+            if ($allAssignments.ContainsKey($policyAssignmentId)) {
+                $null = $remediationsList.Add($entry)
+            }
         }
     }
 }