fix CR notes

Author: eranturgeman

commands/audit/audit.go

@@ -132,7 +132,7 @@ func CreateAuditResultsContext(serverDetails *config.ServerDetails, xrayVersion
 		return
 	}
 	// Get the defined and active watches from the platform.
-	manager, err := xsc.CreateXscService(serverDetails, projectKey)
+	manager, err := xsc.CreateXscService(serverDetails, xrayutils.WithScopedProjectKey(projectKey))
 	if err != nil {
 		log.Warn(fmt.Sprintf("Failed to create Xray services manager: %s", err.Error()))
 		return

tests/utils/integration/test_integrationutils.go

@@ -87,7 +87,7 @@ func PrepareXscForTest(t *testing.T) func() {
 func getXrayAndXscTestVersions(t *testing.T) (string, string, error) {
 	xrayVersion, err := testUtils.GetTestsXrayVersion()
 	assert.NoError(t, err)
-	xscService, err := xsc.CreateXscServiceBackwardCompatible(xrayVersion.GetVersion(), configTests.XscDetails, "")
+	xscService, err := xsc.CreateXscServiceBackwardCompatible(xrayVersion.GetVersion(), configTests.XscDetails)
 	assert.NoError(t, err)
 	xscVersion, err := xscService.GetVersion()
 	return xrayVersion.GetVersion(), xscVersion, err

utils/xsc/analyticsmetrics.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/jfrog/jfrog-cli-security/utils"
+	"github.com/jfrog/jfrog-cli-security/utils/xray"
 
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
@@ -40,7 +41,7 @@ func SendNewScanEvent(xrayVersion, xscVersion string, serviceDetails *config.Ser
 		log.Debug("Analytics metrics are disabled, skip sending event request to XSC")
 		return
 	}
-	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serviceDetails, projectKey)
+	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serviceDetails, xray.WithScopedProjectKey(projectKey))
 	if err != nil {
 		log.Debug(fmt.Sprintf("failed to create xsc manager for analytics metrics service, error: %s ", err.Error()))
 		return
@@ -62,7 +63,7 @@ func SendScanEndedEvent(xrayVersion, xscVersion string, serviceDetails *config.S
 		return
 	}
 	// Generate the finalize event.
-	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serviceDetails, resultsContext.ProjectKey)
+	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serviceDetails, xray.WithScopedProjectKey(resultsContext.ProjectKey))
 	if err != nil {
 		log.Debug(fmt.Sprintf("failed to create xsc manager for analytics metrics service, skip sending command finalize event, error: %s ", err.Error()))
 		return
@@ -136,7 +137,7 @@ func GetScanEvent(xrayVersion, xscVersion, multiScanId string, serviceDetails *c
 		log.Debug("Can't get general event from XSC - analytics metrics are disabled.")
 		return nil, nil
 	}
-	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serviceDetails, projectKey)
+	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serviceDetails, xray.WithScopedProjectKey(projectKey))
 	if err != nil {
 		log.Debug(fmt.Sprintf("failed to create xsc manager for analytics metrics service, skip getting general event, error: %s ", err.Error()))
 		return nil, err

utils/xsc/configprofile.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-security/utils/xray"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/jfrog/jfrog-client-go/xsc/services"
@@ -15,7 +16,7 @@ func GetConfigProfileByName(xrayVersion string, serverDetails *config.ServerDeta
 		return nil, err
 	}
 
-	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serverDetails, projectKey)
+	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serverDetails, xray.WithScopedProjectKey(projectKey))
 	if err != nil {
 		return nil, err
 	}
@@ -31,7 +32,7 @@ func GetConfigProfileByUrl(xrayVersion string, serverDetails *config.ServerDetai
 		log.Info(fmt.Sprintf("Minimal Xray version required to use a configProfile is by url '%s'. All configurations will be induced from provided Env vars and files", services.ConfigProfileNewSchemaMinXrayVersion))
 		return nil, err
 	}
-	xscService, err := CreateXscService(serverDetails, "")
+	xscService, err := CreateXscService(serverDetails)
 	if err != nil {
 		return nil, err
 	}

utils/xsc/errorreport.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-security/utils/xray"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/jfrog/jfrog-client-go/xsc"
@@ -18,7 +19,7 @@ func ReportError(xrayVersion, xscVersion string, serverDetails *config.ServerDet
 		return nil
 	}
 	log.Debug("Sending an error report to JFrog analytics...")
-	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serverDetails, projectKey)
+	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serverDetails, xray.WithScopedProjectKey(projectKey))
 	if err != nil {
 		return fmt.Errorf("failed to create an HTTP client: %s.\nReporting to JFrog analytics is skipped", err.Error())
 	}

utils/xsc/xscmanager.go

@@ -14,15 +14,15 @@ import (
 
 const MinXscVersionForErrorReport = "1.7.7"
 
-func CreateXscServiceBackwardCompatible(xrayVersion string, serviceDetails *config.ServerDetails, projectKey string) (xsc.XscService, error) {
+func CreateXscServiceBackwardCompatible(xrayVersion string, serviceDetails *config.ServerDetails, options ...xray.XrayManagerOption) (xsc.XscService, error) {
 	if xscservicesutils.IsXscXrayInnerService(xrayVersion) {
-		return CreateXscService(serviceDetails, projectKey)
+		return CreateXscService(serviceDetails, options...)
 	}
 	return createDeprecatedXscServiceManager(serviceDetails)
 }
 
-func CreateXscService(serviceDetails *config.ServerDetails, projectKey string) (*xscservices.XscInnerService, error) {
-	xrayManager, err := xray.CreateXrayServiceManager(serviceDetails, xray.WithScopedProjectKey(projectKey))
+func CreateXscService(serviceDetails *config.ServerDetails, options ...xray.XrayManagerOption) (*xscservices.XscInnerService, error) {
+	xrayManager, err := xray.CreateXrayServiceManager(serviceDetails, options...)
 	if err != nil {
 		return nil, err
 	}
@@ -60,7 +60,7 @@ func GetJfrogServicesVersion(serverDetails *config.ServerDetails) (xrayVersion,
 	}
 	log.Debug("Xray version: " + xrayVersion)
 	// We can pass an empty projectKey here as this API call does not require permissions and is not scoped under a specific project
-	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serverDetails, "")
+	xscService, err := CreateXscServiceBackwardCompatible(xrayVersion, serverDetails)
 	if err != nil {
 		return
 	}