diff --git a/go.mod b/go.mod index 5340e680..1c402b90 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.22.7 require ( github.com/Masterminds/semver v1.5.0 - github.com/jfrog/jfrog-cli-core/v2 v2.56.3 - github.com/jfrog/jfrog-client-go v1.47.2 + github.com/jfrog/jfrog-cli-core/v2 v2.56.4 + github.com/jfrog/jfrog-client-go v1.47.3 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 60618e11..62e3d59a 100644 --- a/go.sum +++ b/go.sum @@ -96,10 +96,10 @@ github.com/jfrog/build-info-go v1.10.3 h1:9nqBdZD6xkuxiOvxg+idZ79QLFWQNuucvKkl8X github.com/jfrog/build-info-go v1.10.3/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-cli-core/v2 v2.56.3 h1:9ZZ7TGpobk4XShPzrHkRGfpYzs1w0rg7Hqtfg51iNRg= -github.com/jfrog/jfrog-cli-core/v2 v2.56.3/go.mod h1:xL9b2DrH5FemiTuk2bfUBfbQYC/RvpBkPxxV6XxssXs= -github.com/jfrog/jfrog-client-go v1.47.2 h1:Lu+2n4EU+MzNfotV1VOvF/ZQIWsQJg11Z4YSVhumFy0= -github.com/jfrog/jfrog-client-go v1.47.2/go.mod h1:fx2fq5XwZ7e2pzpBB9pXsP8+ZdKLB8g+A6fjGU6F2XI= +github.com/jfrog/jfrog-cli-core/v2 v2.56.4 h1:LqByz2FmVTDQm/u2xGeTL6O8Hs9JadaTj3QMpel9ZwY= +github.com/jfrog/jfrog-cli-core/v2 v2.56.4/go.mod h1:AwQ9WuOA64g3torX9K5kP0xFAAbchfRInhZwbufoW+Q= +github.com/jfrog/jfrog-client-go v1.47.3 h1:99/JSSgU0rvnM2zWYos2n+Gz1IYLCUoIorE4Xco+Dew= +github.com/jfrog/jfrog-client-go v1.47.3/go.mod h1:NepfaidmK/xiKsVC+0Ur9sANOqL6io8Y7pSaCau7J6o= 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= diff --git a/vendor/github.com/jfrog/jfrog-client-go/artifactory/services/repositories.go b/vendor/github.com/jfrog/jfrog-client-go/artifactory/services/repositories.go index b8b71d0e..dd3b628f 100644 --- a/vendor/github.com/jfrog/jfrog-client-go/artifactory/services/repositories.go +++ b/vendor/github.com/jfrog/jfrog-client-go/artifactory/services/repositories.go @@ -62,7 +62,7 @@ func (rs *RepositoriesService) GetWithFilter(params RepositoriesFilterParams) (* // This function is used to create the URL for the repositories API with the given filter params. // The function expects to get a RepositoriesFilterParams struct that contains the desired filter params. // The function returns the URL string. -func (rs *RepositoriesService)createUrlWithFilter(params RepositoriesFilterParams) string { +func (rs *RepositoriesService) createUrlWithFilter(params RepositoriesFilterParams) string { u := url.URL{ Path: apiRepositories, } diff --git a/vendor/github.com/jfrog/jfrog-client-go/utils/log/logger.go b/vendor/github.com/jfrog/jfrog-client-go/utils/log/logger.go index f3c1f1c3..20d11d5e 100644 --- a/vendor/github.com/jfrog/jfrog-client-go/utils/log/logger.go +++ b/vendor/github.com/jfrog/jfrog-client-go/utils/log/logger.go @@ -31,6 +31,10 @@ var stdErrIsTerminal *bool // but through the 'colorsSupported' function. var colorsSupported *bool +// Determines whether to not remove emojis from the output. This variable should not be accessed directly, +// but through the 'IsEmojiAllow' function. +var allowEmojis bool + // defaultLogger is the default logger instance in case the user does not set one var defaultLogger = NewLogger(INFO, nil) @@ -189,11 +193,13 @@ func (logger jfrogLogger) Output(a ...interface{}) { } func (logger *jfrogLogger) Println(log *log.Logger, isTerminal bool, values ...interface{}) { - // Remove emojis from all strings if it's not a terminal or if the terminal is not supporting colors + // If not requested, remove emojis from all strings if it's not a terminal or if the terminal is not supporting colors if !(IsColorsSupported() && isTerminal) { for i, value := range values { if str, ok := value.(string); ok { - if gomoji.ContainsEmoji(str) { + if allowEmojis { + values[i] = str + } else if gomoji.ContainsEmoji(str) { values[i] = gomoji.RemoveEmojis(str) } } @@ -249,6 +255,18 @@ func SetIsTerminalFlagsWithCallback(isTerminal bool) func() { } } +func IsEmojiAllow() bool { + return allowEmojis +} + +func SetAllowEmojiFlagWithCallback(allow bool) func() { + prevAllowEmojis := allowEmojis + allowEmojis = allow + return func() { + allowEmojis = prevAllowEmojis + } +} + func IsColorsSupported() bool { if colorsSupported == nil { supported := true diff --git a/vendor/github.com/jfrog/jfrog-client-go/utils/utils.go b/vendor/github.com/jfrog/jfrog-client-go/utils/utils.go index 9ad59894..3c0ba281 100644 --- a/vendor/github.com/jfrog/jfrog-client-go/utils/utils.go +++ b/vendor/github.com/jfrog/jfrog-client-go/utils/utils.go @@ -28,7 +28,7 @@ import ( const ( Development = "development" Agent = "jfrog-client-go" - Version = "1.47.2" + Version = "1.47.3" ) type MinVersionProduct string diff --git a/vendor/modules.txt b/vendor/modules.txt index 43379af6..2d24523b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -220,7 +220,7 @@ github.com/jfrog/gofrog/safeconvert github.com/jfrog/gofrog/stringutils github.com/jfrog/gofrog/unarchive github.com/jfrog/gofrog/version -# github.com/jfrog/jfrog-cli-core/v2 v2.56.3 +# github.com/jfrog/jfrog-cli-core/v2 v2.56.4 ## explicit; go 1.22.7 github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils @@ -237,7 +237,7 @@ github.com/jfrog/jfrog-cli-core/v2/utils/ioutils github.com/jfrog/jfrog-cli-core/v2/utils/lock github.com/jfrog/jfrog-cli-core/v2/utils/log github.com/jfrog/jfrog-cli-core/v2/utils/osutils -# github.com/jfrog/jfrog-client-go v1.47.2 +# github.com/jfrog/jfrog-client-go v1.47.3 ## explicit; go 1.22.7 github.com/jfrog/jfrog-client-go/access github.com/jfrog/jfrog-client-go/access/auth