From 8cf2ef555868b846d9196509902a4beeccfb6916 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 10 Jun 2022 15:58:34 -0400 Subject: [PATCH] Switch to released tag v1.0.0 for github.com/daviddengcn/go-colortext Signed-off-by: Davanum Srinivas --- go.mod | 8 +++++--- go.sum | 9 ++++++--- staging/src/k8s.io/kubectl/go.mod | 3 +-- staging/src/k8s.io/kubectl/go.sum | 11 +++++++---- vendor/github.com/daviddengcn/go-colortext/ct.go | 8 ++++++++ vendor/github.com/daviddengcn/go-colortext/ct_ansi.go | 7 +++++-- vendor/modules.txt | 10 ++++++---- 7 files changed, 38 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index b115794b658..f98aafe0741 100644 --- a/go.mod +++ b/go.mod @@ -158,7 +158,7 @@ require ( github.com/coredns/caddy v1.1.0 // indirect github.com/coreos/go-semver v0.3.0 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect - github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd // indirect + github.com/daviddengcn/go-colortext v1.0.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect @@ -335,7 +335,7 @@ replace ( github.com/creack/pty => github.com/creack/pty v1.1.11 github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.2.3 github.com/davecgh/go-spew => github.com/davecgh/go-spew v1.1.1 - github.com/daviddengcn/go-colortext => github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd + github.com/daviddengcn/go-colortext => github.com/daviddengcn/go-colortext v1.0.0 github.com/dnaeon/go-vcr => github.com/dnaeon/go-vcr v1.0.1 github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible github.com/docker/docker => github.com/docker/docker v20.10.12+incompatible @@ -381,7 +381,9 @@ replace ( github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/golang/mock => github.com/golang/mock v1.6.0 github.com/golang/protobuf => github.com/golang/protobuf v1.5.2 - github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e + github.com/golangplus/bytes => github.com/golangplus/bytes v1.0.0 + github.com/golangplus/fmt => github.com/golangplus/fmt v1.0.0 + github.com/golangplus/testing => github.com/golangplus/testing v1.0.0 github.com/google/btree => github.com/google/btree v1.0.1 github.com/google/cadvisor => github.com/google/cadvisor v0.44.1 github.com/google/cel-go => github.com/google/cel-go v0.11.2 diff --git a/go.sum b/go.sum index 62f9fa718b6..73f29d353ad 100644 --- a/go.sum +++ b/go.sum @@ -128,8 +128,8 @@ github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c= -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/daviddengcn/go-colortext v1.0.0 h1:ANqDyC0ys6qCSvuEK7l3g5RaehL/Xck9EX8ATG8oKsE= +github.com/daviddengcn/go-colortext v1.0.0/go.mod h1:zDqEI5NVUop5QPpVJUxE9UO10hRnmkD5G4Pmri9+m4c= github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -205,7 +205,10 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e h1:KhcknUwkWHKZPbFy2P7jH5LKJ3La+0ZeknkkmrSgqb0= +github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A= +github.com/golangplus/fmt v1.0.0/go.mod h1:zpM0OfbMCjPtd2qkTD/jX2MgiFCqklhSUFyDW44gVQE= +github.com/golangplus/testing v1.0.0 h1:+ZeeiKZENNOMkTTELoSySazi+XaEhVO0mb+eanrSEUQ= +github.com/golangplus/testing v1.0.0/go.mod h1:ZDreixUV3YzhoVraIDyOzHrr76p6NUh6k/pPg/Q3gYA= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.44.1 h1:hsAxDZOY+5xSCXH12d/G9cxYTfP+32cMT3J7aatrgDY= diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index 205afbff43e..d4386d08103 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -8,7 +8,7 @@ require ( github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 github.com/davecgh/go-spew v1.1.1 - github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd + github.com/daviddengcn/go-colortext v1.0.0 github.com/docker/distribution v2.8.1+incompatible github.com/evanphx/json-patch v4.12.0+incompatible github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d @@ -58,7 +58,6 @@ require ( github.com/go-openapi/swag v0.19.14 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect github.com/google/btree v1.0.1 // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index 381819af328..f5e70efbc33 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -77,8 +77,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c= -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/daviddengcn/go-colortext v1.0.0 h1:ANqDyC0ys6qCSvuEK7l3g5RaehL/Xck9EX8ATG8oKsE= +github.com/daviddengcn/go-colortext v1.0.0/go.mod h1:zDqEI5NVUop5QPpVJUxE9UO10hRnmkD5G4Pmri9+m4c= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= @@ -160,8 +160,11 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e h1:KhcknUwkWHKZPbFy2P7jH5LKJ3La+0ZeknkkmrSgqb0= -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= +github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= +github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A= +github.com/golangplus/fmt v1.0.0/go.mod h1:zpM0OfbMCjPtd2qkTD/jX2MgiFCqklhSUFyDW44gVQE= +github.com/golangplus/testing v1.0.0 h1:+ZeeiKZENNOMkTTELoSySazi+XaEhVO0mb+eanrSEUQ= +github.com/golangplus/testing v1.0.0/go.mod h1:ZDreixUV3YzhoVraIDyOzHrr76p6NUh6k/pPg/Q3gYA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= diff --git a/vendor/github.com/daviddengcn/go-colortext/ct.go b/vendor/github.com/daviddengcn/go-colortext/ct.go index d93bc882f83..b0e408e5614 100644 --- a/vendor/github.com/daviddengcn/go-colortext/ct.go +++ b/vendor/github.com/daviddengcn/go-colortext/ct.go @@ -5,6 +5,11 @@ Under windows platform, the Console API is used. Under other systems, ANSI text */ package ct +import ( + "io" + "os" +) + // Color is the type of color to be set. type Color int @@ -21,6 +26,9 @@ const ( White ) +// Writer is the io.Writer where ANSI escape codes will be written to +var Writer io.Writer = os.Stdout + // ResetColor resets the foreground and background to original colors func ResetColor() { resetColor() diff --git a/vendor/github.com/daviddengcn/go-colortext/ct_ansi.go b/vendor/github.com/daviddengcn/go-colortext/ct_ansi.go index dc2eb88cc88..12846573513 100644 --- a/vendor/github.com/daviddengcn/go-colortext/ct_ansi.go +++ b/vendor/github.com/daviddengcn/go-colortext/ct_ansi.go @@ -16,7 +16,7 @@ func resetColor() { if isDumbTerm() { return } - fmt.Print("\x1b[0m") + fmt.Fprint(Writer, "\x1b[0m") } func ansiText(fg Color, fgBright bool, bg Color, bgBright bool) string { @@ -32,6 +32,9 @@ func ansiText(fg Color, fgBright bool, bg Color, bgBright bool) string { } if bg != None { s = strconv.AppendUint(append(s, ";"...), 40+(uint64)(bg-Black), 10) + if bgBright { + s = append(s, ";1"...) + } } s = append(s, "m"...) return string(s) @@ -44,5 +47,5 @@ func changeColor(fg Color, fgBright bool, bg Color, bgBright bool) { if fg == None && bg == None { return } - fmt.Print(ansiText(fg, fgBright, bg, bgBright)) + fmt.Fprint(Writer, ansiText(fg, fgBright, bg, bgBright)) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 68249eaf7b8..e3ee24322c5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -242,8 +242,8 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 => github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd => github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd -## explicit +# github.com/daviddengcn/go-colortext v1.0.0 => github.com/daviddengcn/go-colortext v1.0.0 +## explicit; go 1.14 github.com/daviddengcn/go-colortext # github.com/docker/distribution v2.8.1+incompatible => github.com/docker/distribution v2.8.1+incompatible ## explicit @@ -2618,7 +2618,7 @@ sigs.k8s.io/yaml # github.com/creack/pty => github.com/creack/pty v1.1.11 # github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.2.3 # github.com/davecgh/go-spew => github.com/davecgh/go-spew v1.1.1 -# github.com/daviddengcn/go-colortext => github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd +# github.com/daviddengcn/go-colortext => github.com/daviddengcn/go-colortext v1.0.0 # github.com/dnaeon/go-vcr => github.com/dnaeon/go-vcr v1.0.1 # github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible # github.com/docker/docker => github.com/docker/docker v20.10.12+incompatible @@ -2664,7 +2664,9 @@ sigs.k8s.io/yaml # github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da # github.com/golang/mock => github.com/golang/mock v1.6.0 # github.com/golang/protobuf => github.com/golang/protobuf v1.5.2 -# github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e +# github.com/golangplus/bytes => github.com/golangplus/bytes v1.0.0 +# github.com/golangplus/fmt => github.com/golangplus/fmt v1.0.0 +# github.com/golangplus/testing => github.com/golangplus/testing v1.0.0 # github.com/google/btree => github.com/google/btree v1.0.1 # github.com/google/cadvisor => github.com/google/cadvisor v0.44.1 # github.com/google/cel-go => github.com/google/cel-go v0.11.2