From ff916d6928302fa6c68e8be23024ddc3873e4bb2 Mon Sep 17 00:00:00 2001 From: gail Date: Mon, 1 Apr 2024 17:17:58 +0300 Subject: [PATCH] Minor fix. --- go.mod | 2 +- go.sum | 4 ++-- utils/config/config.go | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index c4536a1e2..33165b700 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-client-go => github.com/gailazar300/jfrog-client-go v0.18.1-0.20240331091256-e2e7cd419323 +replace github.com/jfrog/jfrog-client-go => github.com/gailazar300/jfrog-client-go v0.18.1-0.20240401141433-9b8da01b5758 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240319160313-0093dee91fc1 diff --git a/go.sum b/go.sum index e12cd396d..3091db23a 100644 --- a/go.sum +++ b/go.sum @@ -54,8 +54,8 @@ github.com/forPelevin/gomoji v1.2.0/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/gailazar300/jfrog-client-go v0.18.1-0.20240331091256-e2e7cd419323 h1:s1bOQdculuurDa2BjMRYG3Q+Lz12YMuyc09XRPbTWyo= -github.com/gailazar300/jfrog-client-go v0.18.1-0.20240331091256-e2e7cd419323/go.mod h1:tUyEmxznphh0nwAGo6xz9Sps7RRW/TBMxIJZteo+j2k= +github.com/gailazar300/jfrog-client-go v0.18.1-0.20240401141433-9b8da01b5758 h1:NYb4hSqMXCwyvlHVasfvVfuHL9NVzmFHom4cJIvviBc= +github.com/gailazar300/jfrog-client-go v0.18.1-0.20240401141433-9b8da01b5758/go.mod h1:tUyEmxznphh0nwAGo6xz9Sps7RRW/TBMxIJZteo+j2k= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= diff --git a/utils/config/config.go b/utils/config/config.go index 7ebef8216..2a073da63 100644 --- a/utils/config/config.go +++ b/utils/config/config.go @@ -573,6 +573,7 @@ type ServerDetails struct { ArtifactoryUrl string `json:"artifactoryUrl,omitempty"` DistributionUrl string `json:"distributionUrl,omitempty"` XrayUrl string `json:"xrayUrl,omitempty"` + XscUrl string `json:"xscUrl,omitempty"` MissionControlUrl string `json:"missionControlUrl,omitempty"` PipelinesUrl string `json:"pipelinesUrl,omitempty"` AccessUrl string `json:"accessUrl,omitempty"` @@ -718,8 +719,8 @@ func (serverDetails *ServerDetails) CreateXscAuthConfig() (auth.ServiceDetails, // Xray and Xsc will always have the same platform url. func (serverDetails *ServerDetails) convertXrayUrlToXscUrl() string { xscUrl := strings.TrimSuffix(serverDetails.XrayUrl, "/") - xscUrl = strings.TrimSuffix(xscUrl, "xray") - return xscUrl + "xsc/" + xscUrl = strings.TrimSuffix(xscUrl, "/xray") + return xscUrl + "/xsc/" } func (serverDetails *ServerDetails) CreatePipelinesAuthConfig() (auth.ServiceDetails, error) {