Merge pull request #720 from Azure/672-getting-the-following-error-wh…

…en-pulling-existing-exemptions-in-the-plan-1 Fixed Exemptions bug and fixed documentation bug
Azure · Aug 2, 2024 · 9c2e93a · 9c2e93a
2 parents 438c07f + 918cf92
commit 9c2e93a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Scripts/Helpers/Get-AzPolicyExemptions.ps1 b/Scripts/Helpers/Get-AzPolicyExemptions.ps1
@@ -74,9 +74,6 @@ function Get-AzPolicyExemptions {
                 -ExcludedIds $excludedPolicyResources `
                 -PolicyResourceTable $policyResourcesTable
             if ($included) {
-                $scope = $resourceIdParts.scope
-                $policyResource.resourceIdParts = $resourceIdParts
-                $policyResource.scope = $scope
                 $displayName = $properties.displayName
                 if ($null -ne $displayName -and $displayName -eq "") {
                     $displayName = $null

diff --git a/Scripts/Operations/Build-PolicyDocumentation.ps1 b/Scripts/Operations/Build-PolicyDocumentation.ps1
@@ -427,8 +427,10 @@ foreach ($file in $files) {
 
             # Logic to move Tenant Root group to the first entry / column on Markdown
             $tenantRootCategory = $environmentCategories | Where-Object { $_.environmentCategory -eq "Tenant Root Group" }
-            $environmentCategories = $environmentCategories | Where-Object { $_.environmentCategory -ne "Tenant Root Group" }
-            $environmentCategories = , $tenantRootCategory + $environmentCategories
+            if ($null -ne $tenantRootCategory) {
+                $environmentCategories = $environmentCategories | Where-Object { $_.environmentCategory -ne "Tenant Root Group" }
+                $environmentCategories = , $tenantRootCategory + $environmentCategories
+            }
 
             $documentAssignments = $documentationSpec.documentAssignments
             # Check if the member already exists