diff --git a/go.mod b/go.mod index 206fd756d..eb530b855 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/eranturgeman/jfrog-client-go v0.0.0-20250702124746-524e5e2eec7f // 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..1b9f60b73 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/eranturgeman/jfrog-client-go v0.0.0-20250702124746-524e5e2eec7f h1:iDmYR8j+b8xmcLGYXjmD3O6EZGJhhMLtCzVywa+bIWM= +github.com/eranturgeman/jfrog-client-go v0.0.0-20250702124746-524e5e2eec7f/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= github.com/forPelevin/gomoji v1.3.0 h1:WPIOLWB1bvRYlKZnSSEevLt3IfKlLs+tK+YA9fFYlkE= github.com/forPelevin/gomoji v1.3.0/go.mod h1:mM6GtmCgpoQP2usDArc6GjbXrti5+FffolyQfGgPboQ= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= @@ -113,8 +115,6 @@ 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/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..cec5ef2eb 100644 --- a/utils/config/config.go +++ b/utils/config/config.go @@ -15,6 +15,7 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" cliLog "github.com/jfrog/jfrog-cli-core/v2/utils/log" accessAuth "github.com/jfrog/jfrog-client-go/access/auth" + apptrustAuth "github.com/jfrog/jfrog-client-go/apptrust/auth" artifactoryAuth "github.com/jfrog/jfrog-client-go/artifactory/auth" "github.com/jfrog/jfrog-client-go/auth" distributionAuth "github.com/jfrog/jfrog-client-go/distribution/auth" @@ -735,6 +736,12 @@ func (serverDetails *ServerDetails) CreateXscAuthConfig() (auth.ServiceDetails, return serverDetails.createAuthConfig(ascAuth) } +func (serverDetails *ServerDetails) CreateApptrustAuthConfig() (auth.ServiceDetails, error) { + atAuth := apptrustAuth.NewXscDetails() + atAuth.SetUrl(serverDetails.Url) + return serverDetails.createAuthConfig(atAuth) +} + // Xray and Xsc will always have the same platform url. func (serverDetails *ServerDetails) convertXrayUrlToXscUrl() string { xscUrl := strings.TrimSuffix(serverDetails.XrayUrl, "/")