BugFix on Tagged RG (#311)

Azure · Jul 25, 2024 · f6a018e · f6a018e
1 parent 86aa597
commit f6a018e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/tools/1_wara_collector.ps1 b/tools/1_wara_collector.ps1
@@ -667,7 +667,7 @@ $Script:Runtime = Measure-Command -Expression {
       {
         $InScopeSub = $Scope.split("/")[2]
         $ResourceScopeQuery = "resources | where subscriptionId =~ '$InScopeSub' "
-        $ContainerScopeQuery = "resourceContainers | where id =~ '$Scope' "
+        $ContainerScopeQuery = "resourceContainers | where id has '$Scope' "
       }
     elseif ($Scope.split("/").count -gt 4 -and $Scope.split("/").count -lt 8)
       {
@@ -685,10 +685,10 @@ $Script:Runtime = Measure-Command -Expression {
     $TagFilter = $Tags
 
     # Each line in the Tag Filtering file will be processed
-    $AllTaggedResourceGroups = @()
     $AllTaggedResources = @()
     $ResetTags = $false
     Foreach ($TagLine in $TagFilter) {
+      $AllTaggedResourceGroups = ''
       # Finding the TagKey and all the TagValues in the line
       if ($TagLine -like '*==*')
         {
@@ -742,7 +742,7 @@ $Script:Runtime = Measure-Command -Expression {
               }
             $ResourcesTagQuery = "Resources | where id startswith '$ResourceGroup' | project id, name, subscriptionId, type, resourceGroup, location | order by id"
 
-            $AllTaggedResourceGroups += Get-AllAzGraphResource -query $ResourcesTagQuery -subscriptionId $InScopeSub
+            $AllTaggedResourceGroups = Get-AllAzGraphResource -query $ResourcesTagQuery -subscriptionId $InScopeSub
           if ($Debugging.IsPresent)
             {
               Write-host "Resources Found Inside the Container: " -NoNewline
@@ -779,7 +779,11 @@ $Script:Runtime = Measure-Command -Expression {
             $AllTaggedResources += $ResourcesWithTHETag
             $AllTaggedResources += $AllTaggedResourceGroups
           }
-        elseif ([string]::IsNullOrEmpty($ResourcesWithTHETag))
+        elseif ([string]::IsNullOrEmpty($ResourcesWithTHETag) -and ![string]::IsNullOrEmpty($AllTaggedResourceGroups))
+          {
+            $AllTaggedResources += $AllTaggedResourceGroups
+          }
+        elseif ([string]::IsNullOrEmpty($ResourcesWithTHETag) -and [string]::IsNullOrEmpty($AllTaggedResourceGroups))
           {
             if ($Debugging.IsPresent)
               {