reposition override

jfrog · Sep 20, 2023 · 79037ef · 79037ef
1 parent d6632a2
commit 79037ef
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/xray/utils/resultwriter.go b/xray/utils/resultwriter.go
@@ -263,19 +263,19 @@ func addXrayCveIssueToSarifRun(cves []formats.CveRow, issueId, severity, file st
 // Non path - should not be used as location
 func getXrayIssueLocationIfValidExists(file string, run *sarif.Run, override bool) (location *sarif.Location, err error) {
 	location = sarif.NewLocation().WithPhysicalLocation(sarif.NewPhysicalLocation().WithArtifactLocation(sarif.NewArtifactLocation().WithUri(file)))
-	if override {
-		// Use the content as is
-		return
-	}
 	// Check if full path
 	exists, err := fileutils.IsFileExists(file, false)
 	if err != nil || exists {
 		return
 	}
 	// Check if relative path
 	fullPath := GetFullLocationFileName(file, run.Invocations)
-	location = sarif.NewLocation().WithPhysicalLocation(sarif.NewPhysicalLocation().WithArtifactLocation(sarif.NewArtifactLocation().WithUri("file://" + fullPath)))
 	if exists, err = fileutils.IsFileExists(fullPath, false); err != nil || exists {
+		location = sarif.NewLocation().WithPhysicalLocation(sarif.NewPhysicalLocation().WithArtifactLocation(sarif.NewArtifactLocation().WithUri("file://" + fullPath)))
+		return
+	}
+	if override {
+		// Use the content as is
 		return
 	}
 	// Not usable content