Skip to content

Commit 63955c0

Browse files
committed
evaluate and unified policy managers
1 parent 69335da commit 63955c0

File tree

6 files changed

+90
-4
lines changed

6 files changed

+90
-4
lines changed

go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,11 @@ require (
113113
)
114114

115115
replace github.com/jfrog/jfrog-client-go => github.com/orto17/jfrog-client-go v0.0.0-20250105135705-d0d16a2c04fa
116+
replace github.com/jfrog/jfrog-client-go => ../jfrog-client-go
117+
116118

117119
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/orto17/jfrog-cli-core/v2 v2.0.0-20250106064835-4987fc040d3d
120+
replace github.com/jfrog/jfrog-cli-core/v2 => ../jfrog-cli-core
118121

119122
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
120123

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
127127
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
128128
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
129129
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
130-
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250101110857-b26e9a6644c6/go.mod h1:LfKvCRXbvwgE0V6aX3/GabkzCedghXq0Y6lmsEuxr44=
131-
github.com/jfrog/jfrog-client-go v1.28.1-0.20241230154616-e342ed5065f1/go.mod h1:2ySOMva54L3EYYIlCBYBTcTgqfrrQ19gtpA/MWfA/ec=
132130
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
133131
github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=
134132
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
@@ -184,8 +182,6 @@ github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9l
184182
github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
185183
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
186184
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
187-
github.com/orto17/jfrog-cli-core/v2 v2.0.0-20250106064835-4987fc040d3d/go.mod h1:LfKvCRXbvwgE0V6aX3/GabkzCedghXq0Y6lmsEuxr44=
188-
github.com/orto17/jfrog-client-go v0.0.0-20250105135705-d0d16a2c04fa/go.mod h1:2ySOMva54L3EYYIlCBYBTcTgqfrrQ19gtpA/MWfA/ec=
189185
github.com/owenrumney/go-sarif v1.1.1/go.mod h1:dNDiPlF04ESR/6fHlPyq7gHKmrM0sHUvAGjsoh8ZH0U=
190186
github.com/owenrumney/go-sarif/v2 v2.3.0 h1:wP5yEpI53zr0v5cBmagXzLbHZp9Oylyo3AJDpfLBITs=
191187
github.com/owenrumney/go-sarif/v2 v2.3.0/go.mod h1:MSqMMx9WqlBSY7pXoOZWgEsVB4FDNfhcaXDA1j6Sr+w=
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package application
2+
3+
import (
4+
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
5+
"github.com/jfrog/jfrog-client-go/application"
6+
clientconfig "github.com/jfrog/jfrog-client-go/config"
7+
)
8+
9+
func CreateApplicationService(serviceDetails *config.ServerDetails) (*application.ApplicationServicesManager, error) {
10+
applicationDetails, err := serviceDetails.CreateApplicationAuthConfig()
11+
if err != nil {
12+
return nil, err
13+
}
14+
serviceConfig, err := clientconfig.NewConfigBuilder().
15+
SetServiceDetails(applicationDetails).
16+
SetInsecureTls(serviceDetails.InsecureTls).
17+
Build()
18+
if err != nil {
19+
return nil, err
20+
}
21+
return application.New(serviceConfig)
22+
}

utils/application/commitinfo.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package application
2+
3+
import (
4+
"fmt"
5+
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
6+
"github.com/jfrog/jfrog-client-go/application/services"
7+
"github.com/jfrog/jfrog-client-go/utils/log"
8+
)
9+
10+
func SendCommitInfo(applicationKey string, serviceDetails *config.ServerDetails, commitInfo services.CreateApplicationCommitInfo) (err error) {
11+
applicationService, err := CreateApplicationService(serviceDetails)
12+
if err != nil {
13+
log.Debug(fmt.Sprintf("failed to create application manager for commit info service, error: %s ", err.Error()))
14+
return
15+
}
16+
if err = applicationService.AddCommitInfo(commitInfo, applicationKey); err != nil {
17+
log.Debug(fmt.Sprintf("failed sending commit info request to application service, error: %s ", err.Error()))
18+
return
19+
}
20+
return
21+
}

utils/unifiedpolicy/evaluate.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package unifiedpolicy
2+
3+
import (
4+
"fmt"
5+
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
6+
"github.com/jfrog/jfrog-client-go/unifiedpolicy/services"
7+
"github.com/jfrog/jfrog-client-go/utils/log"
8+
)
9+
10+
func Evaluate(serviceDetails *config.ServerDetails, evaluateRequest *services.EvaluateRequest) (resp *services.EvaluateResponse, err error) {
11+
evaluateService, err := CreateUnifiedPolicyService(serviceDetails)
12+
if err != nil {
13+
log.Debug(fmt.Sprintf("failed to create unified policy manager for evaluate service, error: %s ", err.Error()))
14+
return
15+
}
16+
resp, err = evaluateService.Evaluate(evaluateRequest)
17+
if err != nil {
18+
log.Debug(fmt.Sprintf("failed sending evaluate request to unified policy, error: %s ", err.Error()))
19+
return
20+
}
21+
return
22+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package unifiedpolicy
2+
3+
import (
4+
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
5+
clientconfig "github.com/jfrog/jfrog-client-go/config"
6+
"github.com/jfrog/jfrog-client-go/unifiedpolicy"
7+
)
8+
9+
func CreateUnifiedPolicyService(serviceDetails *config.ServerDetails) (*unifiedpolicy.UnifiedPolicyServicesManager, error) {
10+
unifiedPolicyDetails, err := serviceDetails.CreateUnifiedPolicyAuthConfig()
11+
if err != nil {
12+
return nil, err
13+
}
14+
serviceConfig, err := clientconfig.NewConfigBuilder().
15+
SetServiceDetails(unifiedPolicyDetails).
16+
SetInsecureTls(serviceDetails.InsecureTls).
17+
Build()
18+
if err != nil {
19+
return nil, err
20+
}
21+
return unifiedpolicy.New(serviceConfig)
22+
}

0 commit comments

Comments
 (0)