Merge pull request #86 from Azure/feat/update-analyzer-report

Feat/update analyzer report

src/modules/wara/analyzer/analyzer.psm1

@@ -5,9 +5,6 @@ Well-Architected Reliability Assessment Script
 .DESCRIPTION
 The function `Start-WARAAnalyzer` will process the JSON file created by the `Start-WARACollector` function and will create the core WARA Action Plan Excel file.
 
-.PARAMETER Debugging
-Switch to enable debugging mode.
-
 .PARAMETER Help
 Switch to display help information.
 
@@ -18,7 +15,7 @@ Specifies the git repository URL that contains APRL contents if you want to use
 Path to the JSON file created by the "1_wara_collector" script.
 
 .EXAMPLE
-Start-WARAAnalyzer -JSONFile 'C:\Temp\WARA_File_2024-04-01_10_01.json' -Debugging
+Start-WARAAnalyzer -JSONFile 'C:\Temp\WARA_File_2024-04-01_10_01.json' -Debug
 
 .LINK
 https://github.com/Azure/Azure-Proactive-Resiliency-Library-v2
@@ -27,15 +24,11 @@ function Start-WARAAnalyzer {
     [CmdletBinding()]
     param
     (
-        [switch]$Debugging,
-        [switch]$Help,
-        [string]$CustomRecommendationsYAMLPath,
-
         [ValidatePattern('^https:\/\/.+$')]
-        [string]$RepoUrl = 'https://github.com/Azure/Azure-Proactive-Resiliency-Library-v2',
-
+        [string] $RecommendationsUrl = 'https://azure.github.io/WARA-Build/objects/recommendations.json',
         [Parameter(mandatory = $true)]
-        [string] $JSONFile
+        [string] $JSONFile,
+        [string] $ExpertAnalysisFile
     )
 
 

src/modules/wara/collector/collector.psm1

@@ -130,7 +130,7 @@ function Get-WAFTaggedResourceGroup {
 | order by ['id']"
 
         $result = Invoke-WAFQuery -Query $tagquery -SubscriptionIds $SubscriptionIds
-    
+
         $return += $result
     }
 
@@ -181,17 +181,23 @@ function Invoke-WAFQueryLoop {
 
     $Types = Get-WAFResourceType -SubscriptionIds $SubscriptionIds
 
-    $Types += $AddedTypes
-
     $QueryObject = Get-WAFQueryByResourceType -ObjectList $RecommendationObject -FilterList $Types.type -KeyColumn 'recommendationResourceType'
 
+    # Add additional types to query based on specialized workloads (This works even if it's empty.)
+    $QueryObject += $AddedTypes.Foreach({
+        $type = $_
+        $RecommendationObject.where({$_.tags -contains $type})
+    }) | Sort-Object -Property "APRLGuid" | Get-Unique -AsString
+
     $return = $QueryObject.Where({ $_.automationAvailable -eq $true -and $_.recommendationMetadataState -eq "Active" -and [string]::IsNullOrEmpty($_.recommendationTypeId) }) | ForEach-Object {
         Write-Progress -Activity 'Running Queries' -Status "Running Query for $($_.recommendationResourceType) - $($_.aprlGuid)" -PercentComplete (($QueryObject.IndexOf($_) / $QueryObject.Count) * 100) -Id $ProgressId
         try {
             (Invoke-WAFQuery -Query $_.query -SubscriptionIds $subscriptionIds -ErrorAction Stop)
         }
         catch {
-            Write-Host "Error running query for - $($_.recommendationResourceType) - $($_.aprlGuid)"
+            $errorInfo = "Error running query for - $($_.recommendationResourceType) - $($_.aprlGuid)"
+            Write-Error $errorInfo
+            return $errorInfo
         }
     }
     Write-Progress -Activity 'Running Queries' -Status 'Completed' -Completed -Id $ProgressId