chore: introduce generic test result metadata (#483)

Author: CatalinSnyk

internal/presenters/funcs.go

@@ -263,7 +263,6 @@ func getSarifTemplateFuncMap() template.FuncMap {
 	fnMap["buildLocationFromIssue"] = sarif.BuildLocation
 	fnMap["buildFixesFromIssue"] = sarif.BuildFixesFromIssue
 	fnMap["formatIssueMessage"] = sarif.FormatIssueMessage
-	fnMap["getManifestPath"] = getManifestPathFromTestResult
 	return fnMap
 }
 
@@ -409,22 +408,3 @@ func getFindingTypesFromTestResult(testResults testapi.TestResult) []testapi.Fin
 
 	return findingTypesList
 }
-
-// getManifestPathFromTestResult extracts the manifest file path from test result
-func getManifestPathFromTestResult(testResults testapi.TestResult) string {
-	// Get the test subject
-	testSubject := testResults.GetTestSubject()
-
-	// Try to extract as DepGraphSubject
-	depGraph, err := testSubject.AsDepGraphSubject()
-	if err != nil {
-		return "package.json" // Default fallback
-	}
-
-	// Get the first path from locator
-	if len(depGraph.Locator.Paths) > 0 {
-		return depGraph.Locator.Paths[0]
-	}
-
-	return "package.json" // Default fallback
-}

internal/presenters/presenter_ufm_test.go

@@ -56,7 +56,7 @@ func normalizeAutomationID(run map[string]interface{}) {
 		if id, ok := automationDetails["id"].(string); ok {
 			parts := strings.Split(id, "/")
 			if len(parts) >= 2 {
-				automationDetails["id"] = strings.Join(parts[:2], "/") + "/*"
+				automationDetails["id"] = strings.Join(parts[:len(parts)-1], "/") + "/*"
 			}
 		}
 	}
@@ -203,46 +203,10 @@ func normalizeResultURIs(run map[string]interface{}) {
 		if !ok {
 			continue
 		}
-		normalizeLocationURIs(result)
 		normalizeFixURIs(result)
 	}
 }
 
-// normalizeLocationURIs normalizes URIs in result locations
-func normalizeLocationURIs(result map[string]interface{}) {
-	locations, ok := result["locations"].([]interface{})
-	if !ok {
-		return
-	}
-	for _, locInterface := range locations {
-		loc, ok := locInterface.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		physLoc, ok := loc["physicalLocation"].(map[string]interface{})
-		if !ok {
-			continue
-		}
-		artLoc, ok := physLoc["artifactLocation"].(map[string]interface{})
-		if !ok {
-			continue
-		}
-		uri, ok := artLoc["uri"].(string)
-		if !ok {
-			continue
-		}
-		// Normalize common manifest filenames
-		if strings.HasSuffix(uri, "package.json") || strings.HasSuffix(uri, "package-lock.json") || strings.HasSuffix(uri, "pom.xml") {
-			// Preserve subproject path
-			if idx := strings.LastIndex(uri, "/"); idx >= 0 {
-				artLoc["uri"] = uri[:idx+1] + "manifest"
-			} else {
-				artLoc["uri"] = "manifest"
-			}
-		}
-	}
-}
-
 // normalizeFixURIs normalizes URIs in fixes
 func normalizeFixURIs(result map[string]interface{}) {
 	fixes, ok := result["fixes"].([]interface{})

internal/presenters/templates/ufm.sarif.tmpl

@@ -48,9 +48,12 @@
 					}
 				},
 			"results": [
-				{{- $manifestPath := getManifestPath $result }}
+				{{- $targetFile := index $result.GetMetadata "display-target-file" }}
 				{{- range $index, $issue := $issues }}
-				{{- $location := buildLocationFromIssue $issue }}
+				{{- $location := buildLocationFromIssue $issue $targetFile }}
+				{{- $physicalLoc := index $location "physicalLocation" }}
+				{{- $region := index $physicalLoc "region" }}
+				{{- $artifactLocation := index $physicalLoc "artifactLocation" }}
 				{{- $fixes := buildFixesFromIssue $issue }}
 				{{- $ignoreDetails := $issue.GetIgnoreDetails }}
 				{
@@ -61,13 +64,12 @@
 					},
 					"locations": [
 						{{- if $location }}
-						{{- $physicalLoc := index $location "physicalLocation" }}
-						{{- $region := index $physicalLoc "region" }}
+					
 						{{- $logicalLocs := index $location "logicalLocations" }}
 						{
 							"physicalLocation": {
 								"artifactLocation": {
-									"uri": {{ getQuotedString $manifestPath }}
+									"uri": {{ getQuotedString (index $artifactLocation "uri") }}
 								},
 								"region": {
 									"startLine": {{ index $region "startLine" }}
@@ -97,7 +99,7 @@
 								{{- range $changeIndex, $change := $artifactChanges }}
 								{
 									"artifactLocation": {
-										"uri": {{ getQuotedString $manifestPath }}
+										"uri": {{ getQuotedString (index $artifactLocation "uri") }}
 									},
 									"replacements": [
 										{{- $replacements := index $change "replacements" }}
@@ -198,7 +200,8 @@
 				},
 				*/ -}}
 				"automationDetails": {
-					"id": "{{- getAutomationDetailsId (getValueFromConfig "project-name") (printf "%s" $findingType) }}"
+					{{- $projectName := index $result.GetMetadata "project-name" }}
+					"id": "{{- getAutomationDetailsId $projectName (printf "%s" $findingType) }}"
 				}
 			}{{if or (lt $findingTypeIndex $findingTypesSize) (lt $resultIndex (sub (len $.TestResults) 1))}},{{end}}{{- end}}	
 		{{- end}}

internal/presenters/testdata/ufm/multi_project.testresult.json

@@ -9,6 +9,11 @@
       },
       "timeout": { "outcome": "fail", "seconds": 1200 }
     },
+    "metadata": {
+      "project-name": "tpwe",
+      "display-target-file": "dotnet/obj/project.assets.json",
+      "target-directory": "multi-project"
+    },
     "createdAt": "2025-11-13T15:29:14.585711Z",
     "testSubject": {
       "locator": {
@@ -816,6 +821,11 @@
       },
       "timeout": { "outcome": "fail", "seconds": 1200 }
     },
+    "metadata": {
+      "project-name": "package.json",
+      "display-target-file": "ghost/package.json",
+      "target-directory": "multi-project"
+    },
     "createdAt": "2025-11-13T15:29:14.491151Z",
     "testSubject": {
       "locator": { "paths": ["ghost/package-lock.json"], "type": "local_path" },
@@ -4375,6 +4385,11 @@
       },
       "timeout": { "outcome": "fail", "seconds": 1200 }
     },
+    "metadata": {
+      "project-name": "golangproject",
+      "display-target-file": "golang/go.mod",
+      "target-directory": "multi-project"
+    },
     "createdAt": "2025-11-13T15:29:14.506347Z",
     "testSubject": {
       "locator": { "paths": ["golang/go.mod"], "type": "local_path" },
@@ -4525,6 +4540,11 @@
       },
       "timeout": { "outcome": "fail", "seconds": 1200 }
     },
+    "metadata": {
+      "project-name": "demo:maven-demo",
+      "display-target-file": "maven/pom.xml",
+      "target-directory": "multi-project"
+    },
     "createdAt": "2025-11-13T15:29:14.480432Z",
     "testSubject": {
       "locator": { "paths": ["maven/pom.xml"], "type": "local_path" },
@@ -4572,6 +4592,11 @@
       },
       "timeout": { "outcome": "fail", "seconds": 1200 }
     },
+    "metadata": {
+      "project-name": "not-python",
+      "display-target-file": "not-python/requirements.txt",
+      "target-directory": "multi-project"
+    },
     "createdAt": "2025-11-13T15:29:14.440374Z",
     "testSubject": {
       "locator": {
@@ -6385,6 +6410,11 @@
       },
       "timeout": { "outcome": "fail", "seconds": 1200 }
     },
+    "metadata": {
+      "project-name": "python",
+      "display-target-file": "python/requirements.txt",
+      "target-directory": "multi-project"
+    },
     "createdAt": "2025-11-13T15:29:18.009229Z",
     "testSubject": {
       "locator": { "paths": ["python/requirements.txt"], "type": "local_path" },
@@ -8195,6 +8225,11 @@
       },
       "timeout": { "outcome": "fail", "seconds": 1200 }
     },
+    "metadata": {
+      "project-name": "tsc",
+      "display-target-file": "tsc/package.json",
+      "target-directory": "multi-project"
+    },
     "createdAt": "2025-11-13T15:29:19.594887Z",
     "testSubject": {
       "locator": { "paths": ["tsc/package-lock.json"], "type": "local_path" },