Merge branch 'dev' into improve-distribution-polling

jfrog · Nov 28, 2024 · fbbeae3 · fbbeae3
2 parents 96960a0 + ecc791f
commit fbbeae3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/utils/utils.go b/utils/utils.go
@@ -28,7 +28,7 @@ import (
 const (
 	Development = "development"
 	Agent       = "jfrog-client-go"
-	Version     = "1.48.0"
+	Version     = "1.48.1"
 )
 
 const xrayDevVersion = "3.x-dev"

diff --git a/xray/services/scan.go b/xray/services/scan.go
@@ -76,7 +76,7 @@ func createScanGraphQueryParams(scanParams XrayGraphScanParams) string {
 		}
 	}
 
-	if scanParams.XscVersion != "" {
+	if scanParams.XscVersion != "" && scanParams.MultiScanId != "" {
 		params = append(params, multiScanIdParam+scanParams.MultiScanId)
 		gitInfoContext := scanParams.XscGitInfoContext
 		if gitInfoContext != nil {
@@ -112,8 +112,8 @@ func (ss *ScanService) ScanGraph(scanParams XrayGraphScanParams) (string, error)
 	}
 	url := ss.XrayDetails.GetUrl() + scanGraphAPI
 
-	// When XSC is enabled, modify the URL.
-	if scanParams.XrayVersion != "" && scanParams.XscVersion != "" {
+	// When XSC is enabled and MultiScanId is provided, modify the URL to use XSC scan graph (analytics enabled)
+	if scanParams.XrayVersion != "" && scanParams.XscVersion != "" && scanParams.MultiScanId != "" {
 		url = utils.XrayUrlToXscUrl(ss.XrayDetails.GetUrl(), scanParams.XrayVersion) + XscGraphAPI
 	}
 	url += createScanGraphQueryParams(scanParams)