Commit 167aac70 authored by Josh Dolitsky's avatar Josh Dolitsky Committed by Matt Farina
Browse files

Upgrade to oras v0.9.0 (#9269)


* Upgrade to oras v0.9.0
Signed-off-by: default avatarJosh Dolitsky <josh@dolit.ski>

* fix test-style
Signed-off-by: default avatarJosh Dolitsky <josh@dolit.ski>
(cherry picked from commit 0b2fec08)
No related merge requests found
Showing with 31 additions and 243 deletions
+31 -243
......@@ -29,7 +29,7 @@ import (
"github.com/gofrs/flock"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal"
"golang.org/x/term"
"sigs.k8s.io/yaml"
"helm.sh/helm/v3/cmd/helm/require"
......@@ -136,7 +136,7 @@ func (o *repoAddOptions) run(out io.Writer) error {
if o.username != "" && o.password == "" {
fd := int(os.Stdin.Fd())
fmt.Fprint(out, "Password: ")
password, err := terminal.ReadPassword(fd)
password, err := term.ReadPassword(fd)
fmt.Fprintln(out)
if err != nil {
return err
......
module helm.sh/helm/v3
go 1.14
go 1.15
require (
github.com/BurntSushi/toml v0.3.1
......@@ -36,19 +36,19 @@ require (
github.com/stretchr/testify v1.7.0
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
k8s.io/api v0.20.1
k8s.io/apiextensions-apiserver v0.20.1
k8s.io/apimachinery v0.20.1
k8s.io/apiserver v0.20.1
k8s.io/cli-runtime v0.20.1
k8s.io/client-go v0.20.1
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221
k8s.io/api v0.20.2
k8s.io/apiextensions-apiserver v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/apiserver v0.20.2
k8s.io/cli-runtime v0.20.2
k8s.io/client-go v0.20.2
k8s.io/klog/v2 v2.4.0
k8s.io/kubectl v0.20.1
sigs.k8s.io/yaml v1.2.0
)
replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
)
This diff is collapsed.
......@@ -25,7 +25,7 @@ import (
"github.com/Masterminds/semver/v3"
"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/chartutil"
......@@ -145,7 +145,7 @@ func promptUser(name string) ([]byte, error) {
fmt.Printf("Password for key %q > ", name)
// syscall.Stdin is not an int in all environments and needs to be coerced
// into one there (e.g., Windows)
pw, err := terminal.ReadPassword(int(syscall.Stdin))
pw, err := term.ReadPassword(int(syscall.Stdin))
fmt.Println()
return pw, err
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment