Xray SCA scan - always show results with location on Sarif output (jf…

…rog#1021)
gailazar300 · Nov 19, 2023 · 3ef3bad · 3ef3bad
1 parent ffb72f8
commit 3ef3bad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xray/utils/resultwriter.go b/xray/utils/resultwriter.go
@@ -330,7 +330,7 @@ func getXrayIssueLocationIfValidExists(tech coreutils.Technology, run *sarif.Run
 		return
 	}
 	if strings.TrimSpace(descriptorPath) == "" {
-		return
+		descriptorPath = "Package Descriptor"
 	}
 	return sarif.NewLocation().WithPhysicalLocation(sarif.NewPhysicalLocation().WithArtifactLocation(sarif.NewArtifactLocation().WithUri("file://" + descriptorPath))), nil
 }

diff --git a/xray/utils/resultwriter_test.go b/xray/utils/resultwriter_test.go
@@ -163,7 +163,7 @@ func TestGetXrayIssueLocationIfValidExists(t *testing.T) {
 			name:           "No descriptor information",
 			tech:           coreutils.Pip,
 			run:            CreateRunWithDummyResults().WithInvocations([]*sarif.Invocation{invocation}),
-			expectedOutput: nil,
+			expectedOutput: sarif.NewLocation().WithPhysicalLocation(sarif.NewPhysicalLocation().WithArtifactLocation(sarif.NewArtifactLocation().WithUri("file://Package Descriptor"))),
 		},
 		{
 			name:           "One descriptor information",
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
     	if strings.TrimSpace(descriptorPath) == "" {
-    		return
+    		descriptorPath = "Package Descriptor"
     	}
     	return sarif.NewLocation().WithPhysicalLocation(sarif.NewPhysicalLocation().WithArtifactLocation(sarif.NewArtifactLocation().WithUri("file://" + descriptorPath))), nil
     }
@@ Expand Down @@