diff options
author | TomSweeneyRedHat <tsweeney@redhat.com> | 2018-02-03 18:25:18 -0500 |
---|---|---|
committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2018-02-06 09:29:23 -0500 |
commit | bb37c11651b9a01ff9b5191eb5072cdf0db83a51 (patch) | |
tree | 3854db36aecff70a103dd176d97062035a7415e8 /libpod | |
parent | bf00c976dd7509b7d84d1fa5254f1ac26fc494e5 (diff) | |
download | podman-bb37c11651b9a01ff9b5191eb5072cdf0db83a51.tar.gz podman-bb37c11651b9a01ff9b5191eb5072cdf0db83a51.tar.bz2 podman-bb37c11651b9a01ff9b5191eb5072cdf0db83a51.zip |
Change un/pwd handling to match Buildah's
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/common/common.go | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/libpod/common/common.go b/libpod/common/common.go index 6af3cd232..932f1f6da 100644 --- a/libpod/common/common.go +++ b/libpod/common/common.go @@ -2,17 +2,9 @@ package common import ( "io" - "strings" - "syscall" cp "github.com/containers/image/copy" "github.com/containers/image/types" - "github.com/pkg/errors" -) - -var ( - // ErrNoPassword is returned if the user did not supply a password - ErrNoPassword = errors.Wrapf(syscall.EINVAL, "password was not supplied") ) // GetCopyOptions constructs a new containers/image/copy.Options{} struct from the given parameters @@ -60,23 +52,3 @@ func IsFalse(str string) bool { func IsValidBool(str string) bool { return IsTrue(str) || IsFalse(str) } - -// ParseRegistryCreds takes a credentials string in the form USERNAME:PASSWORD -// and returns a DockerAuthConfig -func ParseRegistryCreds(creds string) (*types.DockerAuthConfig, error) { - if creds == "" { - return nil, errors.New("no credentials supplied") - } - if !strings.Contains(creds, ":") { - return &types.DockerAuthConfig{ - Username: creds, - Password: "", - }, ErrNoPassword - } - v := strings.SplitN(creds, ":", 2) - cfg := &types.DockerAuthConfig{ - Username: v[0], - Password: v[1], - } - return cfg, nil -} |