From c6596f0a677302c883192e4ee633dd34d8d15e6b Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Wed, 29 Nov 2023 15:24:29 +0100 Subject: [PATCH 1/2] Revert "chore(deps): bump github.com/fatih/color from 1.15.0 to 1.16.0 (#16)" This reverts commit fcd66c5c65ef2e5487868dc0587b83b612fbc033. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f8ffa3f..1e12eff 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/alecthomas/jsonschema v0.0.0-20191017121752-4bb6e3fae4f2 github.com/blang/semver/v4 v4.0.0 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/fatih/color v1.16.0 + github.com/fatih/color v1.15.0 github.com/google/go-cmp v0.6.0 github.com/google/go-querystring v1.1.0 github.com/google/uuid v1.4.0 diff --git a/go.sum b/go.sum index bcad6d7..1f53daf 100644 --- a/go.sum +++ b/go.sum @@ -104,8 +104,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= From 7d49352f15c3e67a58de3dc4407ed933144dde1c Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Mon, 27 Nov 2023 15:57:31 +0100 Subject: [PATCH 2/2] chore(cli): notify user when reading from stdin Only if stdin and stderr are both TTY. To inform users input is expected, instead of appearing to "hang". --- pkg/file/readfile.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/file/readfile.go b/pkg/file/readfile.go index f626732..de553d3 100644 --- a/pkg/file/readfile.go +++ b/pkg/file/readfile.go @@ -13,6 +13,7 @@ import ( "dario.cat/mergo" "github.com/kong/go-database-reconciler/pkg/utils" + "golang.org/x/term" "sigs.k8s.io/yaml" ) @@ -67,6 +68,9 @@ func getContent(filenames []string, mockEnvVars bool) (*Content, error) { func getReaders(fileOrDir string) (map[string]io.Reader, error) { // special case where `-` means stdin if fileOrDir == "-" { + if term.IsTerminal(int(os.Stdin.Fd())) && term.IsTerminal(int(os.Stderr.Fd())) { + fmt.Fprintf(os.Stderr, "reading input from stdin...\n") + } return map[string]io.Reader{"STDIN": os.Stdin}, nil }