Skip to content

Commit 399dc27

Browse files
authored
Merge pull request #36122 from hashicorp/jbardin/backport-36118
v1.10 backport of #36118
2 parents da3aa2f + e36378b commit 399dc27

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Diff for: internal/lang/funcs/filesystem.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func MakeTemplateFileFunc(baseDir string, funcsCb func() (funcs map[string]funct
137137

138138
vars, varsMarks := args[1].UnmarkDeep()
139139

140-
if !pathArg.IsKnown() {
140+
if !pathArg.IsKnown() || !vars.IsKnown() {
141141
return cty.UnknownVal(retType).WithMarks(pathMarks, varsMarks), nil
142142
}
143143

Diff for: internal/lang/funcs/filesystem_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,12 @@ func TestTemplateFile(t *testing.T) {
216216
cty.StringVal("- a\n- b\n- c\n").Mark("path").Mark("var"),
217217
``,
218218
},
219+
{
220+
cty.StringVal("testdata/list.tmpl").Mark("path"),
221+
cty.UnknownVal(cty.Map(cty.String)),
222+
cty.DynamicVal.Mark("path"),
223+
``,
224+
},
219225
{
220226
cty.StringVal("testdata/list.tmpl").Mark("path"),
221227
cty.ObjectVal(map[string]cty.Value{

0 commit comments

Comments
 (0)