knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: use creds from creds store first (#1103) 

Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek 2022-07-11 16:54:12 +02:00 committed by GitHub
parent dad6047e5b
commit e1d5229900
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/creds/credentials.go
View File

@ -189,6 +189,12 @@ func NewCredentialsProvider(opts ...Opt) docker.CredentialsProvider {
dockerConfigPath := filepath.Join(home, ".docker", "config.json")
var defaultCredentialLoaders = []CredentialsCallback{
func(registry string) (docker.Credentials, error) {
return getCredentialsByCredentialHelper(c.authFilePath, registry)
},
func(registry string) (docker.Credentials, error) {
return getCredentialsByCredentialHelper(dockerConfigPath, registry)
},
func(registry string) (docker.Credentials, error) {
creds, err := config.GetCredentials(sys, registry)
if err != nil {
@ -199,12 +205,6 @@ func NewCredentialsProvider(opts ...Opt) docker.CredentialsProvider {
Password: creds.Password,
}, nil
},
func(registry string) (docker.Credentials, error) {
return getCredentialsByCredentialHelper(c.authFilePath, registry)
},
func(registry string) (docker.Credentials, error) {
return getCredentialsByCredentialHelper(dockerConfigPath, registry)
},
func(registry string) (docker.Credentials, error) { // empty credentials provider for unsecured registries
return docker.Credentials{}, nil
},

4
docker/creds/credentials_test.go
View File

@ -383,7 +383,9 @@ func TestNewCredentialsProvider(t *testing.T) {
promptUser: pwdCbkThatShallNotBeCalled(t),
verifyCredentials: correctVerifyCbk,
registry: "docker.io",
setUpEnv: withPopulatedDockerAuthConfig,
setUpEnv: all(
withPopulatedDockerAuthConfig,
setUpMockHelper("docker-credential-mock", newInMemoryHelper())),
},
want: Credentials{Username: dockerIoUser, Password: dockerIoUserPwd},
},