From 8eb522223a33b6e2653da2d41ebd444e29a12cb7 Mon Sep 17 00:00:00 2001 From: "red-hat-konflux-kflux-prd-rh02[bot]" <190377777+red-hat-konflux-kflux-prd-rh02[bot]@users.noreply.github.com> Date: Sat, 2 May 2026 00:31:45 +0000 Subject: [PATCH] Update module github.com/gookit/color to v1.6.1 Signed-off-by: red-hat-konflux-kflux-prd-rh02 <190377777+red-hat-konflux-kflux-prd-rh02[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/gookit/color/.gitignore | 1 + vendor/github.com/gookit/color/color.go | 9 +++++++-- vendor/github.com/gookit/color/convert.go | 6 +++--- vendor/github.com/gookit/color/detect_windows.go | 9 +++------ vendor/modules.txt | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index a9ee08457c..187f8c18c9 100644 --- a/go.mod +++ b/go.mod @@ -166,7 +166,7 @@ require ( github.com/go-openapi/testify/v2 v2.4.1 // indirect github.com/gobuffalo/flect v1.0.3 // indirect github.com/google/gnostic-models v0.7.1 // indirect - github.com/gookit/color v1.6.0 // indirect + github.com/gookit/color v1.6.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/itchyny/timefmt-go v0.1.7 // indirect github.com/mattn/go-colorable v0.1.14 // indirect diff --git a/go.sum b/go.sum index fdfda79f06..8ebe121687 100644 --- a/go.sum +++ b/go.sum @@ -195,8 +195,8 @@ github.com/googleapis/gax-go/v2 v2.20.0 h1:NIKVuLhDlIV74muWlsMM4CcQZqN6JJ20Qcxd9 github.com/googleapis/gax-go/v2 v2.20.0/go.mod h1:But/NJU6TnZsrLai/xBAQLLz+Hc7fHZJt/hsCz3Fih4= github.com/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0= github.com/gookit/assert v0.1.1/go.mod h1:jS5bmIVQZTIwk42uXl4lyj4iaaxx32tqH16CFj0VX2E= -github.com/gookit/color v1.6.0 h1:JjJXBTk1ETNyqyilJhkTXJYYigHG24TM9Xa2M1xAhRA= -github.com/gookit/color v1.6.0/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs= +github.com/gookit/color v1.6.1 h1:KoTnDxJPRgrL0SoX0f8rCFg2zI0t4E3GZZBMo2nN8LU= +github.com/gookit/color v1.6.1/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= diff --git a/vendor/github.com/gookit/color/.gitignore b/vendor/github.com/gookit/color/.gitignore index 4ce2d44568..e726419b97 100644 --- a/vendor/github.com/gookit/color/.gitignore +++ b/vendor/github.com/gookit/color/.gitignore @@ -19,3 +19,4 @@ .DS_Store app demo +.xenv.toml \ No newline at end of file diff --git a/vendor/github.com/gookit/color/color.go b/vendor/github.com/gookit/color/color.go index 8c204fe9ab..a51bde09d2 100644 --- a/vendor/github.com/gookit/color/color.go +++ b/vendor/github.com/gookit/color/color.go @@ -227,8 +227,13 @@ func RenderString(code string, str string) string { return ClearCode(str) } - // return fmt.Sprintf(FullColorTpl, code, str) - return StartSet + code + "m" + str + ResetSet + open := StartSet + code + "m" + // If the string contains reset sequences, re-apply our color after each + // reset so that nested colored args don't break the outer color. + if strings.Contains(str, ResetSet) { + str = strings.ReplaceAll(str, ResetSet, ResetSet+open) + } + return open + str + ResetSet } // ClearCode clear color codes. diff --git a/vendor/github.com/gookit/color/convert.go b/vendor/github.com/gookit/color/convert.go index cc1f31cf08..21344e70aa 100644 --- a/vendor/github.com/gookit/color/convert.go +++ b/vendor/github.com/gookit/color/convert.go @@ -767,15 +767,15 @@ func RgbStrToHsl(rgbStr string) []float64 { } r, e1 := strconv.ParseInt(strings.TrimSpace(rgbVals[0]), 10, 0) - if e1 != nil { + if e1 != nil || r < 0 || r > 255 { return nil } g, e2 := strconv.ParseInt(strings.TrimSpace(rgbVals[1]), 10, 0) - if e2 != nil { + if e2 != nil || g < 0 || g > 255 { return nil } b, e3 := strconv.ParseInt(strings.TrimSpace(rgbVals[2]), 10, 0) - if e3 != nil { + if e3 != nil || b < 0 || b > 255 { return nil } return RgbToHsl(uint8(r), uint8(g), uint8(b)) diff --git a/vendor/github.com/gookit/color/detect_windows.go b/vendor/github.com/gookit/color/detect_windows.go index 7c331be7c0..16b58b9c04 100644 --- a/vendor/github.com/gookit/color/detect_windows.go +++ b/vendor/github.com/gookit/color/detect_windows.go @@ -30,11 +30,8 @@ var ( ) func init() { - // if support color 16+, don't need to enable VTP - if colorLevel > Level16 { - return - } - if !Enable { // disable color + // needVTP=false OR Enable=false: Don't need to enable virtual process + if !needVTP || !Enable { return } @@ -146,7 +143,7 @@ func detectSpecialTermColor(termVal string) (tl Level, needVTP bool) { } // Windows 10 build 14931 is the first release that supports 16m/TrueColor - debugf("support True Color on windows version is >= build 14931") + debugf("support True Color on windows version >= 14931, needVTP=true") return LevelRgb, true } diff --git a/vendor/modules.txt b/vendor/modules.txt index 9376b5a739..5a0bf6220d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -378,7 +378,7 @@ github.com/googleapis/gax-go/v2/callctx github.com/googleapis/gax-go/v2/internal github.com/googleapis/gax-go/v2/internallog github.com/googleapis/gax-go/v2/internallog/internal -# github.com/gookit/color v1.6.0 +# github.com/gookit/color v1.6.1 ## explicit; go 1.18 github.com/gookit/color # github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674