Fix path generation when merging file has period in key

The program generates a path for every leaf node in the
file-to-be-merged. It does not escape them if they contain a dot, as
the path-expressions document mentions is necessary.

Add in a test for this condition. Verified it fails without the fix.
This commit is contained in:
Cory Cross 2020-02-04 22:27:08 -08:00
parent 699fce9da4
commit ea9df0eede
3 changed files with 14 additions and 6 deletions

View File

@ -1262,7 +1262,7 @@ c:
toast: leave toast: leave
test: 1 test: 1
tell: 1 tell: 1
taco: cool tasty.taco: cool
` `
filename := test.WriteTempYamlFile(content) filename := test.WriteTempYamlFile(content)
defer test.RemoveTempYamlFile(filename) defer test.RemoveTempYamlFile(filename)
@ -1277,7 +1277,7 @@ c:
b: [3, 4] b: [3, 4]
c: c:
toast: leave toast: leave
taco: cool tasty.taco: cool
` `
test.AssertResult(t, expectedOutput, result.Output) test.AssertResult(t, expectedOutput, result.Output)
} }
@ -1443,7 +1443,7 @@ c:
test: 1 test: 1
toast: leave toast: leave
tell: 1 tell: 1
taco: cool tasty.taco: cool
` `
test.AssertResult(t, expectedOutput, result.Output) test.AssertResult(t, expectedOutput, result.Output)
} }
@ -1644,7 +1644,7 @@ c:
test: 1 test: 1
toast: leave toast: leave
tell: 1 tell: 1
taco: cool tasty.taco: cool
` `
test.AssertResult(t, expectedOutput, gotOutput) test.AssertResult(t, expectedOutput, gotOutput)
test.AssertResult(t, os.FileMode(int(0666)), info.Mode()) test.AssertResult(t, os.FileMode(int(0666)), info.Mode())

View File

@ -4,4 +4,4 @@ c:
toast: leave toast: leave
test: 1 test: 1
tell: 1 tell: 1
taco: cool tasty.taco: cool

View File

@ -51,7 +51,15 @@ func mergePathStackToString(pathStack []interface{}, appendArrays bool) string {
} }
default: default:
sb.WriteString(fmt.Sprintf("%v", path)) s := fmt.Sprintf("%v", path)
hasDot := strings.Contains(s, ".")
if hasDot {
sb.WriteString("[")
}
sb.WriteString(s)
if hasDot {
sb.WriteString("]")
}
} }
if index < len(pathStack)-1 { if index < len(pathStack)-1 {