Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add multi_scan_id to scan params for sca scan flow
Browse files Browse the repository at this point in the history
orz25 committed Jan 28, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent f84756a commit a6467e8
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions xray/services/scan.go
Original file line number Diff line number Diff line change
@@ -46,6 +46,8 @@ const (

XscGraphAPI = "api/v1/sca/scan/graph"

multiScanIdParam = "multi_scan_id="

scanTechQueryParam = "tech="

XscVersionAPI = "api/v1/system/version"
@@ -83,6 +85,7 @@ func createScanGraphQueryParams(scanParams XrayGraphScanParams) string {
}

if scanParams.XscVersion != "" {
params = append(params, multiScanIdParam+scanParams.MultiScanId)
gitInfoContext := scanParams.XscGitInfoContext
if gitInfoContext != nil {
if len(gitInfoContext.Technologies) > 0 {
@@ -108,6 +111,7 @@ func (ss *ScanService) ScanGraph(scanParams XrayGraphScanParams) (string, error)
if err != nil {
return "", fmt.Errorf("failed sending Git Info to XSC service, error: %s ", err.Error())
}
scanParams.MultiScanId = multiScanId
if err = os.Setenv("JF_MSI", multiScanId); err != nil {
// Not a fatal error, if not set the scan will not be shown at the XSC UI, should not fail the scan.
log.Debug(fmt.Sprintf("failed setting MSI as environment variable. Cause: %s", err.Error()))
@@ -281,6 +285,7 @@ type XrayGraphScanParams struct {
IncludeLicenses bool
XscGitInfoContext *XscGitInfoContext
XscVersion string
MultiScanId string
}

type RequestScanResponse struct {

0 comments on commit a6467e8

Please sign in to comment.