Merge pull request #1344 from FernFerret/f-parseyaml

Add parseYAML helper

README.md

@@ -83,6 +83,7 @@ this functionality might prove useful.
       - [parseInt](#parseint)
       - [parseJSON](#parsejson)
       - [parseUint](#parseuint)
+      - [parseYAML](#parseyaml)
       - [plugin](#plugin)
       - [regexMatch](#regexmatch)
       - [regexReplaceAll](#regexreplaceall)
@@ -1792,6 +1793,17 @@ Takes the given string and parses it as a base-10 int64:
 {{ "1" | parseUint }}
 ```
 
+##### `parseYAML`
+
+Takes the given input (usually the value from a key) and parses the result as
+YAML:
+
+```liquid
+{{ with $d := key "user/info" | parseYAML }}{{ $d.name }}{{ end }}
+```
+
+Note: The same caveats that apply to `parseJSON` apply to `parseYAML`.
+
 ##### `plugin`
 
 Takes the name of a plugin and optional payload and executes a Consul Template

template/funcs.go

@@ -981,6 +981,19 @@ func parseUint(s string) (uint64, error) {
 	return result, nil
 }
 
+// parseYAML returns a structure for valid YAML
+func parseYAML(s string) (interface{}, error) {
+	if s == "" {
+		return map[string]interface{}{}, nil
+	}
+
+	var data interface{}
+	if err := yaml.Unmarshal([]byte(s), &data); err != nil {
+		return nil, err
+	}
+	return data, nil
+}
+
 // plugin executes a subprocess as the given command string. It is assumed the
 // resulting command returns JSON which is then parsed and returned as the
 // value for use in the template.

template/template.go

@@ -273,6 +273,7 @@ func funcMap(i *funcMapInput) template.FuncMap {
 		"parseInt":        parseInt,
 		"parseJSON":       parseJSON,
 		"parseUint":       parseUint,
+		"parseYAML":       parseYAML,
 		"plugin":          plugin,
 		"regexReplaceAll": regexReplaceAll,
 		"regexMatch":      regexMatch,

template/template_test.go

@@ -1403,6 +1403,39 @@ func TestTemplate_Execute(t *testing.T) {
 			"1",
 			false,
 		},
+		{
+			"helper_parseYAML",
+			&NewTemplateInput{
+				Contents: `{{ "foo: bar" | parseYAML }}`,
+			},
+			&ExecuteInput{
+				Brain: NewBrain(),
+			},
+			"map[foo:bar]",
+			false,
+		},
+		{
+			"helper_parseYAMLv2",
+			&NewTemplateInput{
+				Contents: `{{ "foo: bar\nbaz: \"foo\"" | parseYAML }}`,
+			},
+			&ExecuteInput{
+				Brain: NewBrain(),
+			},
+			"map[baz:foo foo:bar]",
+			false,
+		},
+		{
+			"helper_parseYAMLnested",
+			&NewTemplateInput{
+				Contents: `{{ "foo:\n  bar: \"baz\"\n  baz: 7" | parseYAML }}`,
+			},
+			&ExecuteInput{
+				Brain: NewBrain(),
+			},
+			"map[foo:map[bar:baz baz:7]]",
+			false,
+		},
 		{
 			"helper_plugin",
 			&NewTemplateInput{