diff --git a/go.mod b/go.mod index 206fd756d..f4bb9ef08 100644 --- a/go.mod +++ b/go.mod @@ -114,7 +114,7 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250629142537-bb24db402fe1 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250707095624-7062538a0961 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250611113558-c1a092f216fd diff --git a/go.sum b/go.sum index 35abcfe83..9cba01676 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/jfrog/build-info-go v1.10.14 h1:PWnw+rBwiQTHZ5q+84+E8MHFjtAQkB3+Oc2sK github.com/jfrog/build-info-go v1.10.14/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= -github.com/jfrog/jfrog-client-go v1.28.1-0.20250629142537-bb24db402fe1 h1:0t6dQHoalUDNVrfZujD3iCmDGLDl+ndHclFkmONSpq0= -github.com/jfrog/jfrog-client-go v1.28.1-0.20250629142537-bb24db402fe1/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= +github.com/jfrog/jfrog-client-go v1.28.1-0.20250707095624-7062538a0961 h1:JI3qV665s4RlvQ3K4t7yXJ8hqvfFF4TVRwmaOF4zCls= +github.com/jfrog/jfrog-client-go v1.28.1-0.20250707095624-7062538a0961/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= diff --git a/utils/config/config.go b/utils/config/config.go index 292b7d51e..d059c5d54 100644 --- a/utils/config/config.go +++ b/utils/config/config.go @@ -17,6 +17,7 @@ import ( accessAuth "github.com/jfrog/jfrog-client-go/access/auth" artifactoryAuth "github.com/jfrog/jfrog-client-go/artifactory/auth" "github.com/jfrog/jfrog-client-go/auth" + catalogAuth "github.com/jfrog/jfrog-client-go/catalog/auth" distributionAuth "github.com/jfrog/jfrog-client-go/distribution/auth" evidenceAuth "github.com/jfrog/jfrog-client-go/evidence/auth" lifecycleAuth "github.com/jfrog/jfrog-client-go/lifecycle/auth" @@ -578,6 +579,7 @@ type ServerDetails struct { DistributionUrl string `json:"distributionUrl,omitempty"` XrayUrl string `json:"xrayUrl,omitempty"` XscUrl string `json:"xscUrl,omitempty"` + CatalogUrl string `json:"catalogUrl,omitempty"` MissionControlUrl string `json:"missionControlUrl,omitempty"` PipelinesUrl string `json:"pipelinesUrl,omitempty"` AccessUrl string `json:"accessUrl,omitempty"` @@ -659,6 +661,10 @@ func (serverDetails *ServerDetails) GetXrayUrl() string { return serverDetails.XrayUrl } +func (serverDetails *ServerDetails) GetCatalogUrl() string { + return serverDetails.CatalogUrl +} + func (serverDetails *ServerDetails) GetMissionControlUrl() string { return serverDetails.MissionControlUrl } @@ -729,6 +735,12 @@ func (serverDetails *ServerDetails) CreateXrayAuthConfig() (auth.ServiceDetails, return serverDetails.createAuthConfig(artAuth) } +func (serverDetails *ServerDetails) CreateCatalogAuthConfig() (auth.ServiceDetails, error) { + catAuth := catalogAuth.NewCatalogDetails() + catAuth.SetUrl(utils.AddTrailingSlashIfNeeded(serverDetails.Url) + "catalog/") + return serverDetails.createAuthConfig(catAuth) +} + func (serverDetails *ServerDetails) CreateXscAuthConfig() (auth.ServiceDetails, error) { ascAuth := xscAuth.NewXscDetails() ascAuth.SetUrl(serverDetails.convertXrayUrlToXscUrl())