From 30942c9522cd507641c399272182eca7062cfd54 Mon Sep 17 00:00:00 2001 From: delarea Date: Sun, 10 Nov 2024 13:40:55 +0200 Subject: [PATCH 1/8] Config command add and report usage --- config/cli.go | 2 +- go.mod | 2 +- go.sum | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/cli.go b/config/cli.go index b55d5dadc..5b7f08928 100644 --- a/config/cli.go +++ b/config/cli.go @@ -136,7 +136,7 @@ func addOrEdit(c *cli.Context, operation configOperation) error { } configCmd := commands.NewConfigCommand(commands.AddOrEdit, serverId).SetDetails(configCommandConfiguration.ServerDetails).SetInteractive(configCommandConfiguration.Interactive). SetEncPassword(configCommandConfiguration.EncPassword).SetUseBasicAuthOnly(configCommandConfiguration.BasicAuthOnly) - return configCmd.Run() + return configCmd.ExecAndReportUsage() } func showCmd(c *cli.Context) error { diff --git a/go.mod b/go.mod index 95510b754..dd1c18c87 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/srmish-jfrog/jfrog-cli-core/v2 v2.31.1-0.20241031183701-84b01c5a0ce0 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 add_setup_cli_usage // replace github.com/jfrog/jfrog-cli-security => github.com/attiasas/jfrog-cli-security v0.0.0-20240904061406-f368939ce3a0 diff --git a/go.sum b/go.sum index 1ddb0f802..33d137cc3 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,6 @@ 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.6 h1:bMfJsrLQJw0dZp4nqUf1xOmtY0rpCatW/I5q88x+fhQ= github.com/jfrog/jfrog-cli-artifactory v0.1.6/go.mod h1:jbNb22ebtupcjdhrdGq0VBew2vWG6VUK04xxGNDfynE= -github.com/jfrog/jfrog-cli-core/v2 v2.56.5 h1:jigHavEpmfBV5tRHkVSW4B/GG5F54UOdNEt2jVyP0qc= -github.com/jfrog/jfrog-cli-core/v2 v2.56.5/go.mod h1:XlN2hMNiNFeNM9aR8H29RZkenI39lDe+LE+BTm1dM6k= github.com/jfrog/jfrog-cli-platform-services v1.4.0 h1:g6A30+tOfXd1h6VASeNwH+5mhs5bPQJ0MFzZs/4nlvs= github.com/jfrog/jfrog-cli-platform-services v1.4.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= github.com/jfrog/jfrog-cli-security v1.12.4 h1:X36XIazDOH5YCGLx36QFDGTtvfJHixawakU601nYGmA= From 1f9fbfe433501a84da2b52d7ad938fad9e26d8bb Mon Sep 17 00:00:00 2001 From: delarea Date: Sun, 10 Nov 2024 14:19:53 +0200 Subject: [PATCH 2/8] Update core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7690817fa..6ad269bae 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241110113131-ec983f11abbf +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241110121622-f7a500b09bfa replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1 diff --git a/go.sum b/go.sum index eb116bf5c..f943082bb 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241110113131-ec983f11abbf h1:UL/rNJpjlklVlHmb077Gw/AU/t8zKmn1cLGCky9jWQ0= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241110113131-ec983f11abbf/go.mod h1:In9hwLK96tY8Vu79FvahRVpeiV3JCfz6qVtacA5yXfQ= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241110121622-f7a500b09bfa h1:l2rQqS2syNWVcXwCcwYtsMmtmV8BjU3KE6clbF1a6C4= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241110121622-f7a500b09bfa/go.mod h1:In9hwLK96tY8Vu79FvahRVpeiV3JCfz6qVtacA5yXfQ= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= From cc7df2c730cd56667dae9d5759d545e5debd8008 Mon Sep 17 00:00:00 2001 From: delarea Date: Mon, 11 Nov 2024 10:58:57 +0200 Subject: [PATCH 3/8] Update core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cb474727c..f3f59da33 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111071147-20ac5fff2d55 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111080023-43f02f99e66e replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1 diff --git a/go.sum b/go.sum index bf6baee89..cde0fceb3 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111071147-20ac5fff2d55 h1:wH3U5rzTkVddJgwkQBEI2I0QBdm9+OHgfXZv24ud2vQ= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111071147-20ac5fff2d55/go.mod h1:puLwWcnXYCJqUOvhscXRJiKNzPdj0adP+zadKy6A/gU= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111080023-43f02f99e66e h1:nN4R5RQBlZzWqDtxKGpicwqol+Fqp0Ck/CFV0pEGixo= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111080023-43f02f99e66e/go.mod h1:puLwWcnXYCJqUOvhscXRJiKNzPdj0adP+zadKy6A/gU= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= From 1cd675d0029a0b836be772c9b22da1dfd1ba2be4 Mon Sep 17 00:00:00 2001 From: delarea Date: Mon, 11 Nov 2024 11:08:20 +0200 Subject: [PATCH 4/8] Update jfrog-cli-security --- go.mod | 6 +++--- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f3f59da33..16204333e 100644 --- a/go.mod +++ b/go.mod @@ -19,9 +19,9 @@ require ( github.com/jfrog/build-info-go v1.10.5 github.com/jfrog/gofrog v1.7.6 github.com/jfrog/jfrog-cli-artifactory v0.1.6 - github.com/jfrog/jfrog-cli-core/v2 v2.56.5 + github.com/jfrog/jfrog-cli-core/v2 v2.56.7 github.com/jfrog/jfrog-cli-platform-services v1.4.0 - github.com/jfrog/jfrog-cli-security v1.12.4 + github.com/jfrog/jfrog-cli-security v1.12.5 github.com/jfrog/jfrog-client-go v1.47.6 github.com/jszwec/csvutil v1.10.0 github.com/manifoldco/promptui v0.9.0 @@ -169,7 +169,7 @@ require ( replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111080023-43f02f99e66e -replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1 +// replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1 // replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240918081224-1c584cc334c7 diff --git a/go.sum b/go.sum index cde0fceb3..0dbc1acfe 100644 --- a/go.sum +++ b/go.sum @@ -177,8 +177,8 @@ github.com/jfrog/jfrog-cli-artifactory v0.1.6 h1:bMfJsrLQJw0dZp4nqUf1xOmtY0rpCat github.com/jfrog/jfrog-cli-artifactory v0.1.6/go.mod h1:jbNb22ebtupcjdhrdGq0VBew2vWG6VUK04xxGNDfynE= github.com/jfrog/jfrog-cli-platform-services v1.4.0 h1:g6A30+tOfXd1h6VASeNwH+5mhs5bPQJ0MFzZs/4nlvs= github.com/jfrog/jfrog-cli-platform-services v1.4.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= -github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1 h1:xbyIbEI6CSX87TyokXfzlEfyMnHjS6xqD7zuV2dep6c= -github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1/go.mod h1:ZovKCEpt1eqQGiulh3H9+JmYgWR9r9qoKtOYiGb5eAs= +github.com/jfrog/jfrog-cli-security v1.12.5 h1:2JHPyapXuHQw/qEaElGxBUGrJCZlVFLXDdxkqhf10vE= +github.com/jfrog/jfrog-cli-security v1.12.5/go.mod h1:5LBGwth7TXkEH8MO0JJXvpoRktMAV2BK7Q5nQePNrv4= github.com/jfrog/jfrog-client-go v1.47.6 h1:nEMwJvjsuuY6LpOV3e33P4c4irPHkG8Qxw27bgeCl/Y= github.com/jfrog/jfrog-client-go v1.47.6/go.mod h1:jCpvS83DZHAin2aSG7VroTsILJsyq7AOcFfx++P241E= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= From ef1524447d4f02a6bb40ac290d10f77660cccca4 Mon Sep 17 00:00:00 2001 From: delarea Date: Mon, 11 Nov 2024 15:27:04 +0200 Subject: [PATCH 5/8] Update deps --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 16204333e..c86049c83 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111080023-43f02f99e66e +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111125614-c400da38ab4d // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1 diff --git a/go.sum b/go.sum index 0dbc1acfe..011807c51 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111080023-43f02f99e66e h1:nN4R5RQBlZzWqDtxKGpicwqol+Fqp0Ck/CFV0pEGixo= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111080023-43f02f99e66e/go.mod h1:puLwWcnXYCJqUOvhscXRJiKNzPdj0adP+zadKy6A/gU= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111125614-c400da38ab4d h1:sr61wimfBrPze83Jnbw3f/dK7ufgxOZZQW+f7IWW49s= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111125614-c400da38ab4d/go.mod h1:puLwWcnXYCJqUOvhscXRJiKNzPdj0adP+zadKy6A/gU= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= From bbd0021593933efff334031fe4a551a5a12df695 Mon Sep 17 00:00:00 2001 From: delarea Date: Wed, 13 Nov 2024 13:30:33 +0200 Subject: [PATCH 6/8] Update core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3fe20a42b..88ddd2ebc 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111125614-c400da38ab4d +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241113081925-d18831e4ca06 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.12.5-0.20241107141149-42cf964808a1 diff --git a/go.sum b/go.sum index 011807c51..c9f97d532 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111125614-c400da38ab4d h1:sr61wimfBrPze83Jnbw3f/dK7ufgxOZZQW+f7IWW49s= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241111125614-c400da38ab4d/go.mod h1:puLwWcnXYCJqUOvhscXRJiKNzPdj0adP+zadKy6A/gU= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241113081925-d18831e4ca06 h1:VAsNw7JrLzeJXjTMbuEO1igpmozCEZgrRNt/Y0Z/lJg= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20241113081925-d18831e4ca06/go.mod h1:puLwWcnXYCJqUOvhscXRJiKNzPdj0adP+zadKy6A/gU= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= From 20bae77ac0485c30e310141d05feac096b41c746 Mon Sep 17 00:00:00 2001 From: delarea Date: Wed, 13 Nov 2024 15:27:56 +0200 Subject: [PATCH 7/8] Set fixed .NET version to avoid nuget tests from crashing. --- .github/workflows/nugetTests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 98ca0e586..5c4b0cc7a 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -49,7 +49,7 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.x' + dotnet-version: '6.0.35' - name: Setup Go with cache uses: jfrog/.github/actions/install-go-with-cache@main From cccad07e473b1b5d510a477f40ff4ba5bcadff16 Mon Sep 17 00:00:00 2001 From: delarea Date: Wed, 13 Nov 2024 15:36:36 +0200 Subject: [PATCH 8/8] restore nugetTests.yml --- .github/workflows/nugetTests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 5c4b0cc7a..98ca0e586 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -49,7 +49,7 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.0.35' + dotnet-version: '6.x' - name: Setup Go with cache uses: jfrog/.github/actions/install-go-with-cache@main