Skip to content

Commit

Permalink
Upgrade to oras v0.9.0 (helm#9269)
Browse files Browse the repository at this point in the history
* Upgrade to oras v0.9.0

Signed-off-by: Josh Dolitsky <[email protected]>

* fix test-style

Signed-off-by: Josh Dolitsky <[email protected]>
(cherry picked from commit 0b2fec0)
  • Loading branch information
jdolitsky authored and mattfarina committed Feb 4, 2021
1 parent bb44eae commit 167aac7
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 243 deletions.
4 changes: 2 additions & 2 deletions cmd/helm/repo_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module helm.sh/helm/v3

go 1.14
go 1.15

require (
github.com/BurntSushi/toml v0.3.1
Expand Down Expand Up @@ -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
)
Loading

0 comments on commit 167aac7

Please sign in to comment.