From e3815ad762e82333b52ddd03caaaa2f98ca1157c Mon Sep 17 00:00:00 2001 From: rithu john Date: Thu, 29 Mar 2018 17:21:51 -0700 Subject: [PATCH] tools/clientcmd: Remove gopass import Kubernetes-commit: 7dc8b91aee8eae60df430f4280a575ee569fcac9 --- tools/clientcmd/auth_loaders.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/clientcmd/auth_loaders.go b/tools/clientcmd/auth_loaders.go index 12331f6e..1d3c11d8 100644 --- a/tools/clientcmd/auth_loaders.go +++ b/tools/clientcmd/auth_loaders.go @@ -23,7 +23,8 @@ import ( "io/ioutil" "os" - "github.com/howeyc/gopass" + "golang.org/x/crypto/ssh/terminal" + clientauth "k8s.io/client-go/tools/auth" ) @@ -89,8 +90,12 @@ func promptForString(field string, r io.Reader, show bool) (result string, err e _, err = fmt.Fscan(r, &result) } else { var data []byte - data, err = gopass.GetPasswdMasked() - result = string(data) + if terminal.IsTerminal(int(os.Stdin.Fd())) { + data, err = terminal.ReadPassword(int(os.Stdin.Fd())) + result = string(data) + } else { + return "", fmt.Errorf("error reading input for %s", field) + } } return result, err }