Handle XSC/XRAY url provided from flags and config.

jfrog · Aug 17, 2023 · feaf222 · feaf222
1 parent 718c0c2
commit feaf222
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go
@@ -364,6 +364,7 @@ func ShouldOfferConfig() (bool, error) {
 func CreateServerDetailsFromFlags(c *cli.Context) (details *coreConfig.ServerDetails, err error) {
 	details = new(coreConfig.ServerDetails)
 	details.Url = clientutils.AddTrailingSlashIfNeeded(c.String(url))
+	details.XscUrl = clientutils.GenerateXscUrl(details.Url)
 	details.ArtifactoryUrl = clientutils.AddTrailingSlashIfNeeded(c.String(configRtUrl))
 	details.DistributionUrl = clientutils.AddTrailingSlashIfNeeded(c.String(configDistUrl))
 	details.XrayUrl = clientutils.AddTrailingSlashIfNeeded(c.String(configXrUrl))
@@ -506,6 +507,7 @@ func CreateServerDetailsWithConfigOffer(c *cli.Context, excludeRefreshableTokens
 	// Take insecureTls value from options since it is not saved in config.
 	confDetails.InsecureTls = details.InsecureTls
 	confDetails.Url = clientutils.AddTrailingSlashIfNeeded(confDetails.Url)
+	confDetails.XscUrl = clientutils.AddTrailingSlashIfNeeded(confDetails.Url + coreConfig.XscServiceAPI)
 	confDetails.DistributionUrl = clientutils.AddTrailingSlashIfNeeded(confDetails.DistributionUrl)
 
 	// Create initial access token if needed.

diff --git a/utils/tests/utils.go b/utils/tests/utils.go
@@ -36,7 +36,6 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
-	"github.com/jfrog/jfrog-client-go/utils/tests"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -78,12 +77,12 @@ var (
 )
 
 func init() {
-	JfrogUrl = flag.String("jfrog.url", "http://localhost:8081/", "JFrog platform url")
+	JfrogUrl = flag.String("jfrog.url", "https://xsceco1308.jfrogdev.org/", "JFrog platform url")
 	JfrogUser = flag.String("jfrog.user", "admin", "JFrog platform  username")
 	JfrogPassword = flag.String("jfrog.password", "password", "JFrog platform password")
 	JfrogSshKeyPath = flag.String("jfrog.sshKeyPath", "", "Ssh key file path")
 	JfrogSshPassphrase = flag.String("jfrog.sshPassphrase", "", "Ssh key passphrase")
-	JfrogAccessToken = flag.String("jfrog.adminToken", tests.GetLocalArtifactoryTokenIfNeeded(*JfrogUrl), "JFrog platform admin token")
+	JfrogAccessToken = flag.String("jfrog.adminToken", "cmVmdGtuOjAxOjE3MjM0NjcxODU6NmRwYUZhY2k2QUdOUmdoYmtzMTJ1TmNOc1pC", "JFrog platform admin token")
 	JfrogTargetUrl = flag.String("jfrog.targetUrl", "", "JFrog target platform url for transfer tests")
 	JfrogTargetAccessToken = flag.String("jfrog.targetAdminToken", "", "JFrog target platform admin token for transfer tests")
 	JfrogHome = flag.String("jfrog.home", "", "The JFrog home directory of the local Artifactory installation")
@@ -103,7 +102,7 @@ func init() {
 	TestPipenv = flag.Bool("test.pipenv", false, "Test Pipenv")
 	TestPoetry = flag.Bool("test.poetry", false, "Test Poetry")
 	TestPlugins = flag.Bool("test.plugins", false, "Test Plugins")
-	TestXray = flag.Bool("test.xray", false, "Test Xray")
+	TestXray = flag.Bool("test.xray", true, "Test Xray")
 	TestAccess = flag.Bool("test.access", false, "Test Access")
 	TestTransfer = flag.Bool("test.transfer", false, "Test files transfer")
 	TestLifecycle = flag.Bool("test.lc", false, "Test lifecycle")