Use the yaml formatter to preserve newlines

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>

pkg/emrichenutil/emrichenutil.go

@@ -5,6 +5,8 @@ import (
 	"errors"
 	"io"
 
+	"github.com/lima-vm/lima/pkg/yamlutil"
+
 	"github.com/go-go-golems/go-emrichen/pkg/emrichen"
 	"gopkg.in/yaml.v3"
 )
@@ -16,6 +18,14 @@ func EvaluateTemplate(data []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+	formatter, err := yamlutil.NewFormatter()
+	if err != nil {
+		return nil, err
+	}
+	data, err = formatter.Before(data)
+	if err != nil {
+		return nil, err
+	}
 	decoder := yaml.NewDecoder(bytes.NewReader(data))
 	var resultNode *yaml.Node
 	for {
@@ -42,5 +52,5 @@ func EvaluateTemplate(data []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	return output, nil
+	return formatter.Format(output)
 }

pkg/emrichenutil/emrichenutil_test.go

@@ -14,13 +14,7 @@ cpus: 2
 # Memory size
 memory: 2GiB
 `
-	// Note: emrichen currently removes empty lines, but not comments
-	expected :=
-`# CPUs
-cpus: 2
-# Memory size
-memory: 2GiB
-`
+	expected := content
 	out, err := EvaluateTemplate([]byte(content))
 	assert.NilError(t, err)
 	assert.Equal(t, expected, string(out))