tblyler/reg
1
0
Fork 0
mirror of https://github.com/genuinetools/reg.git synced 2024-06-25 01:04:44 -04:00
Code Issues Projects Releases Wiki Activity

Use credential store auth if it exists (#23)

Browse source
This commit is contained in:
soedar 2018-02-19 02:18:38 +08:00 committed by Jess Frazelle
parent 3475db4ba4
commit 9f7b235849
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
utils/utils.go
View file

@ -44,16 +44,21 @@ func GetAuthConfig(username, password, registry string) (types.AuthConfig, error
return types.AuthConfig{}, nil
}
authConfigs, err := dcfg.GetAllCredentials()
if err != nil {
return types.AuthConfig{}, fmt.Errorf("Getting credentials failed: %v", err)
}
// if they passed a specific registry, return those creds _if_ they exist
if registry != "" {
// try with the user input
if creds, ok := dcfg.AuthConfigs[registry]; ok {
if creds, ok := authConfigs[registry]; ok {
return creds, nil
}
// add https:// to user input and try again
// see https://github.com/jessfraz/reg/issues/32
if !strings.HasPrefix(registry, "https://") && !strings.HasPrefix(registry, "http://") {
if creds, ok := dcfg.AuthConfigs["https://"+registry]; ok {
if creds, ok := authConfigs["https://"+registry]; ok {
return creds, nil
}
}
@ -66,7 +71,7 @@ func GetAuthConfig(username, password, registry string) (types.AuthConfig, error
// Just set the auth config as the first registryURL, username and password
// found in the auth config.
for _, creds := range dcfg.AuthConfigs {
for _, creds := range authConfigs {
return creds, nil
}