Update sarif tests

.github/workflows/it-test.yml

@@ -68,16 +68,9 @@ jobs:
         if: matrix.os != 'windows-latest'
         run: chmod +x cli-v2
 
-      - name: Install yq on Windows
-        if: matrix.os == 'windows-latest'
-        shell: pwsh
-        run: |
-          choco install yq -y
-          Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
-          refreshenv
-
       - name: Run init tests on Windows
         if: matrix.os == 'windows-latest'
+        id: run_init_tests_windows
         shell: pwsh
         run: |
           $ErrorActionPreference = "Stop"
@@ -102,7 +95,7 @@ jobs:
 
       - name: Run tool tests
         if: matrix.os != 'windows-latest'
-        id: run_tests
+        id: run_tool_tests_unix
         continue-on-error: true
         shell: bash
         run: |
@@ -136,7 +129,30 @@ jobs:
           fi
 
       - name: Check test results
-        if: failure()
+        if: always()
+        shell: bash
         run: |
-          echo "Job failed because some tests failed. Please check the logs above for details."
-          exit 1
+          FAILED=false
+
+          # Check init tests on Windows
+          if [ "${{ matrix.os }}" = "windows-latest" ] && [ "${{ steps.run_init_tests_windows.outcome }}" = "failure" ]; then
+            echo "❌ Init tests failed on Windows"
+            FAILED=true
+          fi
+
+          # Check init tests on Unix
+          if [ "${{ matrix.os }}" != "windows-latest" ] && [ "${{ steps.run_init_tests_unix.outcome }}" = "failure" ]; then
+            echo "❌ Init tests failed on Unix"
+            FAILED=true
+          fi
+
+          # Check tool tests on Unix
+          if [ "${{ matrix.os }}" != "windows-latest" ] && [ "${{ steps.run_tool_tests_unix.outcome }}" = "failure" ]; then
+            echo "❌ Tool tests failed on Unix"
+            FAILED=true
+          fi
+
+          if [ "$FAILED" = true ]; then
+            echo "Job failed because some tests failed. Please check the logs above for details."
+            exit 1
+          fi

cmd/analyze.go

@@ -482,20 +482,23 @@ var analyzeCmd = &cobra.Command{
 				log.Fatalf("Failed to merge SARIF outputs: %v", err)
 			}
 
+			// Filter rules from the merged SARIF output
+			sarifData, err := os.ReadFile(tmpOutputFile)
+			if err != nil {
+				log.Fatalf("Failed to read merged SARIF output: %v", err)
+			}
+
+			filteredData, err := utils.FilterRulesFromSarif(sarifData)
+			if err != nil {
+				log.Fatalf("Failed to filter rules from SARIF: %v", err)
+			}
+
 			if outputFile != "" {
-				// copy tmpOutputFile to outputFile
-				content, err := os.ReadFile(tmpOutputFile)
-				if err != nil {
-					log.Fatalf("Failed to read merged SARIF output: %v", err)
-				}
-				os.WriteFile(outputFile, content, utils.DefaultFilePerms)
+				// Write filtered SARIF to output file
+				os.WriteFile(outputFile, filteredData, utils.DefaultFilePerms)
 			} else {
-				// println the output file content
-				content, err := os.ReadFile(tmpOutputFile)
-				if err != nil {
-					log.Fatalf("Failed to read merged SARIF output: %v", err)
-				}
-				fmt.Println(string(content))
+				// Print the filtered SARIF output
+				fmt.Println(string(filteredData))
 			}
 		} else {
 			// Run tools without merging outputs

integration-tests/init-with-token/expected/codacy.yaml

@@ -1,10 +1,11 @@
 runtimes:
     - node@22.2.0
     - python@3.11.11
+    - java@17.0.10
 tools:
     - eslint@8.57.0
     - trivy@0.59.1
     - pylint@3.3.6
     - pmd@6.55.0
     - semgrep@1.78.0
-    - lizard@1.17.19
+    - lizard@1.17.19

integration-tests/init-without-token/expected/codacy.yaml

@@ -2,11 +2,12 @@ runtimes:
     - node@22.2.0
     - python@3.11.11
     - dart@3.7.2
+    - java@17.0.10
 tools:
     - eslint@9.3.0
     - trivy@0.59.1
     - pylint@3.3.6
     - pmd@6.55.0
     - dartanalyzer@3.7.2
     - semgrep@1.78.0
-    - lizard@1.17.19
+    - lizard@1.17.19

integration-tests/run.ps1

@@ -20,7 +20,45 @@ function Normalize-Config {
     $ext = [System.IO.Path]::GetExtension($file).TrimStart('.')
 
     switch ($ext) {
-        { $_ -in @('yaml', 'yml') } { yq e '.' $file | Sort-Object }
+        { $_ -in @('yaml', 'yml') } {
+            # For YAML files, preserve structure and sort within sections
+            $content = Get-Content $file
+            $output = @()
+            $currentSection = ""
+            $sectionContent = @()
+
+            foreach ($line in $content) {
+                $line = $line.Trim()
+                if ($line -match '^(\w+):$') {
+                    # If we have a previous section, sort and add its content
+                    if ($currentSection -and $sectionContent.Count -gt 0) {
+                        $output += $currentSection
+                        $output += ($sectionContent | Sort-Object)
+                        $sectionContent = @()
+                    }
+                    $currentSection = $line
+                }
+                elseif ($line -match '^\s*-\s*') {
+                    $sectionContent += $line
+                }
+                elseif ($line -match '\S') {
+                    $output += $line
+                }
+            }
+
+            # Add the last section
+            if ($currentSection -and $sectionContent.Count -gt 0) {
+                $output += $currentSection
+                $output += ($sectionContent | Sort-Object)
+            }
+
+            # Add empty line at the end if the original had one
+            if ($content[-1] -match '^\s*$') {
+                $output += ""
+            }
+
+            $output
+        }
         { $_ -in @('rc', 'conf', 'ini', 'xml') } {
             Get-Content $file | ForEach-Object {
                 if ($_ -match '^[^#].*=.*,') {
@@ -54,14 +92,16 @@ function Compare-Files {
         $expectedContent = Normalize-Config $_.FullName
         $actualContent = Normalize-Config $actualFile
 
-        if (Compare-Object $expectedContent $actualContent) {
+        # Compare line by line
+        $diff = Compare-Object $expectedContent $actualContent -PassThru
+        if ($diff) {
             Write-Host "❌ $label/$($_.Name) does not match expected"
             Write-Host "=== Expected (normalized) ==="
             $expectedContent
             Write-Host "=== Actual (normalized) ==="
             $actualContent
             Write-Host "=== Diff ==="
-            Compare-Object $expectedContent $actualContent
+            $diff
             Write-Host "==================="
             exit 1
         }
@@ -70,7 +110,7 @@ function Compare-Files {
 
     # Compare subdirectories
     Get-ChildItem -Path $expectedDir -Directory | Where-Object { $_.Name -ne "logs" } | ForEach-Object {
-        $actualSubDir = if ($_.Name -eq ".codacy") { $actualDir } else { Join-Path $actualDir $_.Name }
+        $actualSubDir = Join-Path $actualDir $_.Name
 
         if (-not (Test-Path $actualSubDir)) {
             Write-Host "❌ Directory $label/$($_.Name) does not exist in actual output"

plugins/tools/codacy-enigma-cli/test/expected.sarif

@@ -5,7 +5,8 @@
     {
       "tool": {
         "driver": {
-          "name": "codacy-enigma-cli"
+          "name": "codacy-enigma-cli",
+          "rules": null
         }
       },
       "results": [

plugins/tools/dartanalyzer/test/expected.sarif

@@ -42,7 +42,8 @@
       ],
       "tool": {
         "driver": {
-          "name": "dartanalyzer"
+          "name": "dartanalyzer",
+          "rules": null
         }
       }
     }

plugins/tools/eslint/test/expected.sarif

@@ -44,7 +44,7 @@
         "driver": {
           "informationUri": "https://eslint.org",
           "name": "ESLint",
-          "rules": [],
+          "rules": null,
           "version": "8.57.0"
         }
       }

plugins/tools/lizard/test/expected.sarif

@@ -8,52 +8,7 @@
           "name": "Lizard",
           "version": "1.17.10",
           "informationUri": "https://github.com/terryyin/lizard",
-          "rules": [
-            {
-              "id": "Lizard_ccn-medium",
-              "shortDescription": {
-                "text": "Check the Cyclomatic Complexity value of a function or logic block. If the threshold is not met, raise a Medium issue. The default threshold is 8."
-              },
-              "properties": {
-                "tags": [
-                  "warning"
-                ]
-              }
-            },
-            {
-              "id": "Lizard_file-nloc-medium",
-              "shortDescription": {
-                "text": "Check the number of lines of code (without comments) in a file. If the threshold is not met, raise a Medium issue. The default threshold is 500."
-              },
-              "properties": {
-                "tags": [
-                  "warning"
-                ]
-              }
-            },
-            {
-              "id": "Lizard_nloc-medium",
-              "shortDescription": {
-                "text": "Check the number of lines of code (without comments) in a function. If the threshold is not met, raise a Medium issue. The default threshold is 50."
-              },
-              "properties": {
-                "tags": [
-                  "warning"
-                ]
-              }
-            },
-            {
-              "id": "Lizard_parameter-count-medium",
-              "shortDescription": {
-                "text": "Check the number of parameters sent to a function. If the threshold is not met, raise a Medium issue. The default threshold is 8."
-              },
-              "properties": {
-                "tags": [
-                  "warning"
-                ]
-              }
-            }
-          ]
+          "rules": null
         }
       },
       "results": [