config: normalize keys of the config before any manipulation

Signed-off-by: Mathieu Tortuyaux <[email protected]>

config/config.go

@@ -17,6 +17,7 @@ package config
 import (
 	"bufio"
 	"fmt"
+	"io"
 	"net/textproto"
 	"reflect"
 	"regexp"
@@ -70,10 +71,45 @@ func IsMultipartMime(userdata string) bool {
 	return strings.Contains(contentType, "multipart/mixed")
 }
 
+// Normalize transform the "-" in "_" for the keys
+// in the YAML configuration.
+// e.g reboot-strategy -> reboot_strategy
+func Normalize(r io.Reader) string {
+	var (
+		l string
+		w strings.Builder
+	)
+
+	sc := bufio.NewScanner(r)
+	for sc.Scan() {
+		l = sc.Text()
+		// sl = write_files:
+		sl := strings.Split(l, ":")
+		// sl = ["write_files", " "]
+		if len(sl) == 2 {
+			ssl := strings.Split(sl[0], "-")
+			// Handle case where it starts with -
+			// e.g:
+			// ---
+			// files:
+			//   - permissions: 0644
+			if len(ssl) == 2 && !strings.HasPrefix(ssl[1], " ") {
+				sl[0] = strings.Replace(sl[0], "-", "_", -1)
+			}
+			l = strings.Join(sl, ":")
+		}
+		w.WriteString(l + "\n")
+	}
+
+	return w.String()
+}
+
 // NewCloudConfig instantiates a new CloudConfig from the given contents (a
 // string of YAML), returning any error encountered. It will ignore unknown
 // fields but log encountering them.
 func NewCloudConfig(contents string) (*CloudConfig, error) {
+	contents = Normalize(strings.NewReader(contents))
+
 	var cfg CloudConfig
 	err := yaml.Unmarshal([]byte(contents), &cfg)
 	return &cfg, err

config/validate/validate.go

@@ -15,6 +15,7 @@
 package validate
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"regexp"
@@ -77,10 +78,12 @@ func validateCloudConfig(config []byte, rules []rule) (report Report, err error)
 // any parsing issues into the provided report. Unrecoverable errors are
 // returned as an error.
 func parseCloudConfig(cfg []byte, report *Report) (node, error) {
+	cfg = []byte(config.Normalize(bytes.NewReader(cfg)))
+
 	// unmarshal the config into an implicitly-typed form. The yaml library
 	// will implicitly convert types into their normalized form
 	// (e.g. 0744 -> 484, off -> false).
-	var weak map[interface{}]interface{}
+	var weak map[string]interface{}
 	if err := yaml.Unmarshal(cfg, &weak); err != nil {
 		matches := yamlLineError.FindStringSubmatch(err.Error())
 		if len(matches) == 3 {