Merge branch 'dev'

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,
 	}

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/gookit/color v1.5.4
 	github.com/jfrog/archiver/v3 v3.6.1
-	github.com/jfrog/build-info-go v1.10.2
+	github.com/jfrog/build-info-go v1.10.3
 	github.com/jfrog/gofrog v1.7.6
 	github.com/minio/sha256-simd v1.0.1
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -59,8 +59,8 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/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.10.2 h1:RCCBsahRNYOm3W7Z9tAL/ixBLzrOzm4mTgI2N6jvqsw=
-github.com/jfrog/build-info-go v1.10.2/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
+github.com/jfrog/build-info-go v1.10.3 h1:9nqBdZD6xkuxiOvxg+idZ79QLFWQNuucvKkl8Xb42kw=
+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/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

tests/utils_test.go

@@ -159,7 +159,7 @@ func init() {
 	XrayUrl = flag.String("xr.url", "", "Xray url")
 	XscUrl = flag.String("xsc.url", "", "Xsc url")
 	PipelinesUrl = flag.String("pipe.url", "", "Pipelines url")
-	AccessUrl = flag.String("access.url", "http://localhost:8081/access", "Access url")
+	AccessUrl = flag.String("access.url", "http://127.0.0.1:8082/access", "Access url")
 	RtUser = flag.String("rt.user", "admin", "Artifactory username")
 	RtPassword = flag.String("rt.password", "password", "Artifactory password")
 	AccessToken = flag.String("access.token", testUtils.GetLocalArtifactoryTokenIfNeeded(*RtUrl), "Access token")

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

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