From a98540a8d2a14b0a6272ffc85987118cbdcda7f4 Mon Sep 17 00:00:00 2001 From: Eran Turgeman Date: Thu, 16 Nov 2023 16:32:11 +0200 Subject: [PATCH 1/4] check all tests of cli --- artifactory_test.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/artifactory_test.go b/artifactory_test.go index 4330130a7..507a84a10 100644 --- a/artifactory_test.go +++ b/artifactory_test.go @@ -74,7 +74,7 @@ var platformCli *tests.JfrogCli var configCli *tests.JfrogCli var serverDetails *config.ServerDetails -var artAuth auth.ServiceDetails +var artAuth auth.ServiceDetails // ERAN NOTICE var artHttpDetails httputils.HttpClientDetails // Run `jfrog rt` command diff --git a/go.mod b/go.mod index 7fe0e0330..be22c3c32 100644 --- a/go.mod +++ b/go.mod @@ -129,9 +129,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20231107094842-97a0ca9da395 +replace github.com/jfrog/build-info-go => github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906 -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231105094115-13b1588fc537 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231116131420-066c55f07687 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 diff --git a/go.sum b/go.sum index a1346db72..31dbdcfbd 100644 --- a/go.sum +++ b/go.sum @@ -135,6 +135,10 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906 h1:pwUCEybjq3z07qGqUZJrwR/SRm5I1jRxwNCCHhdJPPQ= +github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906/go.mod h1:XVFk2rCYhIdc7+hIGE8TC3le5PPM+xYHU22udoE2b7Q= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231116131420-066c55f07687 h1:ogXDx171pXyPIh7gZlO2NnFqGxb01zmPVB+2vNe2r5Q= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231116131420-066c55f07687/go.mod h1:S+KpcxVw9O3jY1KtzvbFtnejinc4GgbykQNhLLtfR8I= github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ= github.com/forPelevin/gomoji v1.1.8/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+gL9NAwMXg= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= @@ -237,14 +241,10 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jedib0t/go-pretty/v6 v6.4.8 h1:HiNzyMSEpsBaduKhmK+CwcpulEeBrTmxutz4oX/oWkg= github.com/jedib0t/go-pretty/v6 v6.4.8/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs= -github.com/jfrog/build-info-go v1.9.15 h1:DN7DKZq6H5FlHfL3Lu8fo4t2INgczRgT09dJiZjJ1oo= -github.com/jfrog/build-info-go v1.9.15/go.mod h1:XVFk2rCYhIdc7+hIGE8TC3le5PPM+xYHU22udoE2b7Q= github.com/jfrog/gofrog v1.3.1 h1:QqAwQXCVReT724uga1AYqG/ZyrNQ6f+iTxmzkb+YFQk= github.com/jfrog/gofrog v1.3.1/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= 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-core/v2 v2.46.1 h1:4bkyykJk9OUJFXW44NmYGlOmhu6HVG43KUtY5p/wsQA= -github.com/jfrog/jfrog-cli-core/v2 v2.46.1/go.mod h1:S+KpcxVw9O3jY1KtzvbFtnejinc4GgbykQNhLLtfR8I= github.com/jfrog/jfrog-client-go v1.34.5 h1:NYZrOHvT5D5BwwHdArIz5WnbP+DPbADjV/SPdN33bfQ= github.com/jfrog/jfrog-client-go v1.34.5/go.mod h1:0PVhP6xGvBBaUzOU9LKf5OYkke/gY2IFILHA++iabFM= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= From 4fae8ba4f3db55aebd14b785c01c1f8749a17749 Mon Sep 17 00:00:00 2001 From: Eran Turgeman Date: Sun, 19 Nov 2023 15:02:06 +0200 Subject: [PATCH 2/4] go.mod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index be22c3c32..81ed848ad 100644 --- a/go.mod +++ b/go.mod @@ -131,7 +131,7 @@ require ( replace github.com/jfrog/build-info-go => github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906 -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231116131420-066c55f07687 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119111712-859fb87b344d // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 diff --git a/go.sum b/go.sum index 31dbdcfbd..407a97754 100644 --- a/go.sum +++ b/go.sum @@ -137,8 +137,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906 h1:pwUCEybjq3z07qGqUZJrwR/SRm5I1jRxwNCCHhdJPPQ= github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906/go.mod h1:XVFk2rCYhIdc7+hIGE8TC3le5PPM+xYHU22udoE2b7Q= -github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231116131420-066c55f07687 h1:ogXDx171pXyPIh7gZlO2NnFqGxb01zmPVB+2vNe2r5Q= -github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231116131420-066c55f07687/go.mod h1:S+KpcxVw9O3jY1KtzvbFtnejinc4GgbykQNhLLtfR8I= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119111712-859fb87b344d h1:tBxC1RrUNT70qRTqV+Mgbi2RE70EIhxpLeEdp/1rK+k= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119111712-859fb87b344d/go.mod h1:Le0qPGC9aQ09O+foL+vOG6lJP+fy1C/5yfxL7XzjYpg= github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ= github.com/forPelevin/gomoji v1.1.8/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+gL9NAwMXg= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= From ab7c55d46cb018eedc410de8dc40b100c526810b Mon Sep 17 00:00:00 2001 From: Eran Turgeman Date: Sun, 19 Nov 2023 16:04:21 +0200 Subject: [PATCH 3/4] go.mod --- go.mod | 6 +++++- go.sum | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 81ed848ad..d59963810 100644 --- a/go.mod +++ b/go.mod @@ -129,9 +129,13 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) +// replace github.com/jfrog/build-info-go => ../my-build-info-go + replace github.com/jfrog/build-info-go => github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906 -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119111712-859fb87b344d +// replace github.com/jfrog/jfrog-cli-core/v2 => ../jfrog-cli-core + +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119130137-84df74a66d58 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 diff --git a/go.sum b/go.sum index 407a97754..58a81efca 100644 --- a/go.sum +++ b/go.sum @@ -137,8 +137,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906 h1:pwUCEybjq3z07qGqUZJrwR/SRm5I1jRxwNCCHhdJPPQ= github.com/eranturgeman/build-info-go v0.0.0-20231115091829-c06560332906/go.mod h1:XVFk2rCYhIdc7+hIGE8TC3le5PPM+xYHU22udoE2b7Q= -github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119111712-859fb87b344d h1:tBxC1RrUNT70qRTqV+Mgbi2RE70EIhxpLeEdp/1rK+k= -github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119111712-859fb87b344d/go.mod h1:Le0qPGC9aQ09O+foL+vOG6lJP+fy1C/5yfxL7XzjYpg= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119130137-84df74a66d58 h1:ZaDqn3Pbl951xbF9pBPDLHslUQtCQ5h5rsm7u0Fpch8= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231119130137-84df74a66d58/go.mod h1:1BVxKY2Hv2RC+RSmwPq7Jj+orV0qSLYRbJBkp+w1Mr8= github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ= github.com/forPelevin/gomoji v1.1.8/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+gL9NAwMXg= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= From 4778b9b4fe3f54579fc575a592f84fe5211982d3 Mon Sep 17 00:00:00 2001 From: Eran Turgeman Date: Tue, 28 Nov 2023 10:52:38 +0200 Subject: [PATCH 4/4] . --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4de02791d..14173e550 100644 --- a/go.mod +++ b/go.mod @@ -129,9 +129,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20231126114158-b6719ec2da0e +replace github.com/jfrog/build-info-go => github.com/eranturgeman/build-info-go v0.0.0-20231127135014-abc1fcafffba -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231127135302-daea501a3826 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231128074945-718907a55c4e // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 diff --git a/go.sum b/go.sum index 8555bc9c4..f9f7990a2 100644 --- a/go.sum +++ b/go.sum @@ -135,6 +135,10 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/eranturgeman/build-info-go v0.0.0-20231127135014-abc1fcafffba h1:oCzV4Jb7mP7XEm9k8h99G4b3o/9eD9hULNIGLD/IZpo= +github.com/eranturgeman/build-info-go v0.0.0-20231127135014-abc1fcafffba/go.mod h1:XVFk2rCYhIdc7+hIGE8TC3le5PPM+xYHU22udoE2b7Q= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231128074945-718907a55c4e h1:loBJRWtBiTqPQHpii7/XPGGm9ePOwD9r0JwBsVbE8ow= +github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20231128074945-718907a55c4e/go.mod h1:zNXux8ZH0E73Sxvyo+VD3oDgL3ZZByvEShOm6w3ybT8= github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ= github.com/forPelevin/gomoji v1.1.8/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+gL9NAwMXg= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= @@ -237,14 +241,10 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jedib0t/go-pretty/v6 v6.4.8 h1:HiNzyMSEpsBaduKhmK+CwcpulEeBrTmxutz4oX/oWkg= github.com/jedib0t/go-pretty/v6 v6.4.8/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs= -github.com/jfrog/build-info-go v1.8.9-0.20231126114158-b6719ec2da0e h1:NpRjkc8tuCZYRDZ90H0/5EIRgujvV7f9bVm7S+KTpDA= -github.com/jfrog/build-info-go v1.8.9-0.20231126114158-b6719ec2da0e/go.mod h1:XVFk2rCYhIdc7+hIGE8TC3le5PPM+xYHU22udoE2b7Q= github.com/jfrog/gofrog v1.3.1 h1:QqAwQXCVReT724uga1AYqG/ZyrNQ6f+iTxmzkb+YFQk= github.com/jfrog/gofrog v1.3.1/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= 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-core/v2 v2.31.1-0.20231127135302-daea501a3826 h1:N49B28/2uy2+Rm2djugMrQ0yvgruLqudsJRIqaLMAIc= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20231127135302-daea501a3826/go.mod h1:gsB5hTyVwtwZDHvwcKxO6BnLgLbBVy+EcRTf/D5dNo8= github.com/jfrog/jfrog-client-go v1.28.1-0.20231126134442-14887b84b87a h1:hZFfT7i+vwhDhJ7xf211XbS9uxjR83vC618di1Eo0wo= github.com/jfrog/jfrog-client-go v1.28.1-0.20231126134442-14887b84b87a/go.mod h1:0PVhP6xGvBBaUzOU9LKf5OYkke/gY2IFILHA++iabFM= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=