Skip to content

Commit 222c3c3

Browse files
fluxxBotfluxxBot
authored
moved docker related code (#3156)
1 parent 89d4999 commit 222c3c3

File tree

7 files changed

+236
-33
lines changed

7 files changed

+236
-33
lines changed

‎buildtools/cli.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/gradle"
2424
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/mvn"
2525
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/npm"
26+
containerutils "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
2627
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/terraform"
2728
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/yarn"
2829
commandsUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
29-
containerutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
3030
"github.com/jfrog/jfrog-cli-core/v2/common/build"
3131
commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
3232
"github.com/jfrog/jfrog-cli-core/v2/common/commands"

‎docker_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ import (
1919
"github.com/jfrog/gofrog/version"
2020
coreContainer "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container"
2121
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
22+
container "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
2223
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
23-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
2424
"github.com/jfrog/jfrog-cli-core/v2/common/build"
2525
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
26-
commonTests "github.com/jfrog/jfrog-cli-core/v2/common/tests"
2726
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
2827
coreTests "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
2928
"github.com/jfrog/jfrog-cli/inttestutils"
3029
"github.com/jfrog/jfrog-cli/utils/tests"
30+
commonTests "github.com/jfrog/jfrog-cli/utils/tests"
3131
"github.com/jfrog/jfrog-client-go/auth"
3232
clientUtils "github.com/jfrog/jfrog-client-go/utils"
3333
"github.com/jfrog/jfrog-client-go/utils/io/fileutils"

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ require (
1919
github.com/jfrog/build-info-go v1.12.0
2020
github.com/jfrog/gofrog v1.7.6
2121
github.com/jfrog/jfrog-cli-application v1.0.1
22-
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251008063046-4bfcdeb54f16
23-
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251008065215-ebd53b5439fa
22+
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251015051724-72d111a3d107
23+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251015045218-1a38c9e47097
2424
github.com/jfrog/jfrog-cli-platform-services v1.10.0
2525
github.com/jfrog/jfrog-cli-security v1.21.8
26-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251008045603-4ca43b3f3d45
26+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251015041910-ef0fe832b111
2727
github.com/jszwec/csvutil v1.10.0
2828
github.com/manifoldco/promptui v0.9.0
2929
github.com/stretchr/testify v1.11.1
@@ -220,14 +220,14 @@ require (
220220
go.uber.org/zap v1.27.0 // indirect
221221
go.yaml.in/yaml/v2 v2.4.2 // indirect
222222
go.yaml.in/yaml/v3 v3.0.4 // indirect
223-
golang.org/x/crypto v0.42.0 // indirect
223+
golang.org/x/crypto v0.43.0 // indirect
224224
golang.org/x/mod v0.28.0 // indirect
225-
golang.org/x/net v0.43.0 // indirect
225+
golang.org/x/net v0.45.0 // indirect
226226
golang.org/x/oauth2 v0.31.0 // indirect
227227
golang.org/x/sync v0.17.0 // indirect
228-
golang.org/x/sys v0.36.0 // indirect
229-
golang.org/x/term v0.35.0 // indirect
230-
golang.org/x/text v0.29.0 // indirect
228+
golang.org/x/sys v0.37.0 // indirect
229+
golang.org/x/term v0.36.0 // indirect
230+
golang.org/x/text v0.30.0 // indirect
231231
golang.org/x/time v0.12.0 // indirect
232232
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
233233
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
@@ -250,9 +250,9 @@ require (
250250

251251
//replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215
252252

253-
//replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.0.0-20251007085159-3db123d4398b
253+
//replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20251008152604-32538b00579c
254254

255-
//replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.0.0-20251007071921-a9564595b084
255+
//replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.58.1-0.20251008152439-da488ef26725
256256

257257
//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.54.2-0.20251007084958-5eeaa42c31a6
258258

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -365,16 +365,16 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL
365365
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
366366
github.com/jfrog/jfrog-cli-application v1.0.1 h1:PiiSVKFFs8VLAwjCe2JrIKlX7LmARFt+r8BLTupWIDc=
367367
github.com/jfrog/jfrog-cli-application v1.0.1/go.mod h1:gjV6Q2hhoMe3FF77GFiTyIRLSHokpDrkVj0GvYM+1Y4=
368-
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251008063046-4bfcdeb54f16 h1:a3HT8zy/UQ0NzkxUVrTyL52hLlpMVtt3aNeewJJwX5A=
369-
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251008063046-4bfcdeb54f16/go.mod h1:IakTDViEn67KzaQTyOyvqkfGsamryAnckO3VGs0cg2c=
370-
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251008065215-ebd53b5439fa h1:JfK0lvV1aCLkgbktdHkjRp61jlc1Llxq2QFK7sf52SE=
371-
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251008065215-ebd53b5439fa/go.mod h1:XnTbhDuUKPOe215lJ6mxRu/xKL2zdy6a9CU+e85bjME=
368+
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251015051724-72d111a3d107 h1:0VVFI1AHzMKyr/Nwxmu/Jhg3U1Rq725AQPKpSTtk7XU=
369+
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251015051724-72d111a3d107/go.mod h1:nT050Wb18tTlfcQHefyMENzFOz9Vdym6WP0Z3Nc2qHc=
370+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251015045218-1a38c9e47097 h1:+W6BPxJ0nPtlQ6l6nmypW1eEANoVPiN8HDR4kQJA8uI=
371+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251015045218-1a38c9e47097/go.mod h1:UOeOwEEmRIi57cRwghN5OBVoqkJieYQQfLpeqw8Yv38=
372372
github.com/jfrog/jfrog-cli-platform-services v1.10.0 h1:O+N/VAF+QjFvq9xkHpmzKLcdl9aJu3IP204Su0L14rw=
373373
github.com/jfrog/jfrog-cli-platform-services v1.10.0/go.mod h1:qbu4iqBST9x8LgD8HhzUm91iOB3vHqtoGmaxOnmw0ok=
374374
github.com/jfrog/jfrog-cli-security v1.21.8 h1:yRVOW4FqETd0tVeHxdC7l19aLi5gS3hai9XwkMQuVr8=
375375
github.com/jfrog/jfrog-cli-security v1.21.8/go.mod h1:AYckVBA3qNmCku1MrBLpQwbr9eAZ91U/3zMa88gckD8=
376-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251008045603-4ca43b3f3d45 h1:8NcEHGwal5iyVqpNoKsltTW6h1b9yyN/c49XA0OoBtc=
377-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251008045603-4ca43b3f3d45/go.mod h1:E2s23qRRDdyPdzSYG1irPOEpjJ6kXvhV1U4g/0rG93k=
376+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251015041910-ef0fe832b111 h1:IBkggQwQi7D4+vafA3f8aHSrgZ89bMdlMffmNQfjuLw=
377+
github.com/jfrog/jfrog-client-go v1.55.1-0.20251015041910-ef0fe832b111/go.mod h1:jrODQbAbCt97F24d/0bYpqpdc0PFMuBxNJOTfTdW+Fk=
378378
github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
379379
github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
380380
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY=
@@ -716,8 +716,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
716716
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
717717
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
718718
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
719-
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
720-
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
719+
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
720+
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
721721
golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=
722722
golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
723723
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -740,8 +740,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
740740
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
741741
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
742742
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
743-
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
744-
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
743+
golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
744+
golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
745745
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
746746
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
747747
golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
@@ -789,25 +789,25 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
789789
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
790790
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
791791
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
792-
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
793-
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
792+
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
793+
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
794794
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
795795
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
796796
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
797797
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
798798
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
799799
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
800-
golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
801-
golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
800+
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
801+
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
802802
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
803803
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
804804
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
805805
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
806806
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
807807
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
808808
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
809-
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
810-
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
809+
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
810+
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
811811
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
812812
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
813813
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎inttestutils/docker.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010

1111
gofrogcmd "github.com/jfrog/gofrog/io"
1212
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
13+
container "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
1314
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
14-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
15-
commonTests "github.com/jfrog/jfrog-cli-core/v2/common/tests"
1615
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
1716
"github.com/jfrog/jfrog-cli/utils/tests"
17+
commonTests "github.com/jfrog/jfrog-cli/utils/tests"
1818
"github.com/jfrog/jfrog-client-go/utils/io/httputils"
1919
"github.com/jfrog/jfrog-client-go/utils/log"
2020
"github.com/stretchr/testify/assert"

‎npm_test.go‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ func TestNpmPublishWithWorkspaces(t *testing.T) {
814814
assert.NotEmpty(t, artifact.Sha1, "Artifact %d in module %d should have SHA1", j)
815815
assert.NotEmpty(t, artifact.Sha256, "Artifact %d in module %d should have SHA256", j)
816816
assert.NotEmpty(t, artifact.Md5, "Artifact %d in module %d should have MD5", j)
817-
assert.Contains(t, artifact.Name, "nested"+strconv.Itoa(j+1))
817+
assert.True(t, containsTarName(artifact.Name, expectedTars))
818818
}
819819

820820
// Publish build info to Artifactory
@@ -865,6 +865,7 @@ func TestNpmPublishWithWorkspacesRunNative(t *testing.T) {
865865
err = commands.Exec(npmpCmd)
866866
assert.NoError(t, err)
867867

868+
expectedTars := []string{"nested1", "nested2"}
868869
// Validate build info was created
869870
buildInfoService := build.CreateBuildInfoService()
870871
npmBuild, err := buildInfoService.GetOrCreateBuild(buildName, buildNumber)
@@ -893,7 +894,7 @@ func TestNpmPublishWithWorkspacesRunNative(t *testing.T) {
893894
assert.NotEmpty(t, artifact.Sha1, "Artifact %d should have SHA1", j)
894895
assert.NotEmpty(t, artifact.Sha256, "Artifact %d should have SHA256", j)
895896
assert.NotEmpty(t, artifact.Md5, "Artifact %d should have MD5", j)
896-
assert.Contains(t, artifact.Name, "nested"+strconv.Itoa(j+1), "Artifact %d should be named nested%d", j, j+1)
897+
assert.True(t, containsTarName(artifact.Name, expectedTars))
897898
}
898899

899900
// Publish build info to Artifactory
@@ -1259,3 +1260,13 @@ func TestSetupNpmCommand(t *testing.T) {
12591260
assert.Equal(t, http.StatusOK, res.StatusCode)
12601261
}
12611262
}
1263+
1264+
func containsTarName(tarName string, expectedTars []string) bool {
1265+
isTarPresent := false
1266+
for _, tar := range expectedTars {
1267+
strings.Contains(tarName, tar)
1268+
isTarPresent = true
1269+
break
1270+
}
1271+
return isTarPresent
1272+
}

0 commit comments

Comments
 (0)