From bd80ddd505fb02202853e0a440250efa49a81c9b Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 25 Aug 2024 11:59:37 +0300 Subject: [PATCH 01/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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=