Skip to content

Commit f58a87c

Browse files
eranturgemaneranturgeman
committed
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-security into fix-project-key-query-param-passing
# Conflicts: # go.mod # go.sum
2 parents 7e1a393 + a7b6429 commit f58a87c

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ require (
1515
github.com/jfrog/froggit-go v1.20.3
1616
github.com/jfrog/gofrog v1.7.6
1717
github.com/jfrog/jfrog-apps-config v1.0.1
18-
github.com/jfrog/jfrog-cli-artifactory v0.7.2
19-
github.com/jfrog/jfrog-cli-core/v2 v2.60.0
20-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251008045603-4ca43b3f3d45
18+
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251017072454-f83a03ee98d6
19+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251015045218-1a38c9e47097
20+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251015041910-ef0fe832b111
2121
github.com/magiconair/properties v1.8.10
2222
github.com/owenrumney/go-sarif/v3 v3.2.3
2323
github.com/package-url/packageurl-go v0.1.3
@@ -113,22 +113,22 @@ require (
113113
golang.org/x/crypto v0.43.0 // indirect
114114
golang.org/x/mod v0.28.0 // indirect
115115
golang.org/x/net v0.45.0 // indirect
116-
golang.org/x/oauth2 v0.30.0 // indirect
116+
golang.org/x/oauth2 v0.31.0 // indirect
117117
golang.org/x/sys v0.37.0 // indirect
118118
golang.org/x/term v0.36.0 // indirect
119119
golang.org/x/time v0.12.0 // indirect
120120
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
121121
google.golang.org/grpc v1.67.3 // indirect
122-
google.golang.org/protobuf v1.36.6 // indirect
122+
google.golang.org/protobuf v1.36.8 // indirect
123123
gopkg.in/ini.v1 v1.67.0 // indirect
124124
gopkg.in/warnings.v0 v0.1.2 // indirect
125125
)
126126

127-
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go master
127+
// replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go master
128128

129129
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 master
130130

131-
// replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory main
131+
//replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20251017061455-6a03988302bf
132132

133133
// replace github.com/jfrog/build-info-go => github.com/attiasas/build-info-go dev
134134

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
136136
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
137137
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
138138
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
139-
github.com/jfrog/jfrog-cli-artifactory v0.7.2 h1:0NHFyZqRYjorC29eb/TXY/+kGyulOmVi6pl7UuDo2jY=
140-
github.com/jfrog/jfrog-cli-artifactory v0.7.2/go.mod h1:L7PaWYxjWvYiPIecd92YAEWbVSYq4CW9kq1dhbwjehU=
141-
github.com/jfrog/jfrog-cli-core/v2 v2.60.0 h1:PsxCX5xZZl50psOORpehMP2P47We9xjocva0KRrUxew=
142-
github.com/jfrog/jfrog-cli-core/v2 v2.60.0/go.mod h1:h52WS70v79WLNUAMIsDGURPvAdLRrrUCLyjsj32GORo=
143-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251008045603-4ca43b3f3d45 h1:8NcEHGwal5iyVqpNoKsltTW6h1b9yyN/c49XA0OoBtc=
144-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251008045603-4ca43b3f3d45/go.mod h1:E2s23qRRDdyPdzSYG1irPOEpjJ6kXvhV1U4g/0rG93k=
139+
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251017072454-f83a03ee98d6 h1:k+L1EByW0oAjbl2GzBKpPjQ/V9HV/22WfXqR+opegnk=
140+
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251017072454-f83a03ee98d6/go.mod h1:nT050Wb18tTlfcQHefyMENzFOz9Vdym6WP0Z3Nc2qHc=
141+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251015045218-1a38c9e47097 h1:+W6BPxJ0nPtlQ6l6nmypW1eEANoVPiN8HDR4kQJA8uI=
142+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251015045218-1a38c9e47097/go.mod h1:UOeOwEEmRIi57cRwghN5OBVoqkJieYQQfLpeqw8Yv38=
143+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251015041910-ef0fe832b111 h1:IBkggQwQi7D4+vafA3f8aHSrgZ89bMdlMffmNQfjuLw=
144+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251015041910-ef0fe832b111/go.mod h1:jrODQbAbCt97F24d/0bYpqpdc0PFMuBxNJOTfTdW+Fk=
145145
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
146146
github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
147147
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
@@ -326,8 +326,8 @@ golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
326326
golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
327327
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
328328
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
329-
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
330-
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
329+
golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
330+
golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
331331
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
332332
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
333333
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -397,8 +397,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:
397397
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
398398
google.golang.org/grpc v1.67.3 h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8=
399399
google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s=
400-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
401-
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
400+
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
401+
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
402402
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
403403
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
404404
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎scans_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package main
33
import (
44
"encoding/json"
55
"fmt"
6+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
7+
"github.com/jfrog/jfrog-cli-artifactory/utils/tests"
68
"net/http"
79
"net/http/httptest"
810
"path"
@@ -24,7 +26,6 @@ import (
2426
"github.com/jfrog/jfrog-cli-security/utils/jasutils"
2527

2628
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container"
27-
containerUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
2829

2930
"github.com/jfrog/jfrog-cli-core/v2/common/build"
3031
commonCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands"
@@ -272,12 +273,12 @@ func TestDockerScan(t *testing.T) {
272273
func runDockerScan(t *testing.T, testCli *coreTests.JfrogCli, imageName, watchName string, minViolations, minVulnerabilities, minLicenses int, minInactives int, validateSecrets bool) {
273274
// Pull image from docker repo
274275
imageTag := path.Join(*securityTests.ContainerRegistry, securityTests.DockerVirtualRepo, imageName)
275-
dockerPullCommand := container.NewPullCommand(containerUtils.DockerClient)
276+
dockerPullCommand := container.NewPullCommand(ocicontainer.DockerClient)
276277
dockerPullCommand.SetCmdParams([]string{"pull", imageTag}).SetImageTag(imageTag).SetRepo(securityTests.DockerVirtualRepo).SetServerDetails(securityTests.XrDetails).SetBuildConfiguration(new(build.BuildConfiguration))
277278
if !assert.NoError(t, dockerPullCommand.Run()) {
278279
return
279280
}
280-
defer commonTests.DeleteTestImage(t, imageTag, containerUtils.DockerClient)
281+
defer tests.DeleteTestImage(t, imageTag, ocicontainer.DockerClient)
281282
// Run docker scan on image
282283
cmdArgs := []string{"docker", "scan", imageTag, "--server-id=default", "--licenses", "--fail=false", "--min-severity=low", "--fixable-only"}
283284
if validateSecrets {
@@ -318,10 +319,10 @@ func TestAdvancedSecurityDockerScan(t *testing.T) {
318319
func runAdvancedSecurityDockerScan(t *testing.T, testCli *coreTests.JfrogCli, imageName string) {
319320
// Pull image from docker repo
320321
imageTag := path.Join(*securityTests.ContainerRegistry, securityTests.DockerVirtualRepo, imageName)
321-
dockerPullCommand := container.NewPullCommand(containerUtils.DockerClient)
322+
dockerPullCommand := container.NewPullCommand(ocicontainer.DockerClient)
322323
dockerPullCommand.SetCmdParams([]string{"pull", imageTag}).SetImageTag(imageTag).SetRepo(securityTests.DockerVirtualRepo).SetServerDetails(securityTests.XrDetails).SetBuildConfiguration(new(build.BuildConfiguration))
323324
if assert.NoError(t, dockerPullCommand.Run()) {
324-
defer commonTests.DeleteTestImage(t, imageTag, containerUtils.DockerClient)
325+
defer tests.DeleteTestImage(t, imageTag, ocicontainer.DockerClient)
325326
args := []string{"docker", "scan", imageTag, "--server-id=default", "--format=simple-json", "--fail=false", "--min-severity=low", "--fixable-only"}
326327

327328
// Run docker scan on image

0 commit comments

Comments
 (0)