handle defaults at the Config level instead of ConfigMap

vilmibm · vilmibm · commit 6e55e899faa4 · 2020-04-21T10:59:44.000-05:00
diff --git a/command/config_test.go b/command/config_test.go
@@ -2,7 +2,6 @@ package command
 
 import (
 	"bytes"
-	"fmt"
 	"testing"
 
 	"github.com/cli/cli/internal/config"
@@ -125,13 +124,12 @@ hosts:
   github.com:
     user: OWNER
     oauth_token: MUSTBEHIGHCUZIMATOKEN
+
 editor: ed
-git_protocol: ssh 
+git_protocol: ssh
 `
 	initBlankContext(cfg, "OWNER/REPO", "master")
 
-	fmt.Println("IN TEST")
-
 	output, err := RunCommand(configGetCmd, "config get -hgithub.com git_protocol")
 	if err != nil {
 		t.Fatalf("error running command `config get -hgithub.com git_protocol`: %v", err)
diff --git a/internal/config/config_type.go b/internal/config/config_type.go
@@ -35,20 +35,10 @@ type ConfigMap struct {
 }
 
 func (cm *ConfigMap) GetStringValue(key string) (string, error) {
-	// TODO defaults should not be handled at this level.
 	_, valueNode, err := cm.FindEntry(key)
-	var notFound *NotFoundError
-
-	if err != nil && errors.As(err, &notFound) {
-		return defaultFor(key), nil
-	} else if err != nil {
+	if err != nil {
 		return "", err
 	}
-
-	if valueNode.Value == "" {
-		return defaultFor(key), nil
-	}
-
 	return valueNode.Value, nil
 }
 
@@ -107,30 +97,38 @@ type fileConfig struct {
 }
 
 func (c *fileConfig) Get(hostname, key string) (string, error) {
-	value, err := c.GetStringValue(key)
-	fmt.Println("!!!!!!", value)
-	if err != nil {
-		return "", err
-	}
-
 	if hostname != "" {
-		fmt.Println("hostname")
 		hostCfg, err := c.configForHost(hostname)
 		if err != nil {
 			return "", err
 		}
+
 		hostValue, err := hostCfg.GetStringValue(key)
-		if err != nil {
+		var notFound *NotFoundError
+
+		if err != nil && !errors.As(err, &notFound) {
 			return "", err
 		}
 
-		fmt.Println("WHY", hostValue)
-
 		if hostValue != "" {
-			value = hostValue
+			return hostValue, nil
 		}
 	}
 
+	value, err := c.GetStringValue(key)
+
+	var notFound *NotFoundError
+
+	if err != nil && errors.As(err, &notFound) {
+		return defaultFor(key), nil
+	} else if err != nil {
+		return "", err
+	}
+
+	if value == "" {
+		return defaultFor(key), nil
+	}
+
 	return value, nil
 }
 
