merge fix

jfrog · Nov 24, 2024 · ce7936c · ce7936c
1 parent 874db13
commit ce7936c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/xray/services/scan.go b/xray/services/scan.go
@@ -157,7 +157,7 @@ func (ss *ScanService) GetScanGraphResults(scanId, xrayVersion string, includeVu
 	endPoint := ss.XrayDetails.GetUrl() + scanGraphAPI
 	// Modify endpoint if XSC is enabled
 	if xscEnabled {
-		endPoint = utils.XrayUrlToXscUrl(ss.XrayDetails.GetUrl(), xrayVersion) + XscGraphAPI
+		endPoint = xscUtils.XrayUrlToXscUrl(ss.XrayDetails.GetUrl(), xrayVersion) + XscGraphAPI
 	}
 	endPoint += "/" + scanId
 

diff --git a/xray/services/scan_test.go b/xray/services/scan_test.go
@@ -33,15 +33,16 @@ func TestCreateScanGraphQueryParams(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.testName, func(t *testing.T) {
 			params := XrayGraphScanParams{
-				RepoPath:   test.repoPath,
-				Watches:    test.watches,
-				ProjectKey: test.projectKey,
-				ScanType:   test.scanType,
+				RepoPath:    test.repoPath,
+				Watches:     test.watches,
+				ProjectKey:  test.projectKey,
+				ScanType:    test.scanType,
+				XrayVersion: test.xrayVersion,
 				XscGitInfoContext: &XscGitInfoContext{
 					GitRepoUrl: test.gitRepoUrl,
 				},
 			}
-			actualQuery := createScanGraphQueryParams(test.xrayVersion, params)
+			actualQuery := createScanGraphQueryParams(params)
 			if actualQuery != test.expectedQuery {
 				t.Error(test.testName, "Expecting:", test.expectedQuery, "Got:", actualQuery)
 			}

diff --git a/xsc/services/utils/utils_test.go b/xsc/services/utils/utils_test.go
@@ -1,8 +1,8 @@
 package utils
 
 import (
-	"testing"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestXrayUrlToXscUrl(t *testing.T) {