Support hosts.yml existing while config.yml does not

mislav · mislav · commit 569645a050de · 2020-07-01T14:34:44.000+02:00
After a person copies `hosts.yml` to a headless system, they will still
be forced to go through re-authentication flow unless they copy or
initialize a `config.yml` as well. This fixes respecting authentication
info from `hosts.yml` even if `config.yml` is missing.
diff --git a/internal/config/config_file.go b/internal/config/config_file.go
@@ -138,7 +138,11 @@ func migrateConfig(filename string) error {
 func ParseConfig(filename string) (Config, error) {
 	_, root, err := parseConfigFile(filename)
 	if err != nil {
-		return nil, err
+		if os.IsNotExist(err) {
+			root = NewBlankRoot()
+		} else {
+			return nil, err
+		}
 	}
 
 	if isLegacy(root) {
diff --git a/internal/config/config_file_test.go b/internal/config/config_file_test.go
@@ -110,14 +110,36 @@ github.com:
 }
 
 func Test_parseConfigFile(t *testing.T) {
-	fileContents := []string{"", " ", "\n"}
-	for _, contents := range fileContents {
-		t.Run(fmt.Sprintf("contents: %q", contents), func(t *testing.T) {
-			defer StubConfig(contents, "")()
+	tests := []struct {
+		contents string
+		wantsErr bool
+	}{
+		{
+			contents: "",
+			wantsErr: true,
+		},
+		{
+			contents: " ",
+			wantsErr: false,
+		},
+		{
+			contents: "\n",
+			wantsErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(fmt.Sprintf("contents: %q", tt.contents), func(t *testing.T) {
+			defer StubConfig(tt.contents, "")()
 			_, yamlRoot, err := parseConfigFile("config.yml")
-			eq(t, err, nil)
-			eq(t, yamlRoot.Content[0].Kind, yaml.MappingNode)
-			eq(t, len(yamlRoot.Content[0].Content), 0)
+			if tt.wantsErr != (err != nil) {
+				t.Fatalf("got error: %v", err)
+			}
+			if tt.wantsErr {
+				return
+			}
+			assert.Equal(t, yaml.MappingNode, yamlRoot.Content[0].Kind)
+			assert.Equal(t, 0, len(yamlRoot.Content[0].Content))
 		})
 	}
 }
diff --git a/internal/config/config_type.go b/internal/config/config_type.go
@@ -123,7 +123,11 @@ func NewConfig(root *yaml.Node) Config {
 }
 
 func NewBlankConfig() Config {
-	return NewConfig(&yaml.Node{
+	return NewConfig(NewBlankRoot())
+}
+
+func NewBlankRoot() *yaml.Node {
+	return &yaml.Node{
 		Kind: yaml.DocumentNode,
 		Content: []*yaml.Node{
 			{
@@ -168,7 +172,7 @@ func NewBlankConfig() Config {
 				},
 			},
 		},
-	})
+	}
 }
 
 // This type implements a Config interface and represents a config file on disk.
diff --git a/internal/config/testing.go b/internal/config/testing.go
@@ -42,7 +42,11 @@ func StubConfig(main, hosts string) func() {
 	ReadConfigFile = func(fn string) ([]byte, error) {
 		switch path.Base(fn) {
 		case "config.yml":
-			return []byte(main), nil
+			if main == "" {
+				return []byte(nil), os.ErrNotExist
+			} else {
+				return []byte(main), nil
+			}
 		case "hosts.yml":
 			if hosts == "" {
 				return []byte(nil), os.ErrNotExist

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,11 @@ func NewConfig(root *yaml.Node) Config {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`func NewBlankConfig() Config {`
`126`		`- return NewConfig(&yaml.Node{`
	`126`	`+ return NewConfig(NewBlankRoot())`
	`127`	`+}`
	`128`	`+`
	`129`	`+func NewBlankRoot() *yaml.Node {`
	`130`	`+ return &yaml.Node{`
`127`	`131`	`Kind: yaml.DocumentNode,`
`128`	`132`	`Content: []*yaml.Node{`
`129`	`133`	`{`
`@@ -168,7 +172,7 @@ func NewBlankConfig() Config {`
`168`	`172`	`},`
`169`	`173`	`},`
`170`	`174`	`},`
`171`		`- })`
	`175`	`+ }`
`172`	`176`	`}`
`173`	`177`
`174`	`178`	`// This type implements a Config interface and represents a config file on disk.`