From bd80ddd505fb02202853e0a440250efa49a81c9b Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 25 Aug 2024 11:59:37 +0300 Subject: [PATCH 01/36] metadata Signed-off-by: Michael Sverdlov --- artifactory/commands/repository/repository.go | 2 ++ artifactory/commands/repository/template.go | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/artifactory/commands/repository/repository.go b/artifactory/commands/repository/repository.go index 05e407872..bd5ad71af 100644 --- a/artifactory/commands/repository/repository.go +++ b/artifactory/commands/repository/repository.go @@ -102,6 +102,8 @@ var writersMap = map[string]ioutils.AnswerWriter{ SuppressPomConsistencyChecks: ioutils.WriteBoolAnswer, BlackedOut: ioutils.WriteBoolAnswer, DownloadRedirect: ioutils.WriteBoolAnswer, + PriorityResolution: ioutils.WriteBoolAnswer, + CdnRedirect: ioutils.WriteBoolAnswer, BlockPushingSchema1: ioutils.WriteBoolAnswer, DebianTrivialLayout: ioutils.WriteBoolAnswer, ExternalDependenciesEnabled: ioutils.WriteBoolAnswer, diff --git a/artifactory/commands/repository/template.go b/artifactory/commands/repository/template.go index f046b1041..e9e7ed774 100644 --- a/artifactory/commands/repository/template.go +++ b/artifactory/commands/repository/template.go @@ -50,6 +50,8 @@ const ( XrayIndex = "xrayIndex" PropertySets = "propertySets" DownloadRedirect = "downloadRedirect" + PriorityResolution = "priorityResolution" + CdnRedirect = "cdnRedirect" BlockPushingSchema1 = "blockPushingSchema1" // Mutual local and virtual repository configuration JSON keys @@ -235,6 +237,8 @@ var optionalSuggestsMap = map[string]prompt.Suggest{ SuppressPomConsistencyChecks: {Text: SuppressPomConsistencyChecks}, BlackedOut: {Text: BlackedOut}, DownloadRedirect: {Text: DownloadRedirect}, + PriorityResolution: {Text: PriorityResolution}, + CdnRedirect: {Text: CdnRedirect}, BlockPushingSchema1: {Text: BlockPushingSchema1}, DebianTrivialLayout: {Text: DebianTrivialLayout}, ExternalDependenciesEnabled: {Text: ExternalDependenciesEnabled}, @@ -302,7 +306,7 @@ var optionalSuggestsMap = map[string]prompt.Suggest{ var baseLocalRepoConfKeys = []string{ Description, Notes, IncludePatterns, ExcludePatterns, RepoLayoutRef, ProjectKey, Environment, BlackedOut, XrayIndex, - PropertySets, ArchiveBrowsingEnabled, OptionalIndexCompressionFormats, DownloadRedirect, BlockPushingSchema1, + PropertySets, ArchiveBrowsingEnabled, OptionalIndexCompressionFormats, DownloadRedirect, PriorityResolution, CdnRedirect, BlockPushingSchema1, } var mavenGradleLocalRepoConfKeys = []string{ @@ -330,7 +334,7 @@ var baseRemoteRepoConfKeys = []string{ BlackedOut, XrayIndex, StoreArtifactsLocally, SocketTimeoutMillis, LocalAddress, RetrievalCachePeriodSecs, FailedRetrievalCachePeriodSecs, MissedRetrievalCachePeriodSecs, UnusedArtifactsCleanupEnabled, UnusedArtifactsCleanupPeriodHours, AssumedOfflinePeriodSecs, ShareConfiguration, SynchronizeProperties, BlockMismatchingMimeTypes, PropertySets, AllowAnyHostAuth, EnableCookieManagement, - BypassHeadRequests, ClientTlsCertificate, DownloadRedirect, BlockPushingSchema1, ContentSynchronisation, + BypassHeadRequests, ClientTlsCertificate, DownloadRedirect, PriorityResolution, CdnRedirect, BlockPushingSchema1, ContentSynchronisation, } var mavenGradleRemoteRepoConfKeys = []string{ @@ -815,6 +819,8 @@ var questionMap = map[string]ioutils.QuestionInfo{ SuppressPomConsistencyChecks: BoolToStringQuestionInfo, BlackedOut: BoolToStringQuestionInfo, DownloadRedirect: BoolToStringQuestionInfo, + PriorityResolution: BoolToStringQuestionInfo, + CdnRedirect: BoolToStringQuestionInfo, BlockPushingSchema1: BoolToStringQuestionInfo, DebianTrivialLayout: BoolToStringQuestionInfo, ExternalDependenciesEnabled: BoolToStringQuestionInfo, From 596a766f5d17452488b19bc7db9c67c844a7b492 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 25 Aug 2024 15:04:21 +0300 Subject: [PATCH 02/36] metadata Signed-off-by: Michael Sverdlov --- .../commands/transferfiles/localgeneratedfilter.go | 2 +- artifactory/commands/transferfiles/srcpluginservice.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/artifactory/commands/transferfiles/localgeneratedfilter.go b/artifactory/commands/transferfiles/localgeneratedfilter.go index eaac899b6..768b14c63 100644 --- a/artifactory/commands/transferfiles/localgeneratedfilter.go +++ b/artifactory/commands/transferfiles/localgeneratedfilter.go @@ -41,7 +41,7 @@ type locallyGeneratedFilter struct { func NewLocallyGenerated(context context.Context, serviceManager artifactory.ArtifactoryServicesManager, artifactoryVersion string) *locallyGeneratedFilter { serviceDetails := serviceManager.GetConfig().GetServiceDetails() httpDetails := serviceDetails.CreateHttpClientDetails() - utils.SetContentType("application/json", &httpDetails.Headers) + httpDetails.SetContentTypeApplicationJson() enabled := version.NewVersion(artifactoryVersion).AtLeast(minArtifactoryVersionForLocallyGenerated) log.Debug("Locally generated filter enabled:", enabled) diff --git a/artifactory/commands/transferfiles/srcpluginservice.go b/artifactory/commands/transferfiles/srcpluginservice.go index f28875008..f7a6878b3 100644 --- a/artifactory/commands/transferfiles/srcpluginservice.go +++ b/artifactory/commands/transferfiles/srcpluginservice.go @@ -4,7 +4,6 @@ import ( "encoding/json" "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferfiles/api" commandsUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils" - "github.com/jfrog/jfrog-client-go/artifactory/services/utils" "github.com/jfrog/jfrog-client-go/auth" "github.com/jfrog/jfrog-client-go/http/jfroghttpclient" "github.com/jfrog/jfrog-client-go/utils/errorutils" @@ -49,7 +48,7 @@ func (sup *srcUserPluginService) syncChunks(ucStatus api.UploadChunksStatusBody) } httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails() - utils.SetContentType("application/json", &httpDetails.Headers) + httpDetails.SetContentTypeApplicationJson() resp, body, err := sup.client.SendPost(sup.GetArtifactoryDetails().GetUrl()+commandsUtils.PluginsExecuteRestApi+syncChunks, content, &httpDetails) if err != nil { return api.UploadChunksStatusResponse{}, err @@ -76,7 +75,7 @@ func (sup *srcUserPluginService) uploadChunk(chunk api.UploadChunk) (uploadChunk } httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails() - utils.SetContentType("application/json", &httpDetails.Headers) + httpDetails.SetContentTypeApplicationJson() resp, body, err := sup.client.SendPost(sup.GetArtifactoryDetails().GetUrl()+commandsUtils.PluginsExecuteRestApi+uploadChunk, content, &httpDetails) if err != nil { return api.UploadChunkResponse{}, err @@ -108,7 +107,7 @@ func (sup *srcUserPluginService) version() (string, error) { func (sup *srcUserPluginService) verifyCompatibilityRequest() (*VerifyCompatibilityResponse, error) { httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails() - utils.SetContentType("application/json", &httpDetails.Headers) + httpDetails.SetContentTypeApplicationJson() resp, body, err := sup.client.SendPost(sup.GetArtifactoryDetails().GetUrl()+commandsUtils.PluginsExecuteRestApi+"verifyCompatibility", []byte("{}"), &httpDetails) if err != nil { return nil, err @@ -130,7 +129,8 @@ func (sup *srcUserPluginService) verifyCompatibilityRequest() (*VerifyCompatibil func (sup *srcUserPluginService) verifyConnectivityRequest(targetAuth api.TargetAuth) error { httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails() - utils.SetContentType("application/json", &httpDetails.Headers) + httpDetails.SetContentTypeApplicationJson() + httpDetails.SetContentTypeApplicationJson() content, err := json.Marshal(targetAuth) if err != nil { return errorutils.CheckError(err) From 35659834c8e9359643a05e45b1c0d670bca94ba8 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 28 Aug 2024 13:36:19 +0300 Subject: [PATCH 03/36] metadata Signed-off-by: Michael Sverdlov --- artifactory/commands/transferfiles/srcpluginservice.go | 1 - 1 file changed, 1 deletion(-) diff --git a/artifactory/commands/transferfiles/srcpluginservice.go b/artifactory/commands/transferfiles/srcpluginservice.go index f7a6878b3..ab605b680 100644 --- a/artifactory/commands/transferfiles/srcpluginservice.go +++ b/artifactory/commands/transferfiles/srcpluginservice.go @@ -130,7 +130,6 @@ func (sup *srcUserPluginService) verifyCompatibilityRequest() (*VerifyCompatibil func (sup *srcUserPluginService) verifyConnectivityRequest(targetAuth api.TargetAuth) error { httpDetails := sup.GetArtifactoryDetails().CreateHttpClientDetails() httpDetails.SetContentTypeApplicationJson() - httpDetails.SetContentTypeApplicationJson() content, err := json.Marshal(targetAuth) if err != nil { return errorutils.CheckError(err) From e92075ba3e5192c96a965c5539bc3d4be469bd87 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 28 Aug 2024 13:37:54 +0300 Subject: [PATCH 04/36] metadata Signed-off-by: Michael Sverdlov --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index b50d6819f..e501f1f8e 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/urfave/cli v1.22.15 - github.com/vbauerster/mpb/v8 v8.7.5 - golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa + github.com/vbauerster/mpb/v8 v8.8.3 + golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 golang.org/x/mod v0.20.0 golang.org/x/sync v0.8.0 golang.org/x/term v0.23.0 @@ -90,7 +90,7 @@ require ( go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.26.0 // indirect golang.org/x/net v0.28.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.24.0 // indirect golang.org/x/tools v0.24.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index d60bdf980..210f7855f 100644 --- a/go.sum +++ b/go.sum @@ -205,8 +205,8 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM= github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0= -github.com/vbauerster/mpb/v8 v8.7.5 h1:hUF3zaNsuaBBwzEFoCvfuX3cpesQXZC0Phm/JcHZQ+c= -github.com/vbauerster/mpb/v8 v8.7.5/go.mod h1:bRCnR7K+mj5WXKsy0NWB6Or+wctYGvVwKn6huwvxKa0= +github.com/vbauerster/mpb/v8 v8.8.3 h1:dTOByGoqwaTJYPubhVz3lO5O6MK553XVgUo33LdnNsQ= +github.com/vbauerster/mpb/v8 v8.8.3/go.mod h1:JfCCrtcMsJwP6ZwMn9e5LMnNyp3TVNpUWWkN+nd4EWk= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= @@ -231,8 +231,8 @@ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2Uz golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= @@ -277,8 +277,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= From 0646e8eeb28bcfc78c9a1874add7ede352325d72 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 29 Aug 2024 13:39:06 +0300 Subject: [PATCH 05/36] metadata Signed-off-by: Michael Sverdlov --- plugins/pluginmain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pluginmain.go b/plugins/pluginmain.go index 50b1b7575..9cf539d3d 100644 --- a/plugins/pluginmain.go +++ b/plugins/pluginmain.go @@ -72,7 +72,7 @@ func RunCliWithPlugin(jfrogApp components.App) func() error { err = baseApp.Run(args) if cleanupErr := fileutils.CleanOldDirs(); cleanupErr != nil { - clientLog.Warn(cleanupErr) + clientLog.Warn("failed while attempting to cleanup old CLI temp directories:", cleanupErr) } return err From 12bee924db5aa078177b64303a063215f3efad26 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 5 Sep 2024 13:06:19 +0300 Subject: [PATCH 06/36] metadata Signed-off-by: Michael Sverdlov --- go.mod | 12 ++++++------ go.sum | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 3f6aa6d9c..aa7838105 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jfrog/jfrog-cli-core/v2 -go 1.22.3 +go 1.22.6 require github.com/c-bata/go-prompt v0.2.5 // Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372) @@ -22,11 +22,11 @@ require ( github.com/stretchr/testify v1.9.0 github.com/urfave/cli v1.22.15 github.com/vbauerster/mpb/v8 v8.8.3 - golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 - golang.org/x/mod v0.20.0 + golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e + golang.org/x/mod v0.21.0 golang.org/x/sync v0.8.0 - golang.org/x/term v0.23.0 - golang.org/x/text v0.17.0 + golang.org/x/term v0.24.0 + golang.org/x/text v0.18.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -90,7 +90,7 @@ require ( go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.26.0 // indirect golang.org/x/net v0.28.0 // indirect - golang.org/x/sys v0.24.0 // indirect + golang.org/x/sys v0.25.0 // indirect golang.org/x/tools v0.24.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index c48003efc..00feaec12 100644 --- a/go.sum +++ b/go.sum @@ -231,12 +231,12 @@ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2Uz golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -277,15 +277,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -293,8 +293,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From ea701bfbb2540830f8ef6ae7dc2f1e94a64287fe Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 5 Sep 2024 13:41:42 +0300 Subject: [PATCH 07/36] metadata Signed-off-by: Michael Sverdlov --- .../commands/utils/precheckrunner/checkrunner_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/artifactory/commands/utils/precheckrunner/checkrunner_test.go b/artifactory/commands/utils/precheckrunner/checkrunner_test.go index 476f3eea6..6d2815573 100644 --- a/artifactory/commands/utils/precheckrunner/checkrunner_test.go +++ b/artifactory/commands/utils/precheckrunner/checkrunner_test.go @@ -19,8 +19,8 @@ func TestChecks(t *testing.T) { func TestRunChecks(t *testing.T) { // Init expectedErr := fmt.Errorf("CHECK_ERROR") - nSuccess := 3 - nFail := 2 + nSuccess := uint(3) + nFail := uint(2) runner := NewPreChecksRunner() successCheck := NewCheck("success", func(args RunArguments) (bool, error) { return true, nil @@ -34,12 +34,12 @@ func TestRunChecks(t *testing.T) { // Empty runAndAssert(t, 0, 0, nil, runner) // With checks - for i := 0; i < nSuccess; i++ { + for i := uint(0); i < nSuccess; i++ { runner.AddCheck(successCheck) } runAndAssert(t, uint(nSuccess), 0, nil, runner) // With failed checks - for i := 0; i < nFail; i++ { + for i := uint(0); i < nFail; i++ { runner.AddCheck(failCheck) } runAndAssert(t, uint(nSuccess), uint(nFail), nil, runner) From 2a13aa6b01e994ec590afa5fe724cc89f0371033 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 8 Sep 2024 13:37:45 +0300 Subject: [PATCH 08/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/commands/utils/precheckrunner/checkrunner_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artifactory/commands/utils/precheckrunner/checkrunner_test.go b/artifactory/commands/utils/precheckrunner/checkrunner_test.go index 6d2815573..78b6a6d99 100644 --- a/artifactory/commands/utils/precheckrunner/checkrunner_test.go +++ b/artifactory/commands/utils/precheckrunner/checkrunner_test.go @@ -37,12 +37,12 @@ func TestRunChecks(t *testing.T) { for i := uint(0); i < nSuccess; i++ { runner.AddCheck(successCheck) } - runAndAssert(t, uint(nSuccess), 0, nil, runner) + runAndAssert(t, nSuccess, 0, nil, runner) // With failed checks for i := uint(0); i < nFail; i++ { runner.AddCheck(failCheck) } - runAndAssert(t, uint(nSuccess), uint(nFail), nil, runner) + runAndAssert(t, nSuccess, uint(nFail), nil, runner) // With check that has error runner.AddCheck(errCheck) runAndAssert(t, 0, 0, expectedErr, runner) From cac58da63e0a4a76c407b22478423fa40c367fb6 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 8 Sep 2024 13:39:44 +0300 Subject: [PATCH 09/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/commands/utils/precheckrunner/checkrunner_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifactory/commands/utils/precheckrunner/checkrunner_test.go b/artifactory/commands/utils/precheckrunner/checkrunner_test.go index 78b6a6d99..1c2c95489 100644 --- a/artifactory/commands/utils/precheckrunner/checkrunner_test.go +++ b/artifactory/commands/utils/precheckrunner/checkrunner_test.go @@ -42,7 +42,7 @@ func TestRunChecks(t *testing.T) { for i := uint(0); i < nFail; i++ { runner.AddCheck(failCheck) } - runAndAssert(t, nSuccess, uint(nFail), nil, runner) + runAndAssert(t, nSuccess, nFail, nil, runner) // With check that has error runner.AddCheck(errCheck) runAndAssert(t, 0, 0, expectedErr, runner) From 3a3fe87d2220320707818c471aff69aebd7e01ab Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 8 Sep 2024 18:28:38 +0300 Subject: [PATCH 10/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/coreutils/tableutils.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/coreutils/tableutils.go b/utils/coreutils/tableutils.go index cfa3a3eb1..8f4f8c967 100644 --- a/utils/coreutils/tableutils.go +++ b/utils/coreutils/tableutils.go @@ -153,7 +153,7 @@ func PrepareTable(rows interface{}, emptyTableMessage string, printExtended bool rowsSliceValue := reflect.ValueOf(rows) if rowsSliceValue.Len() == 0 && emptyTableMessage != "" { - PrintMessage(emptyTableMessage) + PrintMessageInsideFrame(emptyTableMessage, "") return nil, nil } @@ -370,9 +370,10 @@ type embeddedTableCell struct { // ┌─────────────────────────────────────────┐ // │ An example of a message in a nice frame │ // └─────────────────────────────────────────┘ -func PrintMessage(message string) { +func PrintMessageInsideFrame(message, paddingLeft string) { tableWriter := table.NewWriter() tableWriter.SetOutputMirror(os.Stdout) + tableWriter.Style().Box.PaddingLeft = paddingLeft if log.IsStdOutTerminal() { tableWriter.SetStyle(table.StyleLight) } From ed6b3d26028bd97a7cc9dee42ddb6219de6b9751 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 8 Sep 2024 18:29:35 +0300 Subject: [PATCH 11/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/coreutils/tableutils.go | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/coreutils/tableutils.go b/utils/coreutils/tableutils.go index 8f4f8c967..e15aaecf6 100644 --- a/utils/coreutils/tableutils.go +++ b/utils/coreutils/tableutils.go @@ -373,6 +373,7 @@ type embeddedTableCell struct { func PrintMessageInsideFrame(message, paddingLeft string) { tableWriter := table.NewWriter() tableWriter.SetOutputMirror(os.Stdout) + // Set padding left for the whole frame (for example, " "). tableWriter.Style().Box.PaddingLeft = paddingLeft if log.IsStdOutTerminal() { tableWriter.SetStyle(table.StyleLight) From 45b1e1851eb687a83a83fbc40a3c7066575ff1a7 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 8 Sep 2024 18:30:53 +0300 Subject: [PATCH 12/36] Remove redundant log Signed-off-by: Michael Sverdlov --- .../utils/precheckrunner/checkrunner_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/artifactory/commands/utils/precheckrunner/checkrunner_test.go b/artifactory/commands/utils/precheckrunner/checkrunner_test.go index 1c2c95489..476f3eea6 100644 --- a/artifactory/commands/utils/precheckrunner/checkrunner_test.go +++ b/artifactory/commands/utils/precheckrunner/checkrunner_test.go @@ -19,8 +19,8 @@ func TestChecks(t *testing.T) { func TestRunChecks(t *testing.T) { // Init expectedErr := fmt.Errorf("CHECK_ERROR") - nSuccess := uint(3) - nFail := uint(2) + nSuccess := 3 + nFail := 2 runner := NewPreChecksRunner() successCheck := NewCheck("success", func(args RunArguments) (bool, error) { return true, nil @@ -34,15 +34,15 @@ func TestRunChecks(t *testing.T) { // Empty runAndAssert(t, 0, 0, nil, runner) // With checks - for i := uint(0); i < nSuccess; i++ { + for i := 0; i < nSuccess; i++ { runner.AddCheck(successCheck) } - runAndAssert(t, nSuccess, 0, nil, runner) + runAndAssert(t, uint(nSuccess), 0, nil, runner) // With failed checks - for i := uint(0); i < nFail; i++ { + for i := 0; i < nFail; i++ { runner.AddCheck(failCheck) } - runAndAssert(t, nSuccess, nFail, nil, runner) + runAndAssert(t, uint(nSuccess), uint(nFail), nil, runner) // With check that has error runner.AddCheck(errCheck) runAndAssert(t, 0, 0, expectedErr, runner) From c5eaad262a7df861e52b7a0b32367a3a5f415ba5 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 8 Sep 2024 18:32:48 +0300 Subject: [PATCH 13/36] Remove redundant log Signed-off-by: Michael Sverdlov --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index aa7838105..6809cd928 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240827071113-de462dc3df22 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240908122644-4c2f1732a6de // replace github.com/jfrog/build-info-go => github.com/asafambar/build-info-go v1.8.9-0.20240819133117-c3f52700927d diff --git a/go.sum b/go.sum index 00feaec12..63969adcb 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/jfrog/build-info-go v1.9.35 h1:P53Ckbuin0GYrq0LWMY0GZSptJcQwiUyW6lqTb github.com/jfrog/build-info-go v1.9.35/go.mod h1:6mdtqjREK76bHNODXakqKR/+ksJ9dvfLS7H57BZtnLY= github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg= github.com/jfrog/gofrog v1.7.5/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298= -github.com/jfrog/jfrog-client-go v1.46.1 h1:ExqOF8ClOG9LO3vbm6jTIwQHHhprbu8lxB2RrM6mMI0= -github.com/jfrog/jfrog-client-go v1.46.1/go.mod h1:UCu2JNBfMp9rypEmCL84DCooG79xWIHVadZQR3Ab+BQ= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240908122644-4c2f1732a6de h1:MykpEjOmSQBcnob/I83ffZ2AEUflEdy0liKWq00ROw8= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240908122644-4c2f1732a6de/go.mod h1:UCu2JNBfMp9rypEmCL84DCooG79xWIHVadZQR3Ab+BQ= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= From 0d0241aa8d7b08c895f053c0fe7cfe53f1c7a2b5 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 8 Sep 2024 18:54:14 +0300 Subject: [PATCH 14/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/coreutils/tableutils.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/utils/coreutils/tableutils.go b/utils/coreutils/tableutils.go index e15aaecf6..a9fd28fa4 100644 --- a/utils/coreutils/tableutils.go +++ b/utils/coreutils/tableutils.go @@ -370,14 +370,18 @@ type embeddedTableCell struct { // ┌─────────────────────────────────────────┐ // │ An example of a message in a nice frame │ // └─────────────────────────────────────────┘ -func PrintMessageInsideFrame(message, paddingLeft string) { +func PrintMessageInsideFrame(message, marginLeft string) { tableWriter := table.NewWriter() tableWriter.SetOutputMirror(os.Stdout) - // Set padding left for the whole frame (for example, " "). - tableWriter.Style().Box.PaddingLeft = paddingLeft if log.IsStdOutTerminal() { tableWriter.SetStyle(table.StyleLight) } + + // Set margin left for the whole frame (for example, " "). + tableWriter.Style().Box.Left = marginLeft + tableWriter.Style().Box.Left + tableWriter.Style().Box.TopLeft = marginLeft + tableWriter.Style().Box.TopLeft + tableWriter.Style().Box.BottomLeft = marginLeft + tableWriter.Style().Box.BottomLeft + // Remove emojis from non-supported terminals message = RemoveEmojisIfNonSupportedTerminal(message) tableWriter.AppendRow(table.Row{message}) From 9f04ee34230e5c435924894cfa2c9eb8627b20bb Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 9 Sep 2024 14:42:50 +0300 Subject: [PATCH 15/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/coreutils/tableutils.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/coreutils/tableutils.go b/utils/coreutils/tableutils.go index a9fd28fa4..ebccc161a 100644 --- a/utils/coreutils/tableutils.go +++ b/utils/coreutils/tableutils.go @@ -367,9 +367,15 @@ type embeddedTableCell struct { // PrintMessage prints message in a frame (which is actually a table with a single table). // For example: +// // ┌─────────────────────────────────────────┐ // │ An example of a message in a nice frame │ // └─────────────────────────────────────────┘ +// With a margin left of 4 spaces: +// +// ┌─────────────────────────────────────────┐ +// │ An example of a message in a nice frame │ +// └─────────────────────────────────────────┘ func PrintMessageInsideFrame(message, marginLeft string) { tableWriter := table.NewWriter() tableWriter.SetOutputMirror(os.Stdout) From 2e464c7b57891818cc44cac18bc81baaf11ac281 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 9 Sep 2024 14:44:32 +0300 Subject: [PATCH 16/36] Remove redundant log Signed-off-by: Michael Sverdlov --- go.sum | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/go.sum b/go.sum index 63969adcb..e532a40f9 100644 --- a/go.sum +++ b/go.sum @@ -92,12 +92,12 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+ github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.9.35 h1:P53Ckbuin0GYrq0LWMY0GZSptJcQwiUyW6lqTbXKdcc= -github.com/jfrog/build-info-go v1.9.35/go.mod h1:6mdtqjREK76bHNODXakqKR/+ksJ9dvfLS7H57BZtnLY= -github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg= -github.com/jfrog/gofrog v1.7.5/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240908122644-4c2f1732a6de h1:MykpEjOmSQBcnob/I83ffZ2AEUflEdy0liKWq00ROw8= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240908122644-4c2f1732a6de/go.mod h1:UCu2JNBfMp9rypEmCL84DCooG79xWIHVadZQR3Ab+BQ= +github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 h1:o2n/rPreikzB5SiUi3CNhGTd3X38RB/HVDwgRgkxwTU= +github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051/go.mod h1:EAFjxiqnl9z+qxUQO70VF2eRtNk46/v7AseggYRIWhQ= +github.com/jfrog/gofrog v1.7.6-0.20240909061051-2d36ae4bd05a h1:ob6H7NKKSqbQhSeDY6wB6k3erv0OAyujW0aahueR0Os= +github.com/jfrog/gofrog v1.7.6-0.20240909061051-2d36ae4bd05a/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240909074512-80b75868fb47 h1:n3o3A+LY2RI+DFYjQmgMO9q3nKYQHWJ3Wm0hP/j7txA= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240909074512-80b75868fb47/go.mod h1:tG2smtlgGUOH0peapet8JJxaSezOws4tSk58l6P1UJI= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= From 099ae817909cd9505f9bb1e7d8ba21030880d8aa Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 9 Sep 2024 16:15:00 +0300 Subject: [PATCH 17/36] Remove redundant log Signed-off-by: Michael Sverdlov --- go.mod | 18 +++++++++--------- go.sum | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 09e4b2cdf..b401b38a1 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/google/uuid v1.6.0 github.com/gookit/color v1.5.4 github.com/jedib0t/go-pretty/v6 v6.5.9 - github.com/jfrog/build-info-go v1.9.35 - github.com/jfrog/gofrog v1.7.5 - github.com/jfrog/jfrog-client-go v1.46.1 + github.com/jfrog/build-info-go v1.9.36 + github.com/jfrog/gofrog v1.7.6 + github.com/jfrog/jfrog-client-go v1.46.2 github.com/magiconair/properties v1.8.7 github.com/manifoldco/promptui v0.9.0 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c @@ -88,7 +88,7 @@ require ( github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.27.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/tools v0.24.0 // indirect @@ -96,8 +96,8 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240909074512-80b75868fb47 - -replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 - -replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.7.6-0.20240909061051-2d36ae4bd05a +//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240909074512-80b75868fb47 +// +//replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 +// +//replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.7.6-0.20240909061051-2d36ae4bd05a diff --git a/go.sum b/go.sum index e532a40f9..baa068d0e 100644 --- a/go.sum +++ b/go.sum @@ -92,12 +92,12 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+ github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 h1:o2n/rPreikzB5SiUi3CNhGTd3X38RB/HVDwgRgkxwTU= -github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051/go.mod h1:EAFjxiqnl9z+qxUQO70VF2eRtNk46/v7AseggYRIWhQ= -github.com/jfrog/gofrog v1.7.6-0.20240909061051-2d36ae4bd05a h1:ob6H7NKKSqbQhSeDY6wB6k3erv0OAyujW0aahueR0Os= -github.com/jfrog/gofrog v1.7.6-0.20240909061051-2d36ae4bd05a/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240909074512-80b75868fb47 h1:n3o3A+LY2RI+DFYjQmgMO9q3nKYQHWJ3Wm0hP/j7txA= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240909074512-80b75868fb47/go.mod h1:tG2smtlgGUOH0peapet8JJxaSezOws4tSk58l6P1UJI= +github.com/jfrog/build-info-go v1.9.36 h1:bKoYW3o+U70Zbz2kt5NT84N5JWNxdDXHOf+kVdzK+j4= +github.com/jfrog/build-info-go v1.9.36/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= +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-client-go v1.46.2 h1:1rk7PliYGc7zVSFVE2/RO77JOR1KdEtr28os8GQiLyI= +github.com/jfrog/jfrog-client-go v1.46.2/go.mod h1:qtQ9ML8xrRJmUwU/t6QRsov7C5mIZndTDY3qulgB5hA= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -229,8 +229,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= From 4edd481b078cfe503f2c55eabb4a56a4ea13065e Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 12 Sep 2024 17:11:58 +0300 Subject: [PATCH 18/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/progressbar/progressbarmng.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/progressbar/progressbarmng.go b/utils/progressbar/progressbarmng.go index 7f43b168c..c2c1bd1b0 100644 --- a/utils/progressbar/progressbarmng.go +++ b/utils/progressbar/progressbarmng.go @@ -320,7 +320,8 @@ func barStyle(isGeneral bool) mpb.BarStyleComposer { filler = "🟩" } } - return mpb.BarStyle().Lbound("[").Filler(filler).Tip(filler).Padding(padding).Refiller("").Rbound("]") + // Should look like this at the beginning: [🟩 ] and then [🟩🟩 ] and so on... + return mpb.BarStyle().Lbound("[" + filler).Filler(filler).Tip(filler).Padding(padding).Refiller("").Rbound("]") } // The ShouldInitProgressBar func is used to determine whether the progress bar should be displayed. From b6121000e89810f2a551881e93adefbdd986d149 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 12 Sep 2024 17:12:15 +0300 Subject: [PATCH 19/36] Remove redundant log Signed-off-by: Michael Sverdlov --- go.mod | 8 ++++---- go.sum | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index b401b38a1..76d2f3a50 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jfrog/jfrog-cli-core/v2 -go 1.22.6 +go 1.22.7 require github.com/c-bata/go-prompt v0.2.5 // Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372) @@ -22,7 +22,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/urfave/cli v1.22.15 github.com/vbauerster/mpb/v8 v8.8.3 - golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 golang.org/x/mod v0.21.0 golang.org/x/sync v0.8.0 golang.org/x/term v0.24.0 @@ -89,9 +89,9 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.27.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.29.0 // indirect golang.org/x/sys v0.25.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/tools v0.25.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index baa068d0e..ae672e64d 100644 --- a/go.sum +++ b/go.sum @@ -231,8 +231,8 @@ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2Uz golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= -golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= -golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= @@ -244,8 +244,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -299,8 +299,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 5c3a7f7bac7cd1856949c66d21bee91d0fd5636a Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 12 Sep 2024 17:17:13 +0300 Subject: [PATCH 20/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/progressbar/progressbarmng.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/progressbar/progressbarmng.go b/utils/progressbar/progressbarmng.go index c2c1bd1b0..3aac3c9de 100644 --- a/utils/progressbar/progressbarmng.go +++ b/utils/progressbar/progressbarmng.go @@ -320,7 +320,7 @@ func barStyle(isGeneral bool) mpb.BarStyleComposer { filler = "🟩" } } - // Should look like this at the beginning: [🟩 ] and then [🟩🟩 ] and so on... + // Should look like this at the beginning: [🟦 ] and then [🟦🟦 ] and so on... return mpb.BarStyle().Lbound("[" + filler).Filler(filler).Tip(filler).Padding(padding).Refiller("").Rbound("]") } From d6dbc56390bfff1ed92908c00d7c24058bb0e2a4 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 12 Sep 2024 17:18:41 +0300 Subject: [PATCH 21/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/progressbar/progressbarmng.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/progressbar/progressbarmng.go b/utils/progressbar/progressbarmng.go index 3aac3c9de..13ed9c8b9 100644 --- a/utils/progressbar/progressbarmng.go +++ b/utils/progressbar/progressbarmng.go @@ -320,7 +320,8 @@ func barStyle(isGeneral bool) mpb.BarStyleComposer { filler = "🟩" } } - // Should look like this at the beginning: [🟦 ] and then [🟦🟦 ] and so on... + // Should look like this at the beginning: [🟦 ] and then [🟦🟦 ] and so on. + // Or like this for windows: [●..........] and then [●●.........] and so on. return mpb.BarStyle().Lbound("[" + filler).Filler(filler).Tip(filler).Padding(padding).Refiller("").Rbound("]") } From d3bfe1136877128b06ef8d8eec9c56ad1e06ce9f Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 12 Sep 2024 17:19:08 +0300 Subject: [PATCH 22/36] Remove redundant log Signed-off-by: Michael Sverdlov --- utils/progressbar/progressbarmng.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/progressbar/progressbarmng.go b/utils/progressbar/progressbarmng.go index 13ed9c8b9..ea59dfa13 100644 --- a/utils/progressbar/progressbarmng.go +++ b/utils/progressbar/progressbarmng.go @@ -320,8 +320,7 @@ func barStyle(isGeneral bool) mpb.BarStyleComposer { filler = "🟩" } } - // Should look like this at the beginning: [🟦 ] and then [🟦🟦 ] and so on. - // Or like this for windows: [●..........] and then [●●.........] and so on. + // Should look like this at the beginning: [🟦 ] and then [🟦🟦 ] and so on. (Or for windows: [●..........] and then [●●.........]) return mpb.BarStyle().Lbound("[" + filler).Filler(filler).Tip(filler).Padding(padding).Refiller("").Rbound("]") } From 6e90b66ad48be3e8ba87beb542fc7882e967f53e Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 15 Sep 2024 12:38:26 +0300 Subject: [PATCH 23/36] Remove redundant log Signed-off-by: Michael Sverdlov --- go.mod | 3 ++- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 76d2f3a50..746bafa86 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,8 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240909074512-80b75868fb47 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240915093643-71e698867ded + // //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 // diff --git a/go.sum b/go.sum index ae672e64d..6d22a4db0 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/jfrog/build-info-go v1.9.36 h1:bKoYW3o+U70Zbz2kt5NT84N5JWNxdDXHOf+kVd github.com/jfrog/build-info-go v1.9.36/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= 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-client-go v1.46.2 h1:1rk7PliYGc7zVSFVE2/RO77JOR1KdEtr28os8GQiLyI= -github.com/jfrog/jfrog-client-go v1.46.2/go.mod h1:qtQ9ML8xrRJmUwU/t6QRsov7C5mIZndTDY3qulgB5hA= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240915093643-71e698867ded h1:nZO0cex8Oi1BlmfaJ2kfBVAQhCh90/NRNA6GpbNqD2c= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240915093643-71e698867ded/go.mod h1:kk0lbMJbZF9961lGLw1aKKH4PNcXZFB0pAwvZHGwYSw= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= From 41aa3e89d8053ff249c5887fe811dc0d63f1ad6f Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 17 Sep 2024 18:43:43 +0300 Subject: [PATCH 24/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/commands/generic/upload.go | 4 ++-- artifactory/commands/npm/publish.go | 4 ++-- artifactory/commands/terraform/terraformpublish.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artifactory/commands/generic/upload.go b/artifactory/commands/generic/upload.go index 24f0c2088..f6198b8c0 100644 --- a/artifactory/commands/generic/upload.go +++ b/artifactory/commands/generic/upload.go @@ -135,7 +135,7 @@ func (uc *UploadCommand) upload() (err error) { var artifactsDetailsReader *content.ContentReader = nil if uc.DetailedSummary() || toCollect { var summary *rtServicesUtils.OperationSummary - summary, err = servicesManager.UploadFilesWithSummary(uploadParamsArray...) + summary, err = servicesManager.UploadFilesWithSummary(false, uploadParamsArray...) if err != nil { errorOccurred = true log.Error(err) @@ -162,7 +162,7 @@ func (uc *UploadCommand) upload() (err error) { } } } else { - successCount, failCount, err = servicesManager.UploadFiles(uploadParamsArray...) + successCount, failCount, err = servicesManager.UploadFiles(false, uploadParamsArray...) if err != nil { errorOccurred = true log.Error(err) diff --git a/artifactory/commands/npm/publish.go b/artifactory/commands/npm/publish.go index 7fa69c2be..7738c3d83 100644 --- a/artifactory/commands/npm/publish.go +++ b/artifactory/commands/npm/publish.go @@ -344,7 +344,7 @@ func (npc *NpmPublishCommand) doDeploy(target string, artDetails *config.ServerD return err } } - summary, err := servicesManager.UploadFilesWithSummary(up) + summary, err := servicesManager.UploadFilesWithSummary(false, up) if err != nil { return err } @@ -367,7 +367,7 @@ func (npc *NpmPublishCommand) doDeploy(target string, artDetails *config.ServerD } } } else { - _, totalFailed, err = servicesManager.UploadFiles(up) + _, totalFailed, err = servicesManager.UploadFiles(false, up) if err != nil { return err } diff --git a/artifactory/commands/terraform/terraformpublish.go b/artifactory/commands/terraform/terraformpublish.go index 0a6e854e7..0f81e86fd 100644 --- a/artifactory/commands/terraform/terraformpublish.go +++ b/artifactory/commands/terraform/terraformpublish.go @@ -232,7 +232,7 @@ func createServiceManagerAndUpload(serverDetails *config.ServerDetails, uploadPa if err != nil { return nil, err } - return serviceManager.UploadFilesWithSummary(*uploadParams) + return serviceManager.UploadFilesWithSummary(false, *uploadParams) } func (tpc *TerraformPublishCommand) walkDirAndUploadTerraformModules(pwd string, producer parallel.Runner, errorsQueue *clientUtils.ErrorsQueue, uploadSummary *[][]*servicesUtils.OperationSummary, produceTaskFunc ProduceTaskFunc) error { From 64b7b91225707acbf8182e7f68e782f7f5ba45a8 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 17 Sep 2024 18:45:21 +0300 Subject: [PATCH 25/36] Remove redundant log Signed-off-by: Michael Sverdlov --- go.mod | 5 ++--- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 746bafa86..968f9bd51 100644 --- a/go.mod +++ b/go.mod @@ -96,9 +96,8 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240915093643-71e698867ded +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240916091150-81a0c907b883 -// //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 -// + //replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.7.6-0.20240909061051-2d36ae4bd05a diff --git a/go.sum b/go.sum index 6d22a4db0..0cf52df17 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/jfrog/build-info-go v1.9.36 h1:bKoYW3o+U70Zbz2kt5NT84N5JWNxdDXHOf+kVd github.com/jfrog/build-info-go v1.9.36/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= 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-client-go v1.28.1-0.20240915093643-71e698867ded h1:nZO0cex8Oi1BlmfaJ2kfBVAQhCh90/NRNA6GpbNqD2c= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240915093643-71e698867ded/go.mod h1:kk0lbMJbZF9961lGLw1aKKH4PNcXZFB0pAwvZHGwYSw= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240916091150-81a0c907b883 h1:AmtIF7dgs/UNrvKli1blWJnkP8sQ+3klK4umtf5Mz8E= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240916091150-81a0c907b883/go.mod h1:kk0lbMJbZF9961lGLw1aKKH4PNcXZFB0pAwvZHGwYSw= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= From b205894bdca8ff7956c2420fd14798b27622e752 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 18 Sep 2024 00:39:33 +0300 Subject: [PATCH 26/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/commands/generic/upload.go | 5 +++-- artifactory/commands/npm/publish.go | 5 +++-- artifactory/commands/terraform/terraformpublish.go | 3 ++- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/artifactory/commands/generic/upload.go b/artifactory/commands/generic/upload.go index f6198b8c0..8b721ffd1 100644 --- a/artifactory/commands/generic/upload.go +++ b/artifactory/commands/generic/upload.go @@ -3,6 +3,7 @@ package generic import ( "errors" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/commandsummary" + "github.com/jfrog/jfrog-client-go/artifactory" "os" buildInfo "github.com/jfrog/build-info-go/entities" @@ -135,7 +136,7 @@ func (uc *UploadCommand) upload() (err error) { var artifactsDetailsReader *content.ContentReader = nil if uc.DetailedSummary() || toCollect { var summary *rtServicesUtils.OperationSummary - summary, err = servicesManager.UploadFilesWithSummary(false, uploadParamsArray...) + summary, err = servicesManager.UploadFilesWithSummary(artifactory.UploadServiceOptions{}, uploadParamsArray...) if err != nil { errorOccurred = true log.Error(err) @@ -162,7 +163,7 @@ func (uc *UploadCommand) upload() (err error) { } } } else { - successCount, failCount, err = servicesManager.UploadFiles(false, uploadParamsArray...) + successCount, failCount, err = servicesManager.UploadFiles(artifactory.UploadServiceOptions{}, uploadParamsArray...) if err != nil { errorOccurred = true log.Error(err) diff --git a/artifactory/commands/npm/publish.go b/artifactory/commands/npm/publish.go index 7738c3d83..8da35cbd5 100644 --- a/artifactory/commands/npm/publish.go +++ b/artifactory/commands/npm/publish.go @@ -18,6 +18,7 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/common/spec" "github.com/jfrog/jfrog-cli-core/v2/utils/config" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" + "github.com/jfrog/jfrog-client-go/artifactory" "github.com/jfrog/jfrog-client-go/artifactory/services" specutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils" clientutils "github.com/jfrog/jfrog-client-go/utils" @@ -344,7 +345,7 @@ func (npc *NpmPublishCommand) doDeploy(target string, artDetails *config.ServerD return err } } - summary, err := servicesManager.UploadFilesWithSummary(false, up) + summary, err := servicesManager.UploadFilesWithSummary(artifactory.UploadServiceOptions{}, up) if err != nil { return err } @@ -367,7 +368,7 @@ func (npc *NpmPublishCommand) doDeploy(target string, artDetails *config.ServerD } } } else { - _, totalFailed, err = servicesManager.UploadFiles(false, up) + _, totalFailed, err = servicesManager.UploadFiles(artifactory.UploadServiceOptions{}, up) if err != nil { return err } diff --git a/artifactory/commands/terraform/terraformpublish.go b/artifactory/commands/terraform/terraformpublish.go index 0f81e86fd..853683d82 100644 --- a/artifactory/commands/terraform/terraformpublish.go +++ b/artifactory/commands/terraform/terraformpublish.go @@ -11,6 +11,7 @@ import ( "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" + "github.com/jfrog/jfrog-client-go/artifactory" "github.com/jfrog/jfrog-client-go/artifactory/services" servicesUtils "github.com/jfrog/jfrog-client-go/artifactory/services/utils" clientUtils "github.com/jfrog/jfrog-client-go/utils" @@ -232,7 +233,7 @@ func createServiceManagerAndUpload(serverDetails *config.ServerDetails, uploadPa if err != nil { return nil, err } - return serviceManager.UploadFilesWithSummary(false, *uploadParams) + return serviceManager.UploadFilesWithSummary(artifactory.UploadServiceOptions{}, *uploadParams) } func (tpc *TerraformPublishCommand) walkDirAndUploadTerraformModules(pwd string, producer parallel.Runner, errorsQueue *clientUtils.ErrorsQueue, uploadSummary *[][]*servicesUtils.OperationSummary, produceTaskFunc ProduceTaskFunc) error { diff --git a/go.mod b/go.mod index 968f9bd51..f6a8862ce 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240916091150-81a0c907b883 +replace github.com/jfrog/jfrog-client-go => github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240917213023-3d92c634a338 //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 diff --git a/go.sum b/go.sum index 0cf52df17..8cffc9a0b 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,6 @@ github.com/jfrog/build-info-go v1.9.36 h1:bKoYW3o+U70Zbz2kt5NT84N5JWNxdDXHOf+kVd github.com/jfrog/build-info-go v1.9.36/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= 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-client-go v1.28.1-0.20240916091150-81a0c907b883 h1:AmtIF7dgs/UNrvKli1blWJnkP8sQ+3klK4umtf5Mz8E= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240916091150-81a0c907b883/go.mod h1:kk0lbMJbZF9961lGLw1aKKH4PNcXZFB0pAwvZHGwYSw= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -198,6 +196,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240917213023-3d92c634a338 h1:1CPv3KDoNg5lF2Kl/dgcW+9a+QaEBldug+zLoWzCwbc= +github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240917213023-3d92c634a338/go.mod h1:kk0lbMJbZF9961lGLw1aKKH4PNcXZFB0pAwvZHGwYSw= github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo= github.com/terminalstatic/go-xsd-validate v0.1.5/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= From 3c71af3f32eb7089a8eb925d18bf9ea02f3f5f47 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 18 Sep 2024 11:13:30 +0300 Subject: [PATCH 27/36] Remove redundant log Signed-off-by: Michael Sverdlov --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f6a8862ce..246c09df0 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-client-go => github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240917213023-3d92c634a338 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240918081224-1c584cc334c7 //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240909072259-13bf8722d051 diff --git a/go.sum b/go.sum index 8cffc9a0b..5bfdf12d0 100644 --- a/go.sum +++ b/go.sum @@ -96,6 +96,8 @@ github.com/jfrog/build-info-go v1.9.36 h1:bKoYW3o+U70Zbz2kt5NT84N5JWNxdDXHOf+kVd github.com/jfrog/build-info-go v1.9.36/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= 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-client-go v1.28.1-0.20240918081224-1c584cc334c7 h1:h/bLASJGFaI3QOow1Ix63RZB8kZpAClkA/NpAVWRroc= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240918081224-1c584cc334c7/go.mod h1:kk0lbMJbZF9961lGLw1aKKH4PNcXZFB0pAwvZHGwYSw= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= @@ -196,8 +198,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240917213023-3d92c634a338 h1:1CPv3KDoNg5lF2Kl/dgcW+9a+QaEBldug+zLoWzCwbc= -github.com/sverdlov93/jfrog-client-go v1.0.2-0.20240917213023-3d92c634a338/go.mod h1:kk0lbMJbZF9961lGLw1aKKH4PNcXZFB0pAwvZHGwYSw= github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo= github.com/terminalstatic/go-xsd-validate v0.1.5/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= From 24ef29afe48f69de1fc20bb7201c23c4f34b555e Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 7 Oct 2024 16:00:13 +0300 Subject: [PATCH 28/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/utils/filetree.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/artifactory/utils/filetree.go b/artifactory/utils/filetree.go index 4b6ae17ff..d5b38a673 100644 --- a/artifactory/utils/filetree.go +++ b/artifactory/utils/filetree.go @@ -26,7 +26,10 @@ func NewFileTree() *FileTree { // if UploadedFileUrl not provided, the file name will be displayed without a link. func (ft *FileTree) AddFile(path, uploadedFileUrl string) { if ft.size >= maxFilesInTree { - log.Info("Exceeded maximum number of files in tree") + if !ft.exceedsMax { + // Log only once + log.Info("Exceeded maximum number of files in tree") + } ft.exceedsMax = true return } From 3691e30eea73bbb337e6a9d684b57dd5d0f55241 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 7 Oct 2024 16:18:11 +0300 Subject: [PATCH 29/36] Remove redundant log Signed-off-by: Michael Sverdlov --- .../utils/commandsummary/buildinfosummary.go | 4 ++++ .../utils/commandsummary/uploadsummary.go | 3 +++ artifactory/utils/filetree.go | 24 ++++++++----------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/artifactory/utils/commandsummary/buildinfosummary.go b/artifactory/utils/commandsummary/buildinfosummary.go index 9861c723c..bd8e91788 100644 --- a/artifactory/utils/commandsummary/buildinfosummary.go +++ b/artifactory/utils/commandsummary/buildinfosummary.go @@ -209,6 +209,10 @@ func (bis *BuildInfoSummary) createArtifactsTree(module *buildInfo.Module) strin } artifactTreePath := path.Join(artifact.OriginalDeploymentRepo, artifact.Path) artifactsTree.AddFile(artifactTreePath, artifactUrlInArtifactory) + if artifactsTree.IsTreeExceedsMax() { + log.Info("Exceeded maximum number of files in tree") + return "" + } } return artifactsTree.String() } diff --git a/artifactory/utils/commandsummary/uploadsummary.go b/artifactory/utils/commandsummary/uploadsummary.go index 1aa683c36..cccaca2d8 100644 --- a/artifactory/utils/commandsummary/uploadsummary.go +++ b/artifactory/utils/commandsummary/uploadsummary.go @@ -55,6 +55,9 @@ func (us *UploadSummary) generateFileTreeMarkdown() string { us.uploadTree = utils.NewFileTree() for _, uploadResult := range us.uploadedArtifacts.Results { us.uploadTree.AddFile(uploadResult.TargetPath, us.buildUiUrl(uploadResult.TargetPath)) + if us.uploadTree.IsTreeExceedsMax() { + return "" + } } return us.uploadTree.String() } diff --git a/artifactory/utils/filetree.go b/artifactory/utils/filetree.go index d5b38a673..e56a485cc 100644 --- a/artifactory/utils/filetree.go +++ b/artifactory/utils/filetree.go @@ -12,9 +12,8 @@ var maxFilesInTree = 200 // FileTree is a UI components that displays a file-system tree view in the terminal. type FileTree struct { - repos map[string]*dirNode - size int - exceedsMax bool + repos map[string]*dirNode + size int } func NewFileTree() *FileTree { @@ -25,14 +24,6 @@ func NewFileTree() *FileTree { // UploadedFileUrl - URL to the uploaded file in Artifactory, // if UploadedFileUrl not provided, the file name will be displayed without a link. func (ft *FileTree) AddFile(path, uploadedFileUrl string) { - if ft.size >= maxFilesInTree { - if !ft.exceedsMax { - // Log only once - log.Info("Exceeded maximum number of files in tree") - } - ft.exceedsMax = true - return - } splitPath := strings.Split(path, "/") if _, exist := ft.repos[splitPath[0]]; !exist { ft.repos[splitPath[0]] = &dirNode{name: splitPath[0], prefix: "📦 ", subDirNodes: map[string]*dirNode{}, fileNames: map[string]string{}} @@ -42,11 +33,16 @@ func (ft *FileTree) AddFile(path, uploadedFileUrl string) { } } +func (ft *FileTree) IsTreeExceedsMax() bool { + if ft.size >= maxFilesInTree { + log.Info(fmt.Sprintf("Exceeded maximum number (%d) of files in files tree.", maxFilesInTree)) + return true + } + return false +} + // Returns a string representation of the tree. If the number of files exceeded the maximum, an empty string will be returned. func (ft *FileTree) String() string { - if ft.exceedsMax { - return "" - } treeStr := "" for _, repo := range ft.repos { treeStr += strings.Join(repo.strings(), "\n") + "\n\n" From b72be6cc4406a0564bb231420b6f8b55b527fef6 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 7 Oct 2024 16:19:34 +0300 Subject: [PATCH 30/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/utils/commandsummary/buildinfosummary.go | 1 - 1 file changed, 1 deletion(-) diff --git a/artifactory/utils/commandsummary/buildinfosummary.go b/artifactory/utils/commandsummary/buildinfosummary.go index bd8e91788..07bb7d35b 100644 --- a/artifactory/utils/commandsummary/buildinfosummary.go +++ b/artifactory/utils/commandsummary/buildinfosummary.go @@ -210,7 +210,6 @@ func (bis *BuildInfoSummary) createArtifactsTree(module *buildInfo.Module) strin artifactTreePath := path.Join(artifact.OriginalDeploymentRepo, artifact.Path) artifactsTree.AddFile(artifactTreePath, artifactUrlInArtifactory) if artifactsTree.IsTreeExceedsMax() { - log.Info("Exceeded maximum number of files in tree") return "" } } From e99595ce8531f6ac8e037d309b369927779688da Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 7 Oct 2024 16:26:12 +0300 Subject: [PATCH 31/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/utils/filetree_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/artifactory/utils/filetree_test.go b/artifactory/utils/filetree_test.go index eac646451..2a0e9dc8b 100644 --- a/artifactory/utils/filetree_test.go +++ b/artifactory/utils/filetree_test.go @@ -19,10 +19,8 @@ func TestFileTree(t *testing.T) { result, excpected := fileTree.String(), "📦 repoName\n└── 📁 path\n └── 📁 to\n └── 📁 first\n └── 📄 artifact\n\n" assert.Equal(t, excpected, result) - // If maxFileInTree has exceeded, Check String() returns an empty string - fileTree.AddFile("repoName/path/to/second/artifact", "") - result, excpected = fileTree.String(), "" - assert.Equal(t, excpected, result) + // If maxFileInTree has exceeded + assert.True(t, fileTree.IsTreeExceedsMax()) } func TestFileTreeSort(t *testing.T) { From 8444dbbb860597e95540ca9306329cfe382e1ec4 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 7 Oct 2024 16:32:04 +0300 Subject: [PATCH 32/36] Remove redundant log Signed-off-by: Michael Sverdlov --- artifactory/utils/filetree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifactory/utils/filetree.go b/artifactory/utils/filetree.go index e56a485cc..fafd5c485 100644 --- a/artifactory/utils/filetree.go +++ b/artifactory/utils/filetree.go @@ -35,7 +35,7 @@ func (ft *FileTree) AddFile(path, uploadedFileUrl string) { func (ft *FileTree) IsTreeExceedsMax() bool { if ft.size >= maxFilesInTree { - log.Info(fmt.Sprintf("Exceeded maximum number (%d) of files in files tree.", maxFilesInTree)) + log.Debug(fmt.Sprintf("Exceeded maximum number (%d) of files in files tree.", maxFilesInTree)) return true } return false From fc7a8e6205fa3b8b17d4b2d59456bee0a1127fc2 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 10 Oct 2024 12:44:04 +0300 Subject: [PATCH 33/36] Improve repositores code Signed-off-by: Michael Sverdlov --- .../commands/transferfiles/transfer.go | 9 +- artifactory/utils/repositoryutils.go | 82 +++++-------------- common/commands/configfile.go | 20 ++++- 3 files changed, 41 insertions(+), 70 deletions(-) diff --git a/artifactory/commands/transferfiles/transfer.go b/artifactory/commands/transferfiles/transfer.go index a08d04562..4e2324c48 100644 --- a/artifactory/commands/transferfiles/transfer.go +++ b/artifactory/commands/transferfiles/transfer.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "github.com/jfrog/gofrog/safeconvert" + "github.com/jfrog/jfrog-client-go/artifactory/services" "os" "os/signal" "path/filepath" @@ -342,11 +343,11 @@ func (tdc *TransferFilesCommand) NewTransferDataPreChecksRunner() (runner *prech if err != nil { return } - localRepos, err := utils.GetFilteredRepositoriesByNameAndType(serviceManager, tdc.includeReposPatterns, tdc.excludeReposPatterns, utils.Local) + localRepos, err := utils.GetFilteredRepositoriesWithFilterParams(serviceManager, tdc.includeReposPatterns, tdc.excludeReposPatterns, services.RepositoriesFilterParams{RepoType: utils.Local.String()}) if err != nil { return } - federatedRepos, err := utils.GetFilteredRepositoriesByNameAndType(serviceManager, tdc.includeReposPatterns, tdc.excludeReposPatterns, utils.Federated) + federatedRepos, err := utils.GetFilteredRepositoriesWithFilterParams(serviceManager, tdc.includeReposPatterns, tdc.excludeReposPatterns, services.RepositoriesFilterParams{RepoType: utils.Federated.String()}) if err != nil { return } @@ -586,11 +587,11 @@ func (tdc *TransferFilesCommand) getAllLocalRepos(serverDetails *config.ServerDe } excludeRepoPatternsWithBuildInfo := tdc.excludeReposPatterns excludeRepoPatternsWithBuildInfo = append(excludeRepoPatternsWithBuildInfo, "*-build-info") - localRepos, err := utils.GetFilteredRepositoriesByNameAndType(serviceManager, tdc.includeReposPatterns, excludeRepoPatternsWithBuildInfo, utils.Local) + localRepos, err := utils.GetFilteredRepositoriesWithFilterParams(serviceManager, tdc.includeReposPatterns, excludeRepoPatternsWithBuildInfo, services.RepositoriesFilterParams{RepoType: utils.Local.String()}) if err != nil { return []string{}, []string{}, err } - federatedRepos, err := utils.GetFilteredRepositoriesByNameAndType(serviceManager, tdc.includeReposPatterns, excludeRepoPatternsWithBuildInfo, utils.Federated) + federatedRepos, err := utils.GetFilteredRepositoriesWithFilterParams(serviceManager, tdc.includeReposPatterns, excludeRepoPatternsWithBuildInfo, services.RepositoriesFilterParams{RepoType: utils.Federated.String()}) if err != nil { return []string{}, []string{}, err } diff --git a/artifactory/utils/repositoryutils.go b/artifactory/utils/repositoryutils.go index db8a46e69..719a7417c 100644 --- a/artifactory/utils/repositoryutils.go +++ b/artifactory/utils/repositoryutils.go @@ -6,8 +6,6 @@ import ( "path" "strings" - "github.com/jfrog/jfrog-cli-core/v2/utils/config" - "github.com/jfrog/jfrog-client-go/artifactory" "github.com/jfrog/jfrog-client-go/artifactory/services" clientUtils "github.com/jfrog/jfrog-client-go/artifactory/services/utils" @@ -57,26 +55,6 @@ var blacklistedRepositories = []string{ "jfrog-usage-logs", "jfrog-billing-logs", "jfrog-logs", "artifactory-pipe-info", "auto-trashcan", "jfrog-support-bundle", "_intransit", "artifactory-edge-uploads", } -// GetRepositories returns the names of local, remote, virtual or federated repositories filtered by their type. -// artDetails - Artifactory server details -// repoTypes - Repository types to filter. If empty - return all repository types. -func GetRepositories(artDetails *config.ServerDetails, repoTypes ...RepoType) ([]string, error) { - sm, err := CreateServiceManager(artDetails, 3, 0, false) - if err != nil { - return nil, err - } - repos := []string{} - for _, repoType := range repoTypes { - filteredRepos, err := GetFilteredRepositoriesByNameAndType(sm, nil, nil, repoType) - if err != nil { - return repos, err - } - repos = append(repos, filteredRepos...) - } - - return repos, nil -} - // Since we can't search dependencies in a remote repository, we will turn the search to the repository's cache. // Local/Virtual repository name will be returned as is. func GetRepoNameForDependenciesSearch(repoName string, serviceManager artifactory.ArtifactoryServicesManager) (string, error) { @@ -99,74 +77,52 @@ func IsRemoteRepo(repoName string, serviceManager artifactory.ArtifactoryService return repoDetails.GetRepoType() == "remote", nil } -// GetFilteredRepositoriesByName returns the names of local, remote, virtual and federated repositories filtered by their names. -// includePatterns - patterns of repository names (can contain wildcards) to include in the results. A repository's name +// GetFilteredRepositoriesWithFilterParams returns the names of local, remote, virtual, and federated repositories filtered by their names and type. +// servicesManager - The Artifactory services manager used to interact with the Artifactory server. +// includePatterns - Patterns of repository names (can contain wildcards) to include in the results. A repository's name // must match at least one of these patterns in order to be included in the results. If includePatterns' length is zero, // all repositories are included. -// excludePatterns - patterns of repository names (can contain wildcards) to exclude from the results. A repository's name +// excludePatterns - Patterns of repository names (can contain wildcards) to exclude from the results. A repository's name // must NOT match any of these patterns in order to be included in the results. -func GetFilteredRepositoriesByName(servicesManager artifactory.ArtifactoryServicesManager, includePatterns, excludePatterns []string) ([]string, error) { - repoDetailsList, err := servicesManager.GetAllRepositories() +// filterParams - Parameters to filter the repositories by their type. +// Returns a slice of repository names that match the given patterns and type, or an error if the operation fails. +func GetFilteredRepositoriesWithFilterParams(servicesManager artifactory.ArtifactoryServicesManager, includePatterns, excludePatterns []string, filterParams services.RepositoriesFilterParams) ([]string, error) { + repoDetailsList, err := servicesManager.GetAllRepositoriesFiltered(filterParams) if err != nil { return nil, err } - return getFilteredRepositories(repoDetailsList, includePatterns, excludePatterns) -} - -// GetFilteredRepositoriesByNameAndType returns the names of local, remote, virtual and federated repositories filtered by their names and type. -// includePatterns - patterns of repository names (can contain wildcards) to include in the results. A repository's name -// must match at least one of these patterns in order to be included in the results. If includePatterns' length is zero, -// all repositories are included. -// excludePatterns - patterns of repository names (can contain wildcards) to exclude from the results. A repository's name -// must NOT match any of these patterns in order to be included in the results. -// repoType - only repositories of this type will be returned. -func GetFilteredRepositoriesByNameAndType(servicesManager artifactory.ArtifactoryServicesManager, includePatterns, excludePatterns []string, repoType RepoType) ([]string, error) { - repoDetailsList, err := servicesManager.GetAllRepositoriesFiltered(services.RepositoriesFilterParams{RepoType: repoType.String()}) - if err != nil { - return nil, err - } - - return getFilteredRepositories(repoDetailsList, includePatterns, excludePatterns) -} - -func getFilteredRepositories(repoDetailsList *[]services.RepositoryDetails, includePatterns, excludePatterns []string) ([]string, error) { - var repoKeys []string - for _, repoDetails := range *repoDetailsList { - repoKeys = append(repoKeys, repoDetails.Key) + repoKeys := make([]string, len(*repoDetailsList)) + for i, repoDetails := range *repoDetailsList { + repoKeys[i] = repoDetails.Key } - return filterRepositoryNames(&repoKeys, includePatterns, excludePatterns) + return filterRepositoryNames(repoKeys, includePatterns, excludePatterns) } -// GetFilteredBuildInfoRepositories returns the names of all build-info repositories filtered by their names. -// storageInfo - storage info response from Artifactory -// includePatterns - patterns of repository names (can contain wildcards) to include in the results. A repository's name -// must match at least one of these patterns in order to be included in the results. If includePatterns' length is zero, -// all repositories are included. -// excludePatterns - patterns of repository names (can contain wildcards) to exclude from the results. A repository's name -// must NOT match any of these patterns in order to be included in the results. +// GetFilteredBuildInfoRepositories gets build info repositories and applies the include/exclude patterns to return the relevant repository names. func GetFilteredBuildInfoRepositories(storageInfo *clientUtils.StorageInfo, includePatterns, excludePatterns []string) ([]string, error) { - var repoKeys []string + repoKeys := make([]string, 0, len(storageInfo.RepositoriesSummaryList)) + for _, repoSummary := range storageInfo.RepositoriesSummaryList { if strings.ToLower(repoSummary.PackageType) == buildInfoPackageType { repoKeys = append(repoKeys, repoSummary.RepoKey) } } - return filterRepositoryNames(&repoKeys, includePatterns, excludePatterns) + return filterRepositoryNames(repoKeys, includePatterns, excludePatterns) } // Filter repositories by name and return a list of repository names // repos - The repository keys to filter // includePatterns - Repositories inclusion wildcard pattern // excludePatterns - Repositories exclusion wildcard pattern -func filterRepositoryNames(repoKeys *[]string, includePatterns, excludePatterns []string) ([]string, error) { +func filterRepositoryNames(repoKeys []string, includePatterns, excludePatterns []string) ([]string, error) { includedRepos := datastructures.MakeSet[string]() - includeExcludeFilter := &IncludeExcludeFilter{ + includeExcludeFilter := IncludeExcludeFilter{ IncludePatterns: includePatterns, ExcludePatterns: excludePatterns, } - for _, repoKey := range *repoKeys { + for _, repoKey := range repoKeys { repoIncluded, err := includeExcludeFilter.ShouldIncludeRepository(repoKey) if err != nil { return nil, err diff --git a/common/commands/configfile.go b/common/commands/configfile.go index 450e71895..102725275 100644 --- a/common/commands/configfile.go +++ b/common/commands/configfile.go @@ -1,6 +1,8 @@ package commands import ( + "fmt" + "github.com/jfrog/jfrog-client-go/artifactory/services" "os" "path/filepath" "strconv" @@ -134,10 +136,10 @@ func createBuildConfig(global bool, confType project.ProjectType, configFile *Co } // Populate, validate and write the config file configFilePath := filepath.Join(projectDir, confType.String()+".yaml") - if err := configFile.VerifyConfigFile(configFilePath); err != nil { + if err = configFile.VerifyConfigFile(configFilePath); err != nil { return err } - if err := handleInteractiveConfigCreation(configFile, confType); err != nil { + if err = handleInteractiveConfigCreation(configFile, confType); err != nil { return err } if err = configFile.validateConfig(); err != nil { @@ -649,7 +651,19 @@ func getRepositories(serverId string, repoTypes ...utils.RepoType) ([]string, er return nil, err } - return utils.GetRepositories(artDetails, repoTypes...) + sm, err := utils.CreateServiceManager(artDetails, 3, 0, false) + if err != nil { + return nil, err + } + repos := []string{} + for _, repoType := range repoTypes { + filteredRepos, err := utils.GetFilteredRepositoriesWithFilterParams(sm, nil, nil, services.RepositoriesFilterParams{RepoType: repoType.String()}) + if err != nil { + return nil, fmt.Errorf("failed getting %s repositories list: %w", repoType, err) + } + repos = append(repos, filteredRepos...) + } + return repos, nil } func defaultIfNotSet(c *cli.Context, flagName string, defaultValue string) string { From db9e0caf96ce13cae565f13fe59055b175a34136 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 10 Oct 2024 14:53:09 +0300 Subject: [PATCH 34/36] Improve repositores code Signed-off-by: Michael Sverdlov --- artifactory/utils/repositoryutils.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/artifactory/utils/repositoryutils.go b/artifactory/utils/repositoryutils.go index 719a7417c..40acbb86d 100644 --- a/artifactory/utils/repositoryutils.go +++ b/artifactory/utils/repositoryutils.go @@ -100,7 +100,13 @@ func GetFilteredRepositoriesWithFilterParams(servicesManager artifactory.Artifac return filterRepositoryNames(repoKeys, includePatterns, excludePatterns) } -// GetFilteredBuildInfoRepositories gets build info repositories and applies the include/exclude patterns to return the relevant repository names. +// GetFilteredBuildInfoRepositories returns the names of all build-info repositories filtered by their names. +// storageInfo - storage info response from Artifactory +// includePatterns - patterns of repository names (can contain wildcards) to include in the results. A repository's name +// must match at least one of these patterns in order to be included in the results. If includePatterns' length is zero, +// all repositories are included. +// excludePatterns - patterns of repository names (can contain wildcards) to exclude from the results. A repository's name +// must NOT match any of these patterns in order to be included in the results. func GetFilteredBuildInfoRepositories(storageInfo *clientUtils.StorageInfo, includePatterns, excludePatterns []string) ([]string, error) { repoKeys := make([]string, 0, len(storageInfo.RepositoriesSummaryList)) From d9064a09a078c62aeeb7fe90ae1ce1258fe7070e Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 10 Oct 2024 16:22:57 +0300 Subject: [PATCH 35/36] Improve repositores code Signed-off-by: Michael Sverdlov --- artifactory/utils/repositoryutils_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifactory/utils/repositoryutils_test.go b/artifactory/utils/repositoryutils_test.go index a601b8012..698892d7b 100644 --- a/artifactory/utils/repositoryutils_test.go +++ b/artifactory/utils/repositoryutils_test.go @@ -26,7 +26,7 @@ func TestFilterRepositoryNames(t *testing.T) { "jfrog-npm-local", "jfrog-generic-remote", } - actualRepoNames, err := filterRepositoryNames(&repos, includePatterns, excludePatterns) + actualRepoNames, err := filterRepositoryNames(repos, includePatterns, excludePatterns) assert.NoError(t, err) assert.ElementsMatch(t, expectedRepoNames, actualRepoNames) } From 6dbf52233e117827aeb12fe1c048fb7f91aac132 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 10 Oct 2024 17:29:07 +0300 Subject: [PATCH 36/36] Update common/commands/configfile.go Co-authored-by: Yahav Itschak --- common/commands/configfile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/commands/configfile.go b/common/commands/configfile.go index 102725275..f0a7e1ca0 100644 --- a/common/commands/configfile.go +++ b/common/commands/configfile.go @@ -659,7 +659,7 @@ func getRepositories(serverId string, repoTypes ...utils.RepoType) ([]string, er for _, repoType := range repoTypes { filteredRepos, err := utils.GetFilteredRepositoriesWithFilterParams(sm, nil, nil, services.RepositoriesFilterParams{RepoType: repoType.String()}) if err != nil { - return nil, fmt.Errorf("failed getting %s repositories list: %w", repoType, err) + return nil, fmt.Errorf("failed getting %s repositories list: %w", repoType.String(), err) } repos = append(repos, filteredRepos...) }