diff --git a/xray/services/scan.go b/xray/services/scan.go index 61908f7e5..a53e6b361 100644 --- a/xray/services/scan.go +++ b/xray/services/scan.go @@ -6,6 +6,7 @@ import ( "github.com/jfrog/jfrog-client-go/utils/log" xrayUtils "github.com/jfrog/jfrog-client-go/xray/services/utils" "net/http" + "os" "strings" "time" @@ -45,8 +46,6 @@ const ( XscGraphAPI = "api/v1/sca/scan/graph" - multiScanIdParam = "multi_scan_id=" - scanTechQueryParam = "tech=" XscVersionAPI = "api/v1/system/version" @@ -84,7 +83,6 @@ 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 { @@ -110,7 +108,9 @@ 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 { + log.Debug(errorutils.CheckErrorf("failed setting MSI as environment variable. Cause: %s", err.Error())) + } } httpClientsDetails := ss.XrayDetails.CreateHttpClientDetails() @@ -280,7 +280,6 @@ type XrayGraphScanParams struct { IncludeLicenses bool XscGitInfoContext *XscGitInfoContext XscVersion string - MultiScanId string } type RequestScanResponse struct {