From bb37c11651b9a01ff9b5191eb5072cdf0db83a51 Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Sat, 3 Feb 2018 18:25:18 -0500 Subject: Change un/pwd handling to match Buildah's Signed-off-by: TomSweeneyRedHat --- cmd/podman/pull.go | 20 +++++--------------- cmd/podman/push.go | 18 ++++-------------- 2 files changed, 9 insertions(+), 29 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index 5726b20f1..c19e6715b 100644 --- a/cmd/podman/pull.go +++ b/cmd/podman/pull.go @@ -1,16 +1,14 @@ package main import ( - "fmt" "io" "os" - "golang.org/x/crypto/ssh/terminal" - "github.com/containers/image/types" "github.com/pkg/errors" "github.com/projectatomic/libpod/libpod" "github.com/projectatomic/libpod/libpod/common" + "github.com/projectatomic/libpod/pkg/util" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) @@ -80,19 +78,11 @@ func pullCmd(c *cli.Context) error { image := args[0] var registryCreds *types.DockerAuthConfig - if c.String("creds") != "" { - creds, err := common.ParseRegistryCreds(c.String("creds")) + + if c.IsSet("creds") { + creds, err := util.ParseRegistryCreds(c.String("creds")) if err != nil { - if err == common.ErrNoPassword { - fmt.Print("Password: ") - password, err := terminal.ReadPassword(0) - if err != nil { - return errors.Wrapf(err, "could not read password from terminal") - } - creds.Password = string(password) - } else { - return err - } + return err } registryCreds = creds } diff --git a/cmd/podman/push.go b/cmd/podman/push.go index 69d6e6629..2f0d73ffa 100644 --- a/cmd/podman/push.go +++ b/cmd/podman/push.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" "github.com/projectatomic/libpod/libpod" "github.com/projectatomic/libpod/libpod/common" + "github.com/projectatomic/libpod/pkg/util" "github.com/urfave/cli" - "golang.org/x/crypto/ssh/terminal" ) var ( @@ -97,25 +97,15 @@ func pushCmd(c *cli.Context) error { } } - registryCredsString := c.String("creds") certPath := c.String("cert-dir") skipVerify := !c.BoolT("tls-verify") removeSignatures := c.Bool("remove-signatures") signBy := c.String("sign-by") - if registryCredsString != "" { - creds, err := common.ParseRegistryCreds(registryCredsString) + if c.IsSet("creds") { + creds, err := util.ParseRegistryCreds(c.String("creds")) if err != nil { - if err == common.ErrNoPassword { - fmt.Print("Password: ") - password, err := terminal.ReadPassword(0) - if err != nil { - return errors.Wrapf(err, "could not read password from terminal") - } - creds.Password = string(password) - } else { - return err - } + return err } registryCreds = creds } -- cgit v1.2.3-54-g00ecf