go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle multiple interpolations in string.

Browse Source 
A user testing an RC release of Terraform 0.6.7 found the following
string unexpectedly caused a syntax error:

    "echo ${var.region}${element(split(",",var.zones),0)}"

This fixes the error and covers it with a test.
This commit is contained in:
Paul Hinze 2015-11-19 13:56:32 -06:00
parent da2740d4c5
commit 5612ebd968
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hcl/strconv/quote.go
View File

@ -86,7 +86,12 @@ func Unquote(s string) (t string, err error) {
return "", ErrSyntax return "", ErrSyntax
} }
if len(s) == 0 { if len(s) == 0 {
// If there's no string left, we're done!
break break
} else {
// If there's more left, we need to pop back up to the top of the loop
// in case there's another interpolation in this string.
continue
} }
} }

2
hcl/strconv/quote_test.go
View File

@ -37,6 +37,8 @@ var unquotetests = []unQuoteTest{
{`"'"`, "'"}, {`"'"`, "'"},
{`"${file("foo")}"`, `${file("foo")}`}, {`"${file("foo")}"`, `${file("foo")}`},
{`"${file(\"foo\")}"`, `${file("foo")}`}, {`"${file(\"foo\")}"`, `${file("foo")}`},
{`"echo ${var.region}${element(split(",",var.zones),0)}"`,
`echo ${var.region}${element(split(",",var.zones),0)}`},
} }
var misquoted = []string{ var misquoted = []string{