fix test-style

Signed-off-by: Josh Dolitsky <josh@dolit.ski>
pull/9269/head
Josh Dolitsky 5 years ago
parent c42adcca56
commit 3abd43a758
No known key found for this signature in database
GPG Key ID: B2B93673243A65FB

@ -29,7 +29,7 @@ import (
"github.com/gofrs/flock" "github.com/gofrs/flock"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/term"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"helm.sh/helm/v3/cmd/helm/require" "helm.sh/helm/v3/cmd/helm/require"
@ -136,7 +136,7 @@ func (o *repoAddOptions) run(out io.Writer) error {
if o.username != "" && o.password == "" { if o.username != "" && o.password == "" {
fd := int(os.Stdin.Fd()) fd := int(os.Stdin.Fd())
fmt.Fprint(out, "Password: ") fmt.Fprint(out, "Password: ")
password, err := terminal.ReadPassword(fd) password, err := term.ReadPassword(fd)
fmt.Fprintln(out) fmt.Fprintln(out)
if err != nil { if err != nil {
return err return err

@ -36,6 +36,7 @@ require (
github.com/stretchr/testify v1.7.0 github.com/stretchr/testify v1.7.0
github.com/xeipuuv/gojsonschema v1.2.0 github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221
k8s.io/api v0.20.2 k8s.io/api v0.20.2
k8s.io/apiextensions-apiserver v0.20.2 k8s.io/apiextensions-apiserver v0.20.2
k8s.io/apimachinery v0.20.2 k8s.io/apimachinery v0.20.2

@ -25,7 +25,7 @@ import (
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/term"
"helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/chart/loader"
"helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/chartutil"
@ -145,7 +145,7 @@ func promptUser(name string) ([]byte, error) {
fmt.Printf("Password for key %q > ", name) fmt.Printf("Password for key %q > ", name)
// syscall.Stdin is not an int in all environments and needs to be coerced // syscall.Stdin is not an int in all environments and needs to be coerced
// into one there (e.g., Windows) // into one there (e.g., Windows)
pw, err := terminal.ReadPassword(int(syscall.Stdin)) pw, err := term.ReadPassword(int(syscall.Stdin))
fmt.Println() fmt.Println()
return pw, err return pw, err
} }

Loading…
Cancel
Save