Skip to content

cli/config/configfile: inline getConfiguredCredentialStore #6352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thaJeztah wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −15
Draft

cli/config/configfile: inline getConfiguredCredentialStore #6352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions cli/config/configfile/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,12 @@ func decodeAuth(authStr string) (string, string, error) {
// GetCredentialsStore returns a new credentials store from the settings in the
// configuration file
func (c *ConfigFile) GetCredentialsStore(registryHostname string) credentials.Store {
store := credentials.NewFileStore(c)

if helper := getConfiguredCredentialStore(c, getAuthConfigKey(registryHostname)); helper != "" {
var store credentials.Store
acKey := getAuthConfigKey(registryHostname)
if helper, ok := c.CredentialHelpers[acKey]; ok && helper != "" {
store = newNativeStore(c, helper)
} else {
store = credentials.NewFileStore(c)
}

envConfig := os.Getenv(DockerEnvConfigKey)
Expand Down Expand Up @@ -390,18 +392,6 @@ func (c *ConfigFile) GetAuthConfig(registryHostname string) (types.AuthConfig, e
return c.GetCredentialsStore(acKey).Get(acKey)
}

// getConfiguredCredentialStore returns the credential helper configured for the
// given registry, the default credsStore, or the empty string if neither are
// configured.
func getConfiguredCredentialStore(c *ConfigFile, registryHostname string) string {
if c.CredentialHelpers != nil && registryHostname != "" {
if helper, exists := c.CredentialHelpers[registryHostname]; exists {
return helper
}
}
return c.CredentialsStore
}

// GetAllCredentials returns all of the credentials stored in all of the
// configured credential stores.
func (c *ConfigFile) GetAllCredentials() (map[string]types.AuthConfig, error) {
Expand Down
Loading