From b13f5948784afd29b45e239c315240fe4d7f2cf7 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 2 Mar 2021 00:14:47 -0500 Subject: [PATCH] Fixup golang.org/x/term staticcheck warnings Errors from staticcheck: cmd/preferredimports/preferredimports.go:38:2: package golang.org/x/crypto/ssh/terminal is deprecated: this package moved to golang.org/x/term. (SA1019) vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go:36:2: package golang.org/x/crypto/ssh/terminal is deprecated: this package moved to golang.org/x/term. (SA1019) vendor/k8s.io/client-go/tools/clientcmd/auth_loaders.go:26:2: package golang.org/x/crypto/ssh/terminal is deprecated: this package moved to golang.org/x/term. (SA1019) Please review the above warnings. You can test via: hack/verify-staticcheck.sh If the above warnings do not make sense, you can exempt the line or file. See: https://staticcheck.io/docs/#ignoring-problems generated: - hack/update-internal-modules.sh - hack/lint-dependencies.sh - hack/update-vendor.sh Signed-off-by: Stephen Augustus Kubernetes-commit: d9435800b65d6787beaf061546599d757b8e87c9 --- go.mod | 3 ++- go.sum | 3 ++- plugin/pkg/client/auth/exec/exec.go | 5 +++-- tools/clientcmd/auth_loaders.go | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index c7b6cd31..75014b02 100644 --- a/go.mod +++ b/go.mod @@ -22,9 +22,10 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.6.1 - golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 diff --git a/go.sum b/go.sum index 45ccaced..76fbd3ab 100644 --- a/go.sum +++ b/go.sum @@ -299,8 +299,9 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/plugin/pkg/client/auth/exec/exec.go b/plugin/pkg/client/auth/exec/exec.go index 4957a461..c88d17e3 100644 --- a/plugin/pkg/client/auth/exec/exec.go +++ b/plugin/pkg/client/auth/exec/exec.go @@ -33,7 +33,8 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -197,7 +198,7 @@ func newAuthenticator(c *cache, config *api.ExecConfig, cluster *clientauthentic stdin: os.Stdin, stderr: os.Stderr, - interactive: terminal.IsTerminal(int(os.Stdout.Fd())), + interactive: term.IsTerminal(int(os.Stdout.Fd())), now: time.Now, environ: os.Environ, diff --git a/tools/clientcmd/auth_loaders.go b/tools/clientcmd/auth_loaders.go index 1d3c11d8..0e412776 100644 --- a/tools/clientcmd/auth_loaders.go +++ b/tools/clientcmd/auth_loaders.go @@ -23,7 +23,7 @@ import ( "io/ioutil" "os" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" clientauth "k8s.io/client-go/tools/auth" ) @@ -90,8 +90,8 @@ func promptForString(field string, r io.Reader, show bool) (result string, err e _, err = fmt.Fscan(r, &result) } else { var data []byte - if terminal.IsTerminal(int(os.Stdin.Fd())) { - data, err = terminal.ReadPassword(int(os.Stdin.Fd())) + if term.IsTerminal(int(os.Stdin.Fd())) { + data, err = term.ReadPassword(int(os.Stdin.Fd())) result = string(data) } else { return "", fmt.Errorf("error reading input for %s", field)