Support multiline string literals in HCL only in HIL fragments
This commit is contained in:
parent
7cb7455c28
commit
2b0eb1f52c
@ -82,9 +82,14 @@ func TestDecode_interface(t *testing.T) {
|
||||
},
|
||||
{
|
||||
"multiline_literal.hcl",
|
||||
true,
|
||||
nil,
|
||||
},
|
||||
{
|
||||
"multiline_literal_with_hil.hcl",
|
||||
false,
|
||||
map[string]interface{}{"multiline_literal": testhelper.Unix2dos(`hello
|
||||
world`)},
|
||||
map[string]interface{}{"multiline_literal_with_hil": testhelper.Unix2dos(`${hello
|
||||
world}`)},
|
||||
},
|
||||
{
|
||||
"multiline_no_marker.hcl",
|
||||
|
4
hcl/printer/testdata/multiline_string.golden
vendored
4
hcl/printer/testdata/multiline_string.golden
vendored
@ -1,7 +1,7 @@
|
||||
resource "null_resource" "some_command" {
|
||||
provisioner "local-exec" {
|
||||
command = "echo '
|
||||
command = "${echo '
|
||||
some newlines
|
||||
and additonal output'"
|
||||
and additonal output'}"
|
||||
}
|
||||
}
|
||||
|
4
hcl/printer/testdata/multiline_string.input
vendored
4
hcl/printer/testdata/multiline_string.input
vendored
@ -1,7 +1,7 @@
|
||||
resource "null_resource" "some_command" {
|
||||
provisioner "local-exec" {
|
||||
command = "echo '
|
||||
command = "${echo '
|
||||
some newlines
|
||||
and additonal output'"
|
||||
and additonal output'}"
|
||||
}
|
||||
}
|
||||
|
@ -480,7 +480,7 @@ func (s *Scanner) scanString() {
|
||||
// read character after quote
|
||||
ch := s.next()
|
||||
|
||||
if ch < 0 || ch == eof {
|
||||
if (ch == '\n' && braces == 0) || ch < 0 || ch == eof {
|
||||
s.err("literal not terminated")
|
||||
return
|
||||
}
|
||||
|
@ -494,7 +494,8 @@ func TestError(t *testing.T) {
|
||||
|
||||
testError(t, `"`, "1:2", "literal not terminated", token.STRING)
|
||||
testError(t, `"abc`, "1:5", "literal not terminated", token.STRING)
|
||||
testError(t, `"abc`+"\n", "2:1", "literal not terminated", token.STRING)
|
||||
testError(t, `"abc`+"\n", "1:5", "literal not terminated", token.STRING)
|
||||
testError(t, `"${abc`+"\n", "2:1", "literal not terminated", token.STRING)
|
||||
testError(t, `/*/`, "1:4", "comment not terminated", token.COMMENT)
|
||||
testError(t, `/foo`, "1:1", "expected '/' for comment", token.COMMENT)
|
||||
}
|
||||
|
@ -27,6 +27,9 @@ func Unquote(s string) (t string, err error) {
|
||||
if quote != '"' {
|
||||
return "", ErrSyntax
|
||||
}
|
||||
if !contains(s, '$') && !contains(s, '{') && contains(s, '\n') {
|
||||
return "", ErrSyntax
|
||||
}
|
||||
|
||||
// Is it trivial? Avoid allocation.
|
||||
if !contains(s, '\\') && !contains(s, quote) && !contains(s, '$') {
|
||||
@ -84,6 +87,10 @@ func Unquote(s string) (t string, err error) {
|
||||
}
|
||||
}
|
||||
|
||||
if s[0] == '\n' {
|
||||
return "", ErrSyntax
|
||||
}
|
||||
|
||||
c, multibyte, ss, err := unquoteChar(s, quote)
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
@ -40,6 +40,7 @@ var unquotetests = []unQuoteTest{
|
||||
{`"echo ${var.region}${element(split(",",var.zones),0)}"`,
|
||||
`echo ${var.region}${element(split(",",var.zones),0)}`},
|
||||
{`"${HH\\:mm\\:ss}"`, `${HH\\:mm\\:ss}`},
|
||||
{`"${\n}"`, `${\n}`},
|
||||
}
|
||||
|
||||
var misquoted = []string{
|
||||
@ -65,9 +66,12 @@ var misquoted = []string{
|
||||
"`\"",
|
||||
`"\'"`,
|
||||
`'\"'`,
|
||||
"\"\n\"",
|
||||
"\"\\n\n\"",
|
||||
"'\n'",
|
||||
`"${"`,
|
||||
`"${foo{}"`,
|
||||
"\"${foo}\n\"",
|
||||
}
|
||||
|
||||
func TestUnquote(t *testing.T) {
|
||||
|
2
test-fixtures/multiline_literal_with_hil.hcl
Normal file
2
test-fixtures/multiline_literal_with_hil.hcl
Normal file
@ -0,0 +1,2 @@
|
||||
multiline_literal_with_hil = "${hello
|
||||
world}"
|
@ -12,4 +12,4 @@ func Unix2dos(unix string) string {
|
||||
}
|
||||
|
||||
return strings.Replace(unix, "\n", "\r\n", -1)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user