Skip to content

Commit b02704f

Browse files
authored
add support for onemodel (#1399)
1 parent ac37f80 commit b02704f

File tree

4 files changed

+38
-1
lines changed

4 files changed

+38
-1
lines changed

artifactory/utils/utils.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"github.com/jfrog/jfrog-client-go/jfconnect"
3030
"github.com/jfrog/jfrog-client-go/lifecycle"
3131
"github.com/jfrog/jfrog-client-go/metadata"
32+
"github.com/jfrog/jfrog-client-go/onemodel"
3233
clientUtils "github.com/jfrog/jfrog-client-go/utils"
3334
"github.com/jfrog/jfrog-client-go/utils/errorutils"
3435
ioUtils "github.com/jfrog/jfrog-client-go/utils/io"
@@ -263,6 +264,27 @@ func CreateMetadataServiceManager(serviceDetails *config.ServerDetails, isDryRun
263264
return metadata.NewManager(serviceConfig)
264265
}
265266

267+
func CreateOnemodelServiceManager(serviceDetails *config.ServerDetails, isDryRun bool) (onemodel.Manager, error) {
268+
certsPath, err := coreutils.GetJfrogCertsDir()
269+
if err != nil {
270+
return nil, err
271+
}
272+
mdAuth, err := serviceDetails.CreateOnemodelAuthConfig()
273+
if err != nil {
274+
return nil, err
275+
}
276+
serviceConfig, err := clientConfig.NewConfigBuilder().
277+
SetServiceDetails(mdAuth).
278+
SetCertificatesPath(certsPath).
279+
SetInsecureTls(serviceDetails.InsecureTls).
280+
SetDryRun(isDryRun).
281+
Build()
282+
if err != nil {
283+
return nil, err
284+
}
285+
return onemodel.NewManager(serviceConfig)
286+
}
287+
266288
func CreateJfConnectServiceManager(serverDetails *config.ServerDetails, httpRetries, httpRetryWaitMilliSecs int) (jfconnect.Manager, error) {
267289
certsPath, err := coreutils.GetJfrogCertsDir()
268290
if err != nil {

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ require (
114114
sigs.k8s.io/yaml v1.4.0 // indirect
115115
)
116116

117-
replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20250609120801-376c534a4738
117+
118+
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba
118119

119120
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250226091544-c803cbbc5495
120121

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ github.com/jfrog/build-info-go v1.10.12 h1:KO/YUeKYtDrnpcmsXmwqr6akjzrwA0hSTUB+O
115115
github.com/jfrog/build-info-go v1.10.12/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
116116
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
117117
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
118+
github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba h1:smT4W847Vu3g7bktbQjMQhn2DQVZrzgORj7kfuh4Fnk=
119+
github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw=
118120
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
119121
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
120122
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

utils/config/config.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
evidenceAuth "github.com/jfrog/jfrog-client-go/evidence/auth"
2222
lifecycleAuth "github.com/jfrog/jfrog-client-go/lifecycle/auth"
2323
metadataAuth "github.com/jfrog/jfrog-client-go/metadata/auth"
24+
onemodelAuth "github.com/jfrog/jfrog-client-go/onemodel/auth"
2425
pipelinesAuth "github.com/jfrog/jfrog-client-go/pipelines/auth"
2526
"github.com/jfrog/jfrog-client-go/utils"
2627
"github.com/jfrog/jfrog-client-go/utils/errorutils"
@@ -583,6 +584,7 @@ type ServerDetails struct {
583584
LifecycleUrl string `json:"-"`
584585
EvidenceUrl string `json:"-"`
585586
MetadataUrl string `json:"-"`
587+
OnemodelUrl string `json:"-"`
586588
User string `json:"user,omitempty"`
587589
Password string `json:"password,omitempty"`
588590
SshKeyPath string `json:"sshKeyPath,omitempty"`
@@ -681,6 +683,10 @@ func (serverDetails *ServerDetails) GetMetadataUrl() string {
681683
return serverDetails.MetadataUrl
682684
}
683685

686+
func (serverDetails *ServerDetails) GetOnemodelUrl() string {
687+
return serverDetails.OnemodelUrl
688+
}
689+
684690
func (serverDetails *ServerDetails) GetUser() string {
685691
return serverDetails.User
686692
}
@@ -772,6 +778,12 @@ func (serverDetails *ServerDetails) CreateMetadataAuthConfig() (auth.ServiceDeta
772778
return serverDetails.createAuthConfig(mdAuth)
773779
}
774780

781+
func (serverDetails *ServerDetails) CreateOnemodelAuthConfig() (auth.ServiceDetails, error) {
782+
omAuth := onemodelAuth.NewOnemodelDetails()
783+
omAuth.SetUrl(serverDetails.OnemodelUrl)
784+
return serverDetails.createAuthConfig(omAuth)
785+
}
786+
775787
func (serverDetails *ServerDetails) createAuthConfig(details auth.ServiceDetails) (auth.ServiceDetails, error) {
776788
details.SetSshUrl(serverDetails.SshUrl)
777789
details.SetAccessToken(serverDetails.AccessToken)

0 commit comments

Comments
 (0)