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

Avoid erroring when looking up config keys for nonexistent host

Browse source
This commit is contained in:
Mislav Marohnić 2020-08-12 15:33:26 +02:00
parent 55a13a32b4
commit 7908c214df
2 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
internal/config/config_file_test.go
View file

@ -2,7 +2,6 @@ package config
import (
"bytes"
"errors"
"fmt"
"reflect"
"testing"
@ -71,17 +70,29 @@ github.com:
eq(t, token, "OTOKEN")
}
func Test_parseConfig_notFound(t *testing.T) {
func Test_parseConfig_hostFallback(t *testing.T) {
defer StubConfig(`---
hosts:
example.com:
git_protocol: ssh
`, `---
github.com:
user: monalisa
oauth_token: OTOKEN
example.com:
user: wronguser
oauth_token: NOTTHIS
`, "")()
git_protocol: https
`)()
config, err := ParseConfig("config.yml")
eq(t, err, nil)
_, err = config.Get("github.com", "user")
eq(t, err, &NotFoundError{errors.New(`could not find config entry for "github.com"`)})
val, err := config.Get("example.com", "git_protocol")
eq(t, err, nil)
eq(t, val, "https")
val, err = config.Get("github.com", "git_protocol")
eq(t, err, nil)
eq(t, val, "ssh")
val, err = config.Get("nonexist.io", "git_protocol")
eq(t, err, nil)
eq(t, val, "ssh")
}
func Test_ParseConfig_migrateConfig(t *testing.T) {

17
internal/config/config_type.go
View file

@ -201,16 +201,19 @@ func (c *fileConfig) Root() *yaml.Node {
func (c *fileConfig) Get(hostname, key string) (string, error) {
if hostname != "" {
var notFound *NotFoundError
hostCfg, err := c.configForHost(hostname)
if err != nil {
if err != nil && !errors.As(err, &notFound) {
return "", err
}
hostValue, err := hostCfg.GetStringValue(key)
var notFound *NotFoundError
if err != nil && !errors.As(err, &notFound) {
return "", err
var hostValue string
if hostCfg != nil {
hostValue, err = hostCfg.GetStringValue(key)
if err != nil && !errors.As(err, &notFound) {
return "", err
}
}
if hostValue != "" {
@ -385,7 +388,7 @@ func (c *fileConfig) hostEntries() ([]*HostConfig, error) {
return hostConfigs, nil
}
// Hosts returns a list of all known hostnames configred in hosts.yml
// Hosts returns a list of all known hostnames configured in hosts.yml
func (c *fileConfig) Hosts() ([]string, error) {
entries, err := c.hostEntries()
if err != nil {