Merge pull request #59 from Senetas/credentials

Allow using credentials stores
Senetas · Dec 13, 2018 · 916f6ca · 916f6ca
2 parents b8925ec + 34a91e0
commit 916f6ca
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 295 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -34,12 +34,16 @@
 
 [[constraint]]
   name = "github.com/docker/cli"
-  version = "18.6.0-ce-rc1"
+  version = "v18.09.0"
 
 [[constraint]]
   branch = "master"
   name = "github.com/docker/distribution"
 
+[[constraint]]
+  branch = "master"
+  name = "github.com/docker/docker-credential-helpers"
+
 [[constraint]]
   name = "github.com/davecgh/go-spew"
   version = "1.1.0"

diff --git a/registry/auth/credentials.go b/registry/auth/credentials.go
@@ -17,11 +17,11 @@ package auth
 import (
 	"net/http"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/docker/cli/cli/config"
+	"github.com/docker/docker/api/types"
 	dregistry "github.com/docker/docker/registry"
+
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Credentials represents a username password pair
@@ -30,22 +30,17 @@ type Credentials interface {
 }
 
 type credentials struct {
-	username string
-	password string
+	types.AuthConfig
 }
 
-// NewCreds creates a struct that satisfies Credentials from
-// a username and password (typically entered at the command like)
+// NewCreds creates a new Credentials with a username and password
 func NewCreds(username, password string) Credentials {
-	return &credentials{username: username, password: password}
-}
-
-func (c *credentials) SetAuth(req *http.Request) *http.Request {
-	req.SetBasicAuth(c.username, c.password)
-	q := req.URL.Query()
-	q.Set("account", c.username)
-	req.URL.RawQuery = q.Encode()
-	return req
+	return &credentials{
+		types.AuthConfig{
+			Username: username,
+			Password: password,
+		},
+	}
 }
 
 // NewDefaultCreds creates a credentials struct from the credentials in
@@ -58,13 +53,24 @@ func NewDefaultCreds(repoInfo *dregistry.RepositoryInfo) (creds Credentials, err
 		return
 	}
 
-	authConfig := dregistry.ResolveAuthConfig(confFile.AuthConfigs, repoInfo.Index)
+	serverAddress := dregistry.IndexServer
+	store := confFile.GetCredentialsStore(serverAddress)
 
-	log.Debug().Msgf("%s", spew.Sdump(authConfig))
-
-	creds = &credentials{username: authConfig.Username, password: authConfig.Password}
+	authConfig, err := store.Get(serverAddress)
+	if err != nil {
+		err = errors.WithStack(err)
+		return
+	}
 
-	log.Debug().Msgf("username = %s, password = %s", authConfig.Username, authConfig.Password)
+	creds = NewCreds(authConfig.Username, authConfig.Password)
 
 	return
 }
+
+func (c *credentials) SetAuth(req *http.Request) *http.Request {
+	req.SetBasicAuth(c.Username, c.Password)
+	q := req.URL.Query()
+	q.Set("account", c.Username)
+	req.URL.RawQuery = q.Encode()
+	return req
+}
diff --git a/vendor/github.com/docker/cli/cli/config/config.go b/vendor/github.com/docker/cli/cli/config/config.go
diff --git a/vendor/github.com/docker/cli/cli/config/credentials/default_store_linux.go b/vendor/github.com/docker/cli/cli/config/credentials/default_store_linux.go
diff --git a/vendor/github.com/docker/cli/opts/envfile.go b/vendor/github.com/docker/cli/opts/envfile.go
diff --git a/vendor/github.com/docker/cli/opts/file.go b/vendor/github.com/docker/cli/opts/file.go
diff --git a/vendor/github.com/docker/cli/opts/opts.go b/vendor/github.com/docker/cli/opts/opts.go
diff --git a/vendor/github.com/docker/cli/opts/parse.go b/vendor/github.com/docker/cli/opts/parse.go
diff --git a/vendor/github.com/docker/cli/opts/port.go b/vendor/github.com/docker/cli/opts/port.go
diff --git a/vendor/github.com/docker/docker-credential-helpers/credentials/version.go b/vendor/github.com/docker/docker-credential-helpers/credentials/version.go