Improve serialization of documents consisting only of comments.

getsops · Jan 6, 2021 · 0163f93 · 0163f93
1 parent 37f3196
commit 0163f93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/stores/yaml/store.go b/stores/yaml/store.go
@@ -355,9 +355,13 @@ func (store *Store) EmitPlainFile(branches sops.TreeBranches) ([]byte, error) {
 		// Add global mapping
 		var mapping = yaml.Node{}
 		mapping.Kind = yaml.MappingNode
-		doc.Content = append(doc.Content, &mapping)
 		// 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)
+		}
 		// Encode YAML
 		err := e.Encode(&doc)
 		if err != nil {

diff --git a/stores/yaml/store_test.go b/stores/yaml/store_test.go
@@ -84,7 +84,7 @@ prometheus-node-exporter:
 `)
 
 var COMMENT_4 = []byte(`# foo
-{}
+
 `)
 
 func TestUnmarshalMetadataFromNonSOPSFile(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,7 @@ prometheus-node-exporter: @@
     `)
     var COMMENT_4 = []byte(`# foo
-    {}
     `)
     func TestUnmarshalMetadataFromNonSOPSFile(t *testing.T) {
@@ Expand Down @@