fix sarifs

Author: zhamborova

.github/workflows/it-test.yml

@@ -78,6 +78,7 @@ jobs:
 
       - name: Run init tests on Windows
         if: matrix.os == 'windows-latest'
+        id: run_init_tests_windows
         shell: pwsh
         run: |
           $ErrorActionPreference = "Stop"
@@ -102,7 +103,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 +137,29 @@ jobs:
           fi
 
       - name: Check test results
-        if: failure()
+        if: always()
         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

utils/sarif.go

@@ -204,14 +204,8 @@ func MergeSarifOutputs(inputFiles []string, outputFile string) error {
 			return fmt.Errorf("failed to read SARIF file %s: %w", file, err)
 		}
 
-		// Filter out rule definitions from each input file
-		filteredData, err := FilterRuleDefinitions(data)
-		if err != nil {
-			return fmt.Errorf("failed to filter rules from SARIF file %s: %w", file, err)
-		}
-
 		var sarif SimpleSarifReport
-		if err := json.Unmarshal(filteredData, &sarif); err != nil {
+		if err := json.Unmarshal(data, &sarif); err != nil {
 			return fmt.Errorf("failed to parse SARIF file %s: %w", file, err)
 		}
 
@@ -234,16 +228,26 @@ func MergeSarifOutputs(inputFiles []string, outputFile string) error {
 	return nil
 }
 
-// FilterRuleDefinitions removes rule definitions from SARIF output
-func FilterRuleDefinitions(sarifData []byte) ([]byte, error) {
-	var report SarifReport
+// FilterRulesFromSarif removes rule definitions from SARIF output if needed
+// This should be called separately after MergeSarifOutputs if rule filtering is required
+func FilterRulesFromSarif(sarifData []byte) ([]byte, error) {
+	// Use a map to preserve all fields during unmarshaling
+	var report map[string]interface{}
 	if err := json.Unmarshal(sarifData, &report); err != nil {
 		return nil, fmt.Errorf("failed to parse SARIF data: %w", err)
 	}
 
-	// Remove rules from each run
-	for i := range report.Runs {
-		report.Runs[i].Tool.Driver.Rules = nil
+	// Navigate to the runs array and remove rules from each run
+	if runs, ok := report["runs"].([]interface{}); ok {
+		for _, run := range runs {
+			if runMap, ok := run.(map[string]interface{}); ok {
+				if tool, ok := runMap["tool"].(map[string]interface{}); ok {
+					if driver, ok := tool["driver"].(map[string]interface{}); ok {
+						driver["rules"] = nil
+					}
+				}
+			}
+		}
 	}
 
 	// Marshal back to JSON with indentation