Enable reading from and writing to empty config files

mislav · mislav · commit bad138e44845 · 2020-06-02T13:24:46.000+02:00
diff --git a/internal/config/config_file.go b/internal/config/config_file.go
@@ -76,8 +76,11 @@ func parseConfigFile(fn string) ([]byte, *yaml.Node, error) {
 	if err != nil {
 		return data, nil, err
 	}
-	if len(root.Content) < 1 {
-		return data, &root, fmt.Errorf("malformed config")
+	if len(root.Content) == 0 {
+		return data, &yaml.Node{
+			Kind:    yaml.DocumentNode,
+			Content: []*yaml.Node{{Kind: yaml.MappingNode}},
+		}, nil
 	}
 	if root.Content[0].Kind != yaml.MappingNode {
 		return data, &root, fmt.Errorf("expected a top level map")
diff --git a/internal/config/config_file_test.go b/internal/config/config_file_test.go
@@ -3,6 +3,7 @@ package config
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"reflect"
 	"testing"
 
@@ -94,3 +95,16 @@ github.com:
 
 	eq(t, buf.String(), expected)
 }
+
+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, "")()
+			_, 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)
+		})
+	}
+}
diff --git a/internal/config/config_type.go b/internal/config/config_type.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 
@@ -172,6 +173,10 @@ func (c *fileConfig) Write() error {
 		return err
 	}
 
+	if bytes.Equal(marshalled, []byte("{}\n")) {
+		marshalled = []byte{}
+	}
+
 	return WriteConfigFile(ConfigFile(), marshalled)
 }
 
diff --git a/internal/config/config_type_test.go b/internal/config/config_type_test.go
@@ -27,3 +27,13 @@ hosts:
         editor: vim
 `, cb.String())
 }
+
+func Test_fileConfig_Write(t *testing.T) {
+	cb := bytes.Buffer{}
+	StubWriteConfig(&cb, nil)
+
+	c := NewBlankConfig()
+	assert.NoError(t, c.Write())
+
+	assert.Equal(t, "", cb.String())
+}

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,11 @@ func parseConfigFile(fn string) ([]byte, *yaml.Node, error) {`
`76`	`76`	`if err != nil {`
`77`	`77`	`return data, nil, err`
`78`	`78`	`}`
`79`		`- if len(root.Content) < 1 {`
`80`		`- return data, &root, fmt.Errorf("malformed config")`
	`79`	`+ if len(root.Content) == 0 {`
	`80`	`+ return data, &yaml.Node{`
	`81`	`+ Kind: yaml.DocumentNode,`
	`82`	`+ Content: []*yaml.Node{{Kind: yaml.MappingNode}},`
	`83`	`+ }, nil`
`81`	`84`	`}`
`82`	`85`	`if root.Content[0].Kind != yaml.MappingNode {`
`83`	`86`	`return data, &root, fmt.Errorf("expected a top level map")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package config`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "bytes"`
`4`	`5`	`"errors"`
`5`	`6`	`"fmt"`
`6`	`7`
`@@ -172,6 +173,10 @@ func (c *fileConfig) Write() error {`
`172`	`173`	`return err`
`173`	`174`	`}`
`174`	`175`
	`176`	`+ if bytes.Equal(marshalled, []byte("{}\n")) {`
	`177`	`+ marshalled = []byte{}`
	`178`	`+ }`
	`179`	`+`
`175`	`180`	`return WriteConfigFile(ConfigFile(), marshalled)`
`176`	`181`	`}`
`177`	`182`