Merge pull request #908 from ikedam/feature/907_FixEmptyYaml

Allow empty maps for yaml (#907)
getsops · Mar 22, 2022 · e2c0479 · e2c0479
2 parents 66090e7 + 63fa89c
commit e2c0479
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/stores/yaml/store.go b/stores/yaml/store.go
@@ -361,11 +361,7 @@ func (store *Store) EmitPlainFile(branches sops.TreeBranches) ([]byte, error) {
 		mapping.Kind = yaml.MappingNode
 		// Marshal branch to global mapping node
 		store.appendTreeBranch(branch, &mapping)
-		if len(mapping.Content) == 0 {
-			doc.HeadComment = mapping.HeadComment
-		} else {
-			doc.Content = append(doc.Content, &mapping)
-		}
+		doc.Content = append(doc.Content, &mapping)
 		// Encode YAML
 		err := e.Encode(&doc)
 		if err != nil {

diff --git a/stores/yaml/store_test.go b/stores/yaml/store_test.go
@@ -198,6 +198,15 @@ func TestEmpty2(t *testing.T) {
 }
 */
 
+func TestEmpty3(t *testing.T) {
+	branches, err := (&Store{}).LoadPlainFile([]byte("{}\n"))
+	assert.Nil(t, err)
+	assert.Equal(t, len(branches), 1)
+	bytes, err := (&Store{}).EmitPlainFile(branches)
+	assert.Nil(t, err)
+	assert.Equal(t, "{}\n", string(bytes))
+}
+
 func TestComment6(t *testing.T) {
 	branches, err := (&Store{}).LoadPlainFile(COMMENT_6)
 	assert.Nil(t, err)