From 76f48995604f0157f49c34dfd237b8a37cd2ed77 Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Fri, 10 Jan 2025 16:01:17 +0530 Subject: [PATCH 1/7] Moved artifactory commands out of cli-core to cli-artifactory # Conflicts: # go.sum --- artifactory/cli.go | 20 ++++++++++---------- artifactory_test.go | 2 +- buildinfo_test.go | 4 ++-- buildtools/cli.go | 18 +++++++++--------- docker_test.go | 4 ++-- go.mod | 6 +++++- go.sum | 16 ++++++++-------- go_test.go | 2 +- gradle_test.go | 2 +- inttestutils/artifactory.go | 2 +- inttestutils/docker.go | 2 +- inttestutils/transfer.go | 2 +- maven_test.go | 2 +- npm_test.go | 4 ++-- nuget_test.go | 2 +- plugins/commands/publish.go | 2 +- utils/cliutils/utils.go | 2 +- utils/tests/utils.go | 2 +- 18 files changed, 49 insertions(+), 45 deletions(-) diff --git a/artifactory/cli.go b/artifactory/cli.go index a84be2bef..5592af302 100644 --- a/artifactory/cli.go +++ b/artifactory/cli.go @@ -3,6 +3,7 @@ package artifactory import ( "errors" "fmt" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python" "github.com/jfrog/jfrog-cli/docs/artifactory/cocoapodsconfig" "github.com/jfrog/jfrog-cli/docs/artifactory/swiftconfig" "os" @@ -16,16 +17,15 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferinstall" "github.com/jfrog/jfrog-cli/docs/artifactory/transferplugininstall" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/buildinfo" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/container" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/curl" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/dotnet" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/oc" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/permissiontarget" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/python" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/replication" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/repository" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/buildinfo" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/curl" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/oc" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/permissiontarget" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/replication" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/repository" "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transfer" transferconfigcore "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferconfig" transferfilescore "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferfiles" diff --git a/artifactory_test.go b/artifactory_test.go index 61f13fb2f..1737fe05d 100644 --- a/artifactory_test.go +++ b/artifactory_test.go @@ -29,7 +29,7 @@ import ( "github.com/jfrog/archiver/v3" gofrogio "github.com/jfrog/gofrog/io" "github.com/jfrog/gofrog/version" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" "github.com/jfrog/jfrog-cli-core/v2/common/commands" diff --git a/buildinfo_test.go b/buildinfo_test.go index c72eac195..4e9b38315 100644 --- a/buildinfo_test.go +++ b/buildinfo_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/formats" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/formats" clientTestUtils "github.com/jfrog/jfrog-client-go/utils/tests" buildinfo "github.com/jfrog/build-info-go/entities" @@ -18,7 +18,7 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/common/spec" "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" coretests "github.com/jfrog/jfrog-cli-core/v2/utils/tests" diff --git a/buildtools/cli.go b/buildtools/cli.go index 02eee938a..61f07754f 100644 --- a/buildtools/cli.go +++ b/buildtools/cli.go @@ -3,21 +3,21 @@ package buildtools import ( "errors" "fmt" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python" "github.com/jfrog/jfrog-cli-security/utils/techutils" "os" "strconv" "strings" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/container" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/dotnet" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/golang" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/gradle" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/mvn" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/npm" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/python" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/terraform" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/golang" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/gradle" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/mvn" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/npm" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/terraform" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/yarn" commandsUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/yarn" containerutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container" "github.com/jfrog/jfrog-cli-core/v2/common/build" commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" diff --git a/docker_test.go b/docker_test.go index 9a49a8a3c..10552460c 100644 --- a/docker_test.go +++ b/docker_test.go @@ -14,8 +14,8 @@ import ( "github.com/jfrog/build-info-go/entities" "github.com/jfrog/gofrog/version" - coreContainer "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/container" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + coreContainer "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container" "github.com/jfrog/jfrog-cli-core/v2/common/build" diff --git a/go.mod b/go.mod index df843a14d..b36e450c2 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyalbe4/jfrog-cli-core/v2 v2.31.1-0.20241225194149-cc2e18e68ad8 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110100931-f032bb6bfbe4 + +replace github.com/jfrog/jfrog-cli-artifactory => github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509 + +replace github.com/jfrog/jfrog-cli-security => github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961 // replace github.com/jfrog/jfrog-cli-security => github.com/EyalDelarea/jfrog-cli-security v0.0.0-20241121103043-02719f295f02 diff --git a/go.sum b/go.sum index 86a74c655..c8cbbaa82 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,12 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= github.com/beevik/etree v1.4.0/go.mod h1:cyWiXwGoasx60gHvtnEh5x8+uIjUVnjWqBvEnhnqKDA= +github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509 h1:UYm+G5P/YTo+Y/gOG72U3JOYqSmJc53fp8x6UtZInho= +github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509/go.mod h1:2bMm7UHMiJY1DEJTLSFJyRCiR8kCwx71m/FoFJezNNo= +github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110100931-f032bb6bfbe4 h1:afjMUeiIbMuA0GYgoFih6C31BKViMiu+TNhXnie5leM= +github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110100931-f032bb6bfbe4/go.mod h1:6SI200sN1Mu4n1V48ChK6V6z3X4YZsCqlN0W6O5Xc3U= +github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961 h1:IOh42JFwLx8Whd4qEx85VqSvXCI4Zh4nbUCyAP2qUF0= +github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961/go.mod h1:I4ToHnRSHxVdI7Adjq4GR6pIkbiFoEzs2fTKqyRBRNs= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= @@ -171,16 +177,10 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= -github.com/jfrog/jfrog-cli-artifactory v0.1.11 h1:tYGQpkGZVHwYxApKhMXgY1V25QaLFaTbjsoq0l3Bf4w= -github.com/jfrog/jfrog-cli-artifactory v0.1.11/go.mod h1:rVBTbanRnG9CXyAYRJ2O6h2fJMa+fsGB+3swUB/qEt0= -github.com/jfrog/jfrog-cli-core/v2 v2.57.7 h1:2cZS9C5jBYpyCF4PoUzvGCnwFA7CsvG6jszCj1I3tsg= -github.com/jfrog/jfrog-cli-core/v2 v2.57.7/go.mod h1:ueB6LtU+gW7/hTyfKyka/BHi52oo5lEH46RodTly1PU= github.com/jfrog/jfrog-cli-platform-services v1.6.0 h1:2fBIDxnQaFWStZqMEUI2I3nkNjDmknxxHcmpeLxtocc= github.com/jfrog/jfrog-cli-platform-services v1.6.0/go.mod h1:u3lMRG7XC8MeUy/OPkHkZnsgCMIi0br4sjk2/W1Pm8I= -github.com/jfrog/jfrog-cli-security v1.14.1 h1:80Sbml/tzJEsxXj7dERrRRaBz5mlfuB8qBKUdEJ7MtU= -github.com/jfrog/jfrog-cli-security v1.14.1/go.mod h1:3F3H36AX7vt3wLo1Ht0LByUo9SyDWhOV39zfoV2h/Zs= -github.com/jfrog/jfrog-client-go v1.49.1 h1:AdJ+x+BSka3pCVDu6MCEvojwOmXvy1Q5S0dILvpfoDw= -github.com/jfrog/jfrog-client-go v1.49.1/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= +github.com/jfrog/jfrog-client-go v1.49.0 h1:NaTK6+LQBEJafL//6ntnS/eVx1dZMJnxydALwWHKORQ= +github.com/jfrog/jfrog-client-go v1.49.0/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= github.com/jszwec/csvutil v1.10.0/go.mod h1:/E4ONrmGkwmWsk9ae9jpXnv9QT8pLHEPcCirMFhxG9I= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= diff --git a/go_test.go b/go_test.go index 77bfff423..7b329c4e9 100644 --- a/go_test.go +++ b/go_test.go @@ -13,7 +13,7 @@ import ( clientTestUtils "github.com/jfrog/jfrog-client-go/utils/tests" buildinfo "github.com/jfrog/build-info-go/entities" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/golang" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/golang" "github.com/jfrog/jfrog-cli-core/v2/common/build" "github.com/jfrog/jfrog-cli-core/v2/common/commands" "github.com/jfrog/jfrog-cli-core/v2/common/spec" diff --git a/gradle_test.go b/gradle_test.go index a1ffed56d..801647a20 100644 --- a/gradle_test.go +++ b/gradle_test.go @@ -13,7 +13,7 @@ import ( clientTestUtils "github.com/jfrog/jfrog-client-go/utils/tests" buildinfo "github.com/jfrog/build-info-go/entities" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/gradle" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/gradle" "github.com/jfrog/jfrog-cli-core/v2/common/build" commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" "github.com/jfrog/jfrog-cli-core/v2/common/commands" diff --git a/inttestutils/artifactory.go b/inttestutils/artifactory.go index 7ede4e4ee..29d6a5481 100644 --- a/inttestutils/artifactory.go +++ b/inttestutils/artifactory.go @@ -3,7 +3,7 @@ package inttestutils import ( "testing" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/common/spec" "github.com/jfrog/jfrog-cli-core/v2/utils/config" diff --git a/inttestutils/docker.go b/inttestutils/docker.go index 5fdc2d946..279c2c699 100644 --- a/inttestutils/docker.go +++ b/inttestutils/docker.go @@ -9,7 +9,7 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/common/spec" gofrogcmd "github.com/jfrog/gofrog/io" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container" commonTests "github.com/jfrog/jfrog-cli-core/v2/common/tests" diff --git a/inttestutils/transfer.go b/inttestutils/transfer.go index 53338bed6..9c6c221c0 100644 --- a/inttestutils/transfer.go +++ b/inttestutils/transfer.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferfiles" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/common/spec" diff --git a/maven_test.go b/maven_test.go index 5281f7385..e76382ba5 100644 --- a/maven_test.go +++ b/maven_test.go @@ -15,7 +15,7 @@ import ( "github.com/jfrog/build-info-go/build" buildinfo "github.com/jfrog/build-info-go/entities" biutils "github.com/jfrog/build-info-go/utils" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/mvn" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/mvn" buildUtils "github.com/jfrog/jfrog-cli-core/v2/common/build" "github.com/jfrog/jfrog-cli-core/v2/common/commands" "github.com/jfrog/jfrog-cli-core/v2/common/spec" diff --git a/npm_test.go b/npm_test.go index 8698fb0a0..3bad72905 100644 --- a/npm_test.go +++ b/npm_test.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "os" "os/exec" @@ -31,7 +31,7 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/npm" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/npm" "github.com/jfrog/jfrog-cli-core/v2/utils/ioutils" "github.com/jfrog/jfrog-cli/inttestutils" "github.com/jfrog/jfrog-cli/utils/tests" diff --git a/nuget_test.go b/nuget_test.go index bf1235a37..bbcca133c 100644 --- a/nuget_test.go +++ b/nuget_test.go @@ -11,7 +11,7 @@ import ( dotnetUtils "github.com/jfrog/build-info-go/build/utils/dotnet" buildInfo "github.com/jfrog/build-info-go/entities" biutils "github.com/jfrog/build-info-go/utils" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/dotnet" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet" "github.com/jfrog/jfrog-cli-core/v2/common/project" "github.com/jfrog/jfrog-cli-core/v2/utils/config" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" diff --git a/plugins/commands/publish.go b/plugins/commands/publish.go index 9bb76dc78..3ad6cbd60 100644 --- a/plugins/commands/publish.go +++ b/plugins/commands/publish.go @@ -3,7 +3,7 @@ package commands import ( buildinfoutils "github.com/jfrog/build-info-go/utils" "github.com/jfrog/gofrog/io" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils" rtutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go index ac43b25a8..cc5b3b75e 100644 --- a/utils/cliutils/utils.go +++ b/utils/cliutils/utils.go @@ -16,7 +16,7 @@ import ( "github.com/jfrog/gofrog/version" "github.com/jfrog/jfrog-client-go/utils/log" - corecontainercmds "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/container" + corecontainercmds "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container" commandUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils" artifactoryUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" containerutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container" diff --git a/utils/tests/utils.go b/utils/tests/utils.go index 91f3cdd6b..45c46bf11 100644 --- a/utils/tests/utils.go +++ b/utils/tests/utils.go @@ -22,7 +22,7 @@ import ( "github.com/urfave/cli" buildinfo "github.com/jfrog/build-info-go/entities" - "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic" commandutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils" artUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/common/spec" From e94a9e4a29368c56ebe8d14b668667347b310db0 Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Fri, 10 Jan 2025 16:38:19 +0530 Subject: [PATCH 2/7] Moved distribution commands out of cli-core to cli-artifactory --- distribution/cli.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/cli.go b/distribution/cli.go index 8242da2c0..9a4db23ac 100644 --- a/distribution/cli.go +++ b/distribution/cli.go @@ -2,10 +2,10 @@ package distribution import ( "errors" + distributionCommands "github.com/jfrog/jfrog-cli-artifactory/distribution/commands" commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" "github.com/jfrog/jfrog-cli-core/v2/common/commands" "github.com/jfrog/jfrog-cli-core/v2/common/spec" - distributionCommands "github.com/jfrog/jfrog-cli-core/v2/distribution/commands" coreCommonDocs "github.com/jfrog/jfrog-cli-core/v2/docs/common" coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config" "github.com/jfrog/jfrog-cli/docs/artifactory/releasebundlecreate" diff --git a/go.mod b/go.mod index b36e450c2..f02862fb7 100644 --- a/go.mod +++ b/go.mod @@ -170,9 +170,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110100931-f032bb6bfbe4 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110105406-518b60799f6c -replace github.com/jfrog/jfrog-cli-artifactory => github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110110027-5fcd32e2d9e6 replace github.com/jfrog/jfrog-cli-security => github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961 diff --git a/go.sum b/go.sum index c8cbbaa82..8f51448e4 100644 --- a/go.sum +++ b/go.sum @@ -32,10 +32,10 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= github.com/beevik/etree v1.4.0/go.mod h1:cyWiXwGoasx60gHvtnEh5x8+uIjUVnjWqBvEnhnqKDA= -github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509 h1:UYm+G5P/YTo+Y/gOG72U3JOYqSmJc53fp8x6UtZInho= -github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509/go.mod h1:2bMm7UHMiJY1DEJTLSFJyRCiR8kCwx71m/FoFJezNNo= -github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110100931-f032bb6bfbe4 h1:afjMUeiIbMuA0GYgoFih6C31BKViMiu+TNhXnie5leM= -github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110100931-f032bb6bfbe4/go.mod h1:6SI200sN1Mu4n1V48ChK6V6z3X4YZsCqlN0W6O5Xc3U= +github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110110027-5fcd32e2d9e6 h1:hebEApEhvwUdIaVOFXFPaS6nclLu+smNkSb9nOQ5x/4= +github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110110027-5fcd32e2d9e6/go.mod h1:2bMm7UHMiJY1DEJTLSFJyRCiR8kCwx71m/FoFJezNNo= +github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110105406-518b60799f6c h1:WsagVG0HJs+I285t35Ds8kXgcoHqL2EVon9f7siYDG0= +github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110105406-518b60799f6c/go.mod h1:2yRPxfL9DXml92anDHi1U4mVHxca6xyTjRikY+gd8nw= github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961 h1:IOh42JFwLx8Whd4qEx85VqSvXCI4Zh4nbUCyAP2qUF0= github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961/go.mod h1:I4ToHnRSHxVdI7Adjq4GR6pIkbiFoEzs2fTKqyRBRNs= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= From 13dc47e06ab061e51799d775c959c985f3515b4f Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Thu, 23 Jan 2025 11:50:34 +0530 Subject: [PATCH 3/7] Updated commits with cli-core and cli-artifactory --- go.mod | 6 +++--- go.sum | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index f02862fb7..6c83b48dd 100644 --- a/go.mod +++ b/go.mod @@ -170,11 +170,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110105406-518b60799f6c +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250123053843-d005557d62d9 -replace github.com/jfrog/jfrog-cli-artifactory => github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110110027-5fcd32e2d9e6 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250123060215-b15168492ff0 -replace github.com/jfrog/jfrog-cli-security => github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961 +replace github.com/jfrog/jfrog-cli-security => github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250123044515-d8a14cb8bdb7 // replace github.com/jfrog/jfrog-cli-security => github.com/EyalDelarea/jfrog-cli-security v0.0.0-20241121103043-02719f295f02 diff --git a/go.sum b/go.sum index 8f51448e4..61e73c5de 100644 --- a/go.sum +++ b/go.sum @@ -32,12 +32,12 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= github.com/beevik/etree v1.4.0/go.mod h1:cyWiXwGoasx60gHvtnEh5x8+uIjUVnjWqBvEnhnqKDA= -github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110110027-5fcd32e2d9e6 h1:hebEApEhvwUdIaVOFXFPaS6nclLu+smNkSb9nOQ5x/4= -github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110110027-5fcd32e2d9e6/go.mod h1:2bMm7UHMiJY1DEJTLSFJyRCiR8kCwx71m/FoFJezNNo= -github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110105406-518b60799f6c h1:WsagVG0HJs+I285t35Ds8kXgcoHqL2EVon9f7siYDG0= -github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250110105406-518b60799f6c/go.mod h1:2yRPxfL9DXml92anDHi1U4mVHxca6xyTjRikY+gd8nw= -github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961 h1:IOh42JFwLx8Whd4qEx85VqSvXCI4Zh4nbUCyAP2qUF0= -github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250110102743-dcdd4ba39961/go.mod h1:I4ToHnRSHxVdI7Adjq4GR6pIkbiFoEzs2fTKqyRBRNs= +github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250123060215-b15168492ff0 h1:F425C7e2s7dqonNeG0Z5H7baktLTcTjGig2p3n9Np5w= +github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250123060215-b15168492ff0/go.mod h1:/sP5tyuFpH9WJp0+vztczuXcxIYHlMye0CDWCxhy4/M= +github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250123053843-d005557d62d9 h1:dL8cFzfbwLrmT9dvMHvUcQcUSXXJAu+RDsqMFBSOFlc= +github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250123053843-d005557d62d9/go.mod h1:POu6/aZwIf+Muc7etuif28YiRXr8PY+gHBUY4YfjBRQ= +github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250123044515-d8a14cb8bdb7 h1:RJdx6xJQte6Wpp0xXIP8wu4htAFDxUE3gUjYjgJDETA= +github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250123044515-d8a14cb8bdb7/go.mod h1:GoNkmdj5Kss12smya4zKKNofQHywVNj5hYWrvlSWgGs= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= @@ -179,8 +179,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-platform-services v1.6.0 h1:2fBIDxnQaFWStZqMEUI2I3nkNjDmknxxHcmpeLxtocc= github.com/jfrog/jfrog-cli-platform-services v1.6.0/go.mod h1:u3lMRG7XC8MeUy/OPkHkZnsgCMIi0br4sjk2/W1Pm8I= -github.com/jfrog/jfrog-client-go v1.49.0 h1:NaTK6+LQBEJafL//6ntnS/eVx1dZMJnxydALwWHKORQ= -github.com/jfrog/jfrog-client-go v1.49.0/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= +github.com/jfrog/jfrog-client-go v1.49.1 h1:AdJ+x+BSka3pCVDu6MCEvojwOmXvy1Q5S0dILvpfoDw= +github.com/jfrog/jfrog-client-go v1.49.1/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= github.com/jszwec/csvutil v1.10.0/go.mod h1:/E4ONrmGkwmWsk9ae9jpXnv9QT8pLHEPcCirMFhxG9I= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= From 028697a41d671d9b321178c07295d5d44de29c16 Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Thu, 30 Jan 2025 14:05:28 +0530 Subject: [PATCH 4/7] Updated dependencies --- go.mod | 10 +++++----- go.sum | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 6c83b48dd..3193142b2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jfrog/jfrog-cli -go 1.23.4 +go 1.23.5 replace ( // Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372) @@ -29,7 +29,7 @@ require ( github.com/testcontainers/testcontainers-go v0.34.0 github.com/urfave/cli v1.22.16 github.com/xeipuuv/gojsonschema v1.2.0 - golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 + golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c gopkg.in/yaml.v2 v2.4.0 ) @@ -170,11 +170,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250123053843-d005557d62d9 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250129121249-d5f4218e6901 -replace github.com/jfrog/jfrog-cli-artifactory => github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250123060215-b15168492ff0 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c -replace github.com/jfrog/jfrog-cli-security => github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250123044515-d8a14cb8bdb7 +replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.14.2-0.20250130082759-0d5b0bef7b8e // replace github.com/jfrog/jfrog-cli-security => github.com/EyalDelarea/jfrog-cli-security v0.0.0-20241121103043-02719f295f02 diff --git a/go.sum b/go.sum index 61e73c5de..af8fac0cd 100644 --- a/go.sum +++ b/go.sum @@ -32,12 +32,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= github.com/beevik/etree v1.4.0/go.mod h1:cyWiXwGoasx60gHvtnEh5x8+uIjUVnjWqBvEnhnqKDA= -github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250123060215-b15168492ff0 h1:F425C7e2s7dqonNeG0Z5H7baktLTcTjGig2p3n9Np5w= -github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250123060215-b15168492ff0/go.mod h1:/sP5tyuFpH9WJp0+vztczuXcxIYHlMye0CDWCxhy4/M= -github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250123053843-d005557d62d9 h1:dL8cFzfbwLrmT9dvMHvUcQcUSXXJAu+RDsqMFBSOFlc= -github.com/bhanurp/jfrog-cli-core/v2 v2.31.1-0.20250123053843-d005557d62d9/go.mod h1:POu6/aZwIf+Muc7etuif28YiRXr8PY+gHBUY4YfjBRQ= -github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250123044515-d8a14cb8bdb7 h1:RJdx6xJQte6Wpp0xXIP8wu4htAFDxUE3gUjYjgJDETA= -github.com/bhanurp/jfrog-cli-security v1.14.1-0.20250123044515-d8a14cb8bdb7/go.mod h1:GoNkmdj5Kss12smya4zKKNofQHywVNj5hYWrvlSWgGs= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= @@ -177,8 +171,14 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= +github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c h1:9975QDk6vBZG7vjsKVCuQB56r4xxeoYHHjmTzxbd4H8= +github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c/go.mod h1:/sP5tyuFpH9WJp0+vztczuXcxIYHlMye0CDWCxhy4/M= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250129121249-d5f4218e6901 h1:gbscohABZ7CB9y4Ls/xjjzx5LK8F8GicOSjmYSUn+9A= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250129121249-d5f4218e6901/go.mod h1:IqPSttJzDcaHn5OZ6ejQ/gauLlLuzckEe9buvYHeDT0= github.com/jfrog/jfrog-cli-platform-services v1.6.0 h1:2fBIDxnQaFWStZqMEUI2I3nkNjDmknxxHcmpeLxtocc= github.com/jfrog/jfrog-cli-platform-services v1.6.0/go.mod h1:u3lMRG7XC8MeUy/OPkHkZnsgCMIi0br4sjk2/W1Pm8I= +github.com/jfrog/jfrog-cli-security v1.14.2-0.20250130082759-0d5b0bef7b8e h1:h+cmivlTt1tKsfyLBPj6DbZB76JGI4jCXlkuaUgCT4o= +github.com/jfrog/jfrog-cli-security v1.14.2-0.20250130082759-0d5b0bef7b8e/go.mod h1:nFW0dGvSCRD8pZ35tOH9WFANvlEI8Sg1YpD+uM8uxD4= github.com/jfrog/jfrog-client-go v1.49.1 h1:AdJ+x+BSka3pCVDu6MCEvojwOmXvy1Q5S0dILvpfoDw= github.com/jfrog/jfrog-client-go v1.49.1/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= @@ -409,8 +409,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= -golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= +golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc= +golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= From a350efffa7a10ed652d45fb4a663c08802f389ea Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Thu, 30 Jan 2025 14:14:10 +0530 Subject: [PATCH 5/7] Fixed import and updated client-go dependency --- artifactory/cli.go | 3 ++- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/artifactory/cli.go b/artifactory/cli.go index 5592af302..edcd7a286 100644 --- a/artifactory/cli.go +++ b/artifactory/cli.go @@ -14,6 +14,7 @@ import ( "github.com/jfrog/jfrog-cli/utils/accesstoken" "github.com/jfrog/gofrog/version" + coregeneric "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic" "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferinstall" "github.com/jfrog/jfrog-cli/docs/artifactory/transferplugininstall" @@ -1249,7 +1250,7 @@ func pingCmd(c *cli.Context) error { if err != nil { return err } - pingCmd := generic.NewPingCommand() + pingCmd := coregeneric.NewPingCommand() pingCmd.SetServerDetails(artDetails) err = commands.Exec(pingCmd) resString := clientutils.IndentJson(pingCmd.Response()) diff --git a/go.mod b/go.mod index 3193142b2..2980c87ab 100644 --- a/go.mod +++ b/go.mod @@ -178,7 +178,7 @@ replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-securi // replace github.com/jfrog/jfrog-cli-security => github.com/EyalDelarea/jfrog-cli-security v0.0.0-20241121103043-02719f295f02 -// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20241225183733-80a5e1ba7a2c +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250126110945-81abbdde452f // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20241220065541-91828d43d8b9 diff --git a/go.sum b/go.sum index af8fac0cd..0d8f1a833 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,8 @@ github.com/jfrog/jfrog-cli-platform-services v1.6.0 h1:2fBIDxnQaFWStZqMEUI2I3nkN github.com/jfrog/jfrog-cli-platform-services v1.6.0/go.mod h1:u3lMRG7XC8MeUy/OPkHkZnsgCMIi0br4sjk2/W1Pm8I= github.com/jfrog/jfrog-cli-security v1.14.2-0.20250130082759-0d5b0bef7b8e h1:h+cmivlTt1tKsfyLBPj6DbZB76JGI4jCXlkuaUgCT4o= github.com/jfrog/jfrog-cli-security v1.14.2-0.20250130082759-0d5b0bef7b8e/go.mod h1:nFW0dGvSCRD8pZ35tOH9WFANvlEI8Sg1YpD+uM8uxD4= -github.com/jfrog/jfrog-client-go v1.49.1 h1:AdJ+x+BSka3pCVDu6MCEvojwOmXvy1Q5S0dILvpfoDw= -github.com/jfrog/jfrog-client-go v1.49.1/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= +github.com/jfrog/jfrog-client-go v1.28.1-0.20250126110945-81abbdde452f h1:2IIy3XfvmEp5zJgakKZiyKGGeVyDsouwYmtD+4QiVd4= +github.com/jfrog/jfrog-client-go v1.28.1-0.20250126110945-81abbdde452f/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= github.com/jszwec/csvutil v1.10.0/go.mod h1:/E4ONrmGkwmWsk9ae9jpXnv9QT8pLHEPcCirMFhxG9I= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= From 83bed1c631b3cc3363d9a4c3c40a8a0fb06f932b Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Thu, 30 Jan 2025 15:48:50 +0530 Subject: [PATCH 6/7] Reverted to previous patch version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2980c87ab..f6e5c9e33 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jfrog/jfrog-cli -go 1.23.5 +go 1.23.4 replace ( // Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372) From 7ea85e6c416c08f40cb4fc84e6f58f381c14b696 Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Thu, 30 Jan 2025 16:29:14 +0530 Subject: [PATCH 7/7] Updated to latest version of cli-core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f6e5c9e33..b13ffded1 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250129121249-d5f4218e6901 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250130104846-27e495de291e replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c diff --git a/go.sum b/go.sum index 0d8f1a833..b4a4e5d43 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c h1:9975QDk6vBZG7vjsKVCuQB56r4xxeoYHHjmTzxbd4H8= github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c/go.mod h1:/sP5tyuFpH9WJp0+vztczuXcxIYHlMye0CDWCxhy4/M= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250129121249-d5f4218e6901 h1:gbscohABZ7CB9y4Ls/xjjzx5LK8F8GicOSjmYSUn+9A= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250129121249-d5f4218e6901/go.mod h1:IqPSttJzDcaHn5OZ6ejQ/gauLlLuzckEe9buvYHeDT0= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250130104846-27e495de291e h1:cJJxXI45QLJsaCr5ChOTToCJpLoRTBGlXu/Z6DZB9jk= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250130104846-27e495de291e/go.mod h1:3vP0hv13zJYvhXlgKIXmWSN8ADvGUQgxVVCqcO8hOeM= github.com/jfrog/jfrog-cli-platform-services v1.6.0 h1:2fBIDxnQaFWStZqMEUI2I3nkNjDmknxxHcmpeLxtocc= github.com/jfrog/jfrog-cli-platform-services v1.6.0/go.mod h1:u3lMRG7XC8MeUy/OPkHkZnsgCMIi0br4sjk2/W1Pm8I= github.com/jfrog/jfrog-cli-security v1.14.2-0.20250130082759-0d5b0bef7b8e h1:h+cmivlTt1tKsfyLBPj6DbZB76JGI4jCXlkuaUgCT4o=