Skip to content

Commit 735468f

Browse files
Updated artifactory version (#3293)
* Updated artifactory version
1 parent cf05364 commit 735468f

File tree

3 files changed

+73
-13
lines changed

3 files changed

+73
-13
lines changed

go.mod

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ require (
1616
github.com/docker/docker v28.5.2+incompatible
1717
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
1818
github.com/jfrog/archiver/v3 v3.6.1
19-
github.com/jfrog/build-info-go v1.13.0
19+
github.com/jfrog/build-info-go v1.13.1-0.20251230063402-e9f0a3564df1
2020
github.com/jfrog/gofrog v1.7.6
2121
github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f
22-
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251224081136-c963f7963aa1
22+
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7
2323
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251
2424
github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0
2525
github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e
2626
github.com/jfrog/jfrog-cli-security v1.24.1
27-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251224075603-b50939a87fa6
27+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23
2828
github.com/jszwec/csvutil v1.10.0
2929
github.com/manifoldco/promptui v0.9.0
3030
github.com/spf13/viper v1.21.0
@@ -282,10 +282,6 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl
282282

283283
replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab
284284

285-
//replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251210184507-0c8d138690cb
286-
287-
//replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215
288-
289285
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/reshmifrog/jfrog-cli-core/v2 v2.58.5-0.20251110095124-ab9a4102ec5a
290286

291287
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20251104113958-abd9de5958c4

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,8 +1204,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP
12041204
github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=
12051205
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
12061206
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
1207-
github.com/jfrog/build-info-go v1.13.0 h1:bHedp1Gl+a8eR71xxP5JvkqwDj2X3r6e5NiIwNcIwRM=
1208-
github.com/jfrog/build-info-go v1.13.0/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
1207+
github.com/jfrog/build-info-go v1.13.1-0.20251230063402-e9f0a3564df1 h1:ZT/hph6QcpTi9Fam9MJiouJ6g0H8Hx9p2Mnah2zPnks=
1208+
github.com/jfrog/build-info-go v1.13.1-0.20251230063402-e9f0a3564df1/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
12091209
github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ=
12101210
github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
12111211
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=
@@ -1216,8 +1216,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL
12161216
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
12171217
github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f h1:YHwPNF13Gmt65J618kEGn/4SGewXqyYuAdcyYWYdrBA=
12181218
github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw=
1219-
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251224081136-c963f7963aa1 h1:bwS1qqLwr3+bVuvsClk/dWBAvPp31/rkwIqKdyDT2Hk=
1220-
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251224081136-c963f7963aa1/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk=
1219+
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7 h1:UzFwA39ZTvinCbNvhr9QooeZaF1NBMkxXdBYJwTrXcU=
1220+
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7/go.mod h1:T8BzK7jnojx74G/tFs6lTjvNjNO6ltdWaZmY0X0YOOI=
12211221
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251 h1:WTyDOaYJUwY6zQujZuL9JQ9Q9+QWj9p31tLb4bJnu4U=
12221222
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251/go.mod h1:REkU0OfnLYZbQIjD2Cg85DAVP0SRZuV/PxiDfCJiJOc=
12231223
github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug=
@@ -1226,8 +1226,8 @@ github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b000
12261226
github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e/go.mod h1:qbu4iqBST9x8LgD8HhzUm91iOB3vHqtoGmaxOnmw0ok=
12271227
github.com/jfrog/jfrog-cli-security v1.24.1 h1:NF8SE9uzUgqvqYjuuqbduXBqj+fwE4CmkMeVKtcLkyI=
12281228
github.com/jfrog/jfrog-cli-security v1.24.1/go.mod h1:3FXD5IkKtdQOm9CZk6cR7q0iC6PaGMnjqzZqRcQp2r0=
1229-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251224075603-b50939a87fa6 h1:vn7xCygFmL2etGiKnW+aDKCx6cSg1qgC0iaTSBX1kbA=
1230-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251224075603-b50939a87fa6/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U=
1229+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23 h1:tL4NUrnSiFN6MeK27z96ehiKXhYZDY2DyH95ogNRHrY=
1230+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U=
12311231
github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
12321232
github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
12331233
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY=

pip_test.go

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"strings"
1212
"testing"
1313

14+
pythoncmd "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python"
1415
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
1516

1617
biutils "github.com/jfrog/build-info-go/utils"
@@ -595,6 +596,69 @@ func validateBuildTimestampProperty(properties map[string][]string, moduleType b
595596
return nil
596597
}
597598

599+
func TestCreateAqlQueryForSearchBySHA256(t *testing.T) {
600+
tests := []struct {
601+
name string
602+
repo string
603+
sha256s []string
604+
expected string
605+
}{
606+
{
607+
name: "single SHA256",
608+
repo: "pypi-local",
609+
sha256s: []string{"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"},
610+
expected: `{"repo": "pypi-local","$or": [{"sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}]}`,
611+
},
612+
{
613+
name: "multiple SHA256s",
614+
repo: "pypi-local",
615+
sha256s: []string{
616+
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
617+
"a1b2c3d4e5f6789012345678901234567890abcdef1234567890abcdef123456",
618+
"f6e5d4c3b2a1098765432109876543210987654321098765432109876543210987",
619+
},
620+
expected: `{"repo": "pypi-local","$or": [{"sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"},{"sha256": "a1b2c3d4e5f6789012345678901234567890abcdef1234567890abcdef123456"},{"sha256": "f6e5d4c3b2a1098765432109876543210987654321098765432109876543210987"}]}`,
621+
},
622+
{
623+
name: "empty SHA256s",
624+
repo: "pypi-local",
625+
sha256s: []string{},
626+
expected: `{"repo": "pypi-local","$or": []}`,
627+
},
628+
{
629+
name: "different repository",
630+
repo: "maven-local",
631+
sha256s: []string{"abc123def456"},
632+
expected: `{"repo": "maven-local","$or": [{"sha256": "abc123def456"}]}`,
633+
},
634+
}
635+
636+
for _, tt := range tests {
637+
t.Run(tt.name, func(t *testing.T) {
638+
result := pythoncmd.CreateAqlQueryForSearchBySHA256(tt.repo, tt.sha256s)
639+
assert.Equal(t, tt.expected, result)
640+
641+
// Verify it's valid JSON
642+
var jsonObj map[string]interface{}
643+
err := json.Unmarshal([]byte(result), &jsonObj)
644+
assert.NoError(t, err, "Generated query should be valid JSON")
645+
assert.Equal(t, tt.repo, jsonObj["repo"], "Repository should match")
646+
647+
// Verify $or array exists and has correct structure
648+
orArray, ok := jsonObj["$or"].([]interface{})
649+
assert.True(t, ok, "$or should be an array")
650+
assert.Equal(t, len(tt.sha256s), len(orArray), "Number of SHA256 conditions should match")
651+
652+
// Verify each SHA256 condition
653+
for i, sha256 := range tt.sha256s {
654+
condition, ok := orArray[i].(map[string]interface{})
655+
assert.True(t, ok, "Each condition should be an object")
656+
assert.Equal(t, sha256, condition["sha256"], "SHA256 value should match")
657+
}
658+
})
659+
}
660+
}
661+
598662
func TestSetupPipCommand(t *testing.T) {
599663
if !*tests.TestPip {
600664
t.Skip("Skipping Pip test. To run Pip test add the '-test.pip=true' option.")

0 commit comments

Comments
 (0)