Skip to content

Backport of templatefile variables need to be unmarked for TypeFunc into v1.10 #36138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbardin merged 1 commit into from
Nov 29, 2024
Merged

Backport of templatefile variables need to be unmarked for TypeFunc into v1.10 #36138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/lang/funcs/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,11 @@ func MakeTemplateFileFunc(baseDir string, funcsCb func() (funcs map[string]funct
if err != nil {
return cty.DynamicPseudoType, err
}
vars, _ := args[1].UnmarkDeep()

// This is safe even if args[1] contains unknowns because the HCL
// template renderer itself knows how to short-circuit those.
val, err := renderTmpl(expr, args[1])
val, err := renderTmpl(expr, vars)
return val.Type(), err
},
Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
Expand Down
4 changes: 2 additions & 2 deletions internal/lang/funcs/filesystem_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ func TestTemplateFile(t *testing.T) {
cty.StringVal("a"),
cty.StringVal("b").Mark("var"),
cty.StringVal("c"),
}),
}).Mark("vars"),
}),
cty.StringVal("- a\n- b\n- c\n").Mark("path").Mark("var"),
cty.StringVal("- a\n- b\n- c\n").Mark("path").Mark("var").Mark("vars"),
``,
},
{
Expand Down
Loading