STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update AuthConfig to use default fn

Browse source
This commit is contained in:
William Martin 2023-10-18 16:59:39 +02:00
parent 614e49296b
commit 52ba99ebab
1 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
internal/config/config.go
View file

@ -58,7 +58,7 @@ func (c *cfg) GetOrDefault(hostname, key string) (string, error) {
return val, err
}
if val, ok := def(key); ok {
if val, ok := defaultFor(key); ok {
return val, nil
}
@ -85,7 +85,7 @@ func (c *cfg) Authentication() *AuthConfig {
return &AuthConfig{cfg: c.cfg}
}
func def(key string) (string, bool) {
func defaultFor(key string) (string, bool) {
for _, co := range configOptions {
if co.Key == key {
return co.DefaultValue, true
@ -94,24 +94,6 @@ func def(key string) (string, bool) {
return "", false
}
func defaultFor(key string) string {
for _, co := range configOptions {
if co.Key == key {
return co.DefaultValue
}
}
return ""
}
func defaultExists(key string) bool {
for _, co := range configOptions {
if co.Key == key {
return true
}
}
return false
}
// AuthConfig is used for interacting with some persistent configuration for gh,
// with knowledge on how to access encrypted storage when neccesarry.
// Behavior is scoped to authentication specific tasks.
@ -185,7 +167,12 @@ func (c *AuthConfig) GitProtocol(hostname string) (string, error) {
if err == nil {
return val, err
}
return defaultFor(key), nil
if val, ok := defaultFor(key); ok {
return val, nil
}
return "", nil
}
func (c *AuthConfig) Hosts() []string {