Skip to content

Commit 817547d

Browse files
Merge remote-tracking branch 'origin/dev' into v2
2 parents f929f9f + 13ce583 commit 817547d

8 files changed

Lines changed: 60 additions & 33 deletions

File tree

artifactory_test.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,35 @@ func TestArtifactoryExcludeUpload(t *testing.T) {
194194
}
195195
}
196196

197+
func TestSearchWithBuildNameSpecialChars(t *testing.T) {
198+
initArtifactoryTest(t, "")
199+
defer cleanArtifactoryTest()
200+
201+
testCases := []struct {
202+
name string
203+
buildName string
204+
}{
205+
{"buildName with space", "my build"},
206+
{"buildName with special chars", "my-build with#special@chars"},
207+
{"buildName with colon", "build:with:colon"},
208+
{"buildName with spaces and colons", "build :: with :: colon"},
209+
}
210+
211+
for _, tc := range testCases {
212+
t.Run(tc.name, func(t *testing.T) {
213+
buildNumber := "1"
214+
artifactPath := filepath.Join("testdata", "a", "a1.in")
215+
216+
runRt(t, "upload", artifactPath, tests.RtRepo1, "--build-name="+tc.buildName, "--build-number="+buildNumber)
217+
runRt(t, "build-publish", tc.buildName, buildNumber)
218+
219+
searchCmd := []string{"search", "--build=" + tc.buildName}
220+
err := artifactoryCli.Exec(searchCmd...)
221+
assert.NoError(t, err)
222+
})
223+
}
224+
}
225+
197226
func TestArtifactorySimpleUploadWithWildcardSpec(t *testing.T) {
198227
initArtifactoryTest(t, "")
199228
// Init tmp dir

build/npm/v2-jf/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2-jf/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2-jf",
3-
"version": "2.78.3",
3+
"version": "2.78.4",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

build/npm/v2/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2",
3-
"version": "2.78.3",
3+
"version": "2.78.4",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

go.mod

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/jfrog/jfrog-cli
22

3-
go 1.24.5
4-
5-
toolchain go1.24.6
3+
go 1.24.6
64

75
replace (
86
// Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372)
@@ -18,13 +16,13 @@ require (
1816
github.com/docker/docker v27.5.1+incompatible
1917
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
2018
github.com/jfrog/archiver/v3 v3.6.1
21-
github.com/jfrog/build-info-go v1.10.15
19+
github.com/jfrog/build-info-go v1.10.16
2220
github.com/jfrog/gofrog v1.7.6
23-
github.com/jfrog/jfrog-cli-artifactory v0.6.0
24-
github.com/jfrog/jfrog-cli-core/v2 v2.59.4
21+
github.com/jfrog/jfrog-cli-artifactory v0.6.2
22+
github.com/jfrog/jfrog-cli-core/v2 v2.59.5
2523
github.com/jfrog/jfrog-cli-platform-services v1.10.0
26-
github.com/jfrog/jfrog-cli-security v1.21.0
27-
github.com/jfrog/jfrog-client-go v1.54.4
24+
github.com/jfrog/jfrog-cli-security v1.21.2
25+
github.com/jfrog/jfrog-client-go v1.54.5
2826
github.com/jszwec/csvutil v1.10.0
2927
github.com/manifoldco/promptui v0.9.0
3028
github.com/stretchr/testify v1.10.0
@@ -102,7 +100,7 @@ require (
102100
github.com/google/certificate-transparency-go v1.3.2 // indirect
103101
github.com/google/go-containerregistry v0.20.3 // indirect
104102
github.com/google/go-github/v56 v56.0.0 // indirect
105-
github.com/google/go-github/v62 v62.0.0 // indirect
103+
github.com/google/go-github/v74 v74.0.0 // indirect
106104
github.com/google/go-querystring v1.1.0 // indirect
107105
github.com/google/gofuzz v1.2.0 // indirect
108106
github.com/google/uuid v1.6.0 // indirect
@@ -120,7 +118,7 @@ require (
120118
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
121119
github.com/jedib0t/go-pretty/v6 v6.6.5 // indirect
122120
github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b // indirect
123-
github.com/jfrog/froggit-go v1.20.1 // indirect
121+
github.com/jfrog/froggit-go v1.20.2 // indirect
124122
github.com/jfrog/go-mockhttp v0.3.1 // indirect
125123
github.com/jfrog/jfrog-apps-config v1.0.1 // indirect
126124
github.com/josharian/intern v1.0.0 // indirect
@@ -156,7 +154,7 @@ require (
156154
github.com/opencontainers/go-digest v1.0.0 // indirect
157155
github.com/opencontainers/image-spec v1.1.0 // indirect
158156
github.com/opentracing/opentracing-go v1.2.0 // indirect
159-
github.com/owenrumney/go-sarif/v3 v3.1.4 // indirect
157+
github.com/owenrumney/go-sarif/v3 v3.2.1 // indirect
160158
github.com/package-url/packageurl-go v0.1.3 // indirect
161159
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
162160
github.com/pierrec/lz4/v4 v4.1.22 // indirect
@@ -250,6 +248,6 @@ require (
250248

251249
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250804083101-9cf424ecc926
252250

253-
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250717041744-d3ea4d99f4e7
251+
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250812100044-b52afcc698c1
254252

255253
//replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.17.2-0.20250511132918-d9cc4cd50020

go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM
266266
github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
267267
github.com/google/go-github/v56 v56.0.0 h1:TysL7dMa/r7wsQi44BjqlwaHvwlFlqkK8CtBWCX3gb4=
268268
github.com/google/go-github/v56 v56.0.0/go.mod h1:D8cdcX98YWJvi7TLo7zM4/h8ZTx6u6fwGEkCdisopo0=
269-
github.com/google/go-github/v62 v62.0.0 h1:/6mGCaRywZz9MuHyw9gD1CwsbmBX8GWsbFkwMmHdhl4=
270-
github.com/google/go-github/v62 v62.0.0/go.mod h1:EMxeUqGJq2xRu9DYBMwel/mr7kZrzUOfQmmpYrZn2a4=
269+
github.com/google/go-github/v74 v74.0.0 h1:yZcddTUn8DPbj11GxnMrNiAnXH14gNs559AsUpNpPgM=
270+
github.com/google/go-github/v74 v74.0.0/go.mod h1:ubn/YdyftV80VPSI26nSJvaEsTOnsjrxG3o9kJhcyak=
271271
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
272272
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
273273
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -349,26 +349,26 @@ github.com/jellydator/ttlcache/v3 v3.3.0 h1:BdoC9cE81qXfrxeb9eoJi9dWrdhSuwXMAnHT
349349
github.com/jellydator/ttlcache/v3 v3.3.0/go.mod h1:bj2/e0l4jRnQdrnSTaGTsh4GSXvMjQcy41i7th0GVGw=
350350
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
351351
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
352-
github.com/jfrog/build-info-go v1.10.15 h1:y6E87iIBTofNy4mus6Ngv6AtVwg/bN/Rz+oaI3kpN4M=
353-
github.com/jfrog/build-info-go v1.10.15/go.mod h1:+8u1CEGrr8XY5a5U6farFW3EKYk0ge0BMGZE3BAZBcE=
354-
github.com/jfrog/froggit-go v1.20.1 h1:kMtnurz1S59KBQQ1NVdY3FvMaAnLrSJ1jUG6B79PWxA=
355-
github.com/jfrog/froggit-go v1.20.1/go.mod h1:KBZnlDV448g1nb9I38WLtEu5SAqUFhTegvChYKIn/KU=
352+
github.com/jfrog/build-info-go v1.10.16 h1:M77OfTXl3Ew9AG9SIIYLAG5ccIIaf6xjIZ5nomc2XAw=
353+
github.com/jfrog/build-info-go v1.10.16/go.mod h1:szdz9+WzB7+7PGnILLUgyY+OF5qD5geBT7UGNIxibyw=
354+
github.com/jfrog/froggit-go v1.20.2 h1:3db2nY0FIIVv0Oa1lwrljr2GUL3j+F6wvbhKQNdWbsw=
355+
github.com/jfrog/froggit-go v1.20.2/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
356356
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=
357357
github.com/jfrog/go-mockhttp v0.3.1/go.mod h1:LmKHex73SUZswM8ANS8kPxLihTOvtq44HVcCoTJKuqc=
358358
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
359359
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
360360
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
361361
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
362-
github.com/jfrog/jfrog-cli-artifactory v0.6.0 h1:++P/euXYMlV+fKsyMWJG2hnfiUc2ATLRT5RTxOIwPsE=
363-
github.com/jfrog/jfrog-cli-artifactory v0.6.0/go.mod h1:TC2TecHCZvVYtquPixz++VfHNX600vzAg+hXCQ3j0uE=
364-
github.com/jfrog/jfrog-cli-core/v2 v2.59.4 h1:6FU8hR0Niao8PuXh+0jU06lxTRJtDD8r4UL/4T+8yuI=
365-
github.com/jfrog/jfrog-cli-core/v2 v2.59.4/go.mod h1:agFp57/4zU9J5E3sKyqxIMzqjFpxE+xrWPg3RcjTNbY=
362+
github.com/jfrog/jfrog-cli-artifactory v0.6.2 h1:qfeiILmYUVhCciR1+/ZFYYxEXbSj66YKQ/xzSf+RAcs=
363+
github.com/jfrog/jfrog-cli-artifactory v0.6.2/go.mod h1:6609D9XuzfPMz1yWLPdmdlNGlt12VcqiB1VzED15pg0=
364+
github.com/jfrog/jfrog-cli-core/v2 v2.59.5 h1:zPUOquY8gakWHJSdQifdcleFL0U23I0bdQdOYqxXAj4=
365+
github.com/jfrog/jfrog-cli-core/v2 v2.59.5/go.mod h1:+zJfCkkFRWDbRTGpHsoaLZw5ze1xzRwffaLKuXjrZKc=
366366
github.com/jfrog/jfrog-cli-platform-services v1.10.0 h1:O+N/VAF+QjFvq9xkHpmzKLcdl9aJu3IP204Su0L14rw=
367367
github.com/jfrog/jfrog-cli-platform-services v1.10.0/go.mod h1:qbu4iqBST9x8LgD8HhzUm91iOB3vHqtoGmaxOnmw0ok=
368-
github.com/jfrog/jfrog-cli-security v1.21.0 h1:wtza4bHW7yH3S7uI0V/Dqu1ILqhwF+F3AaSYjyncths=
369-
github.com/jfrog/jfrog-cli-security v1.21.0/go.mod h1:twq00jryP0ItSAys8G7ih2qAPEJdsLwR8KPDFAPLGUw=
370-
github.com/jfrog/jfrog-client-go v1.54.4 h1:W5J2WAidEPghlvWl7FbrJUeRyVbNzC6GnihNACVaeEM=
371-
github.com/jfrog/jfrog-client-go v1.54.4/go.mod h1:+pSVE7Co+ytwhOhmz84/Lpe5fSeTaWJXsP1qt+WVfw0=
368+
github.com/jfrog/jfrog-cli-security v1.21.2 h1:3dQ42MFiuMtoXZQWMUQBlDAl7sAdbmG9BeLWX+CvZYw=
369+
github.com/jfrog/jfrog-cli-security v1.21.2/go.mod h1:psaaXUvlRRAc3hIarbqaGq15kHYmrXA61yy7AESclNk=
370+
github.com/jfrog/jfrog-client-go v1.54.5 h1:WKd26zbJYPCgKTTFFflHnX/1QqtZt0IXh3czlikXsyY=
371+
github.com/jfrog/jfrog-client-go v1.54.5/go.mod h1:+pSVE7Co+ytwhOhmz84/Lpe5fSeTaWJXsP1qt+WVfw0=
372372
github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
373373
github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
374374
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY=
@@ -486,8 +486,8 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
486486
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
487487
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
488488
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
489-
github.com/owenrumney/go-sarif/v3 v3.1.4 h1:lqx5Cb7162BC+FuAgJZq8A8XXP4XMw7XoAPZl9iqlQs=
490-
github.com/owenrumney/go-sarif/v3 v3.1.4/go.mod h1:Olt8kHDlC+ruWzRfmgIQUD+2hoAk6A6vT+ljDUbae2s=
489+
github.com/owenrumney/go-sarif/v3 v3.2.1 h1:Dogf2wkOxxRkG3O/B9T6dokyDSl36q19tlMYtXOTThE=
490+
github.com/owenrumney/go-sarif/v3 v3.2.1/go.mod h1:S2sdyDnv0sxN5x+M8iFZIzZE2+uTX/1uXlwTRx0efT0=
491491
github.com/package-url/packageurl-go v0.1.3 h1:4juMED3hHiz0set3Vq3KeQ75KD1avthoXLtmE3I0PLs=
492492
github.com/package-url/packageurl-go v0.1.3/go.mod h1:nKAWB8E6uk1MHqiS/lQb9pYBGH2+mdJ2PJc2s50dQY0=
493493
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=

utils/cliutils/cli_consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "time"
44

55
const (
66
// General CLI constants
7-
CliVersion = "2.78.3"
7+
CliVersion = "2.78.4"
88
ClientAgent = "jfrog-cli-go"
99

1010
// CLI base commands constants:

0 commit comments

Comments
 (0)