Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions scanpullrequest/scanpullrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,10 @@ func auditPullRequestSourceCode(repoConfig *utils.Repository, scanDetails *utils
}
// Set JAS output flags based on the scan results
repoConfig.OutputWriter.SetJasOutputFlags(scanResults.EntitledForJas, scanResults.HasJasScansResults(jasutils.Applicability))
workingDirs := []string{strings.TrimPrefix(sourceBranchWd, string(filepath.Separator))}
if targetBranchWd != "" && scanDetails.ResultsToCompare != nil {
log.Debug("Diff scan - converting to new issues...")
workingDirs = append(workingDirs, strings.TrimPrefix(targetBranchWd, string(filepath.Separator)))
}

filterFailedResultsIfScannersFailuresAreAllowed(scanDetails.ResultsToCompare, scanResults, repoConfig.Params.ConfigProfile.GeneralConfig.FailUponAnyScannerError, sourceBranchWd, targetBranchWd)

issuesCollection, e := scanResultsToIssuesCollection(scanResults, workingDirs...)
log.Debug("Diff scan - converting to new issues...")
issuesCollection, e := scanResultsToIssuesCollection(scanResults, strings.TrimPrefix(sourceBranchWd, string(filepath.Separator)), strings.TrimPrefix(targetBranchWd, string(filepath.Separator)))
if e != nil {
err = errors.Join(err, fmt.Errorf("failed to get issues for pull request. Error: %s", e.Error()))
}
Expand Down
Loading