Merge pull request #2829 from jandubois/yaml-fix

Remove custom YAML marshaller

pkg/limayaml/marshal.go

@@ -8,23 +8,14 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func marshalString(s string) ([]byte, error) {
-	if s == "null" || s == "~" {
-		// work around go-yaml bugs
-		return []byte("\"" + s + "\""), nil
-	}
-	return yaml.Marshal(s)
-}
-
 const (
 	documentStart = "---\n"
 	documentEnd   = "...\n"
 )
 
 // Marshal the struct as a YAML document, optionally as a stream.
 func Marshal(y *LimaYAML, stream bool) ([]byte, error) {
-	options := []yaml.EncodeOption{yaml.CustomMarshaler[string](marshalString)}
-	b, err := yaml.MarshalWithOptions(y, options...)
+	b, err := yaml.Marshal(y)
 	if err != nil {
 		return nil, err
 	}