578 scope counts are off based on the root scope type and 637 Outdate…

…d Policy-Exemption Schema (#640) * bug 578 * adding issue 637
Azure · May 30, 2024 · 0fdceac · 0fdceac
1 parent 761a790
commit 0fdceac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/Schemas/policy-exemption-schema.json b/Schemas/policy-exemption-schema.json
@@ -32,16 +32,16 @@
                         "policyDefinitionReferenceIds": {
                             "type": "array"
                         },
-                        "policyId": {
+                        "policyDefinitionId": {
                             "type": "string"
                         },
-                        "policyName": {
+                        "policyDefinitionName": {
                             "type": "string"
                         },
-                        "policySetId": {
+                        "policySetDefinitionId": {
                             "type": "string"
                         },
-                        "policySetName": {
+                        "policySetDefinitionName": {
                             "type": "string"
                         },
                         "resourceSelectors": {
@@ -63,22 +63,22 @@
                         },
                         {
                             "required": [
-                                "policyId"
+                                "policyDefinitionId"
                             ]
                         },
                         {
                             "required": [
-                                "policyName"
+                                "policyDefinitionName"
                             ]
                         },
                         {
                             "required": [
-                                "policySetId"
+                                "policySetDefinitionId"
                             ]
                         },
                         {
                             "required": [
-                                "policySetName"
+                                "policySetDefinitionName"
                             ]
                         }
                     ],

diff --git a/Scripts/Helpers/Build-ScopeTableForDeploymentRootScope.ps1 b/Scripts/Helpers/Build-ScopeTableForDeploymentRootScope.ps1
@@ -24,7 +24,7 @@ function Build-ScopeTableForDeploymentRootScope {
             ManagementGroup = $deploymentRootScopeManagementGroupName
         }
     }
-    elseif ($deploymentRootScope.StartsWith("/subscriptions/")) {
+    elseif ($deploymentRootScope.StartsWith("/subscriptions/") -and $deploymentRootScope -notLike "*/resourceGroups/*") {
         $deploymentRootScopeSubscriptionId = $deploymentRootScope -replace "/subscriptions/"
         $scopeSplat = @{
             Subscription = $deploymentRootScopeSubscriptionId
@@ -136,6 +136,9 @@ function Build-ScopeTableForDeploymentRootScope {
         $numberOfManagementGroups-- # subtract 1 for the root scope
         Write-Information "    Management groups = $($numberOfManagementGroups)"
     }
+    if ($deploymentRootScope.StartsWith("/subscriptions/")) {
+        $numberOfSubscriptions-- # subtract 1 for the root scope
+    }
     Write-Information "    Subscriptions     = $($numberOfSubscriptions)"
     Write-Information "    Resource groups   = $($numberofResourceGroups)"