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

hclsyntax: Fix panic for marked template loops

Browse Source
This commit is contained in:
Alisdair McDiarmid 2020-12-18 13:47:47 -05:00
parent 94940f55d6
commit d74545cb03
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hclsyntax/expression_template.go
View File

@ -152,6 +152,7 @@ func (e *TemplateJoinExpr) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnosti
return cty.UnknownVal(cty.String), diags return cty.UnknownVal(cty.String), diags
} }
tuple, marks := tuple.Unmark()
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
it := tuple.ElementIterator() it := tuple.ElementIterator()
for it.Next() { for it.Next() {
@ -171,7 +172,7 @@ func (e *TemplateJoinExpr) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnosti
continue continue
} }
if val.Type() == cty.DynamicPseudoType { if val.Type() == cty.DynamicPseudoType {
return cty.UnknownVal(cty.String), diags return cty.UnknownVal(cty.String).WithMarks(marks), diags
} }
strVal, err := convert.Convert(val, cty.String) strVal, err := convert.Convert(val, cty.String)
if err != nil { if err != nil {
@ -189,13 +190,13 @@ func (e *TemplateJoinExpr) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnosti
continue continue
} }
if !val.IsKnown() { if !val.IsKnown() {
return cty.UnknownVal(cty.String), diags return cty.UnknownVal(cty.String).WithMarks(marks), diags
} }
buf.WriteString(strVal.AsString()) buf.WriteString(strVal.AsString())
} }
return cty.StringVal(buf.String()), diags return cty.StringVal(buf.String()).WithMarks(marks), diags
} }
func (e *TemplateJoinExpr) Range() hcl.Range { func (e *TemplateJoinExpr) Range() hcl.Range {

14
hclsyntax/expression_template_test.go
View File

@ -316,6 +316,20 @@ trim`,
cty.StringVal(`Authenticate with "my voice is my passport"`).WithMarks(cty.NewValueMarks("sensitive")), cty.StringVal(`Authenticate with "my voice is my passport"`).WithMarks(cty.NewValueMarks("sensitive")),
0, 0,
}, },
{ // can loop over marked collections
`%{ for s in secrets }${s}%{ endfor }`,
&hcl.EvalContext{
Variables: map[string]cty.Value{
"secrets": cty.ListVal([]cty.Value{
cty.StringVal("foo"),
cty.StringVal("bar"),
cty.StringVal("baz"),
}).Mark("sensitive"),
},
},
cty.StringVal("foobarbaz").Mark("sensitive"),
0,
},
} }
for _, test := range tests { for _, test := range tests {