Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions internal/lang/blocktoattr/fixup.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ func (b *fixupBody) fixupContent(content *hcl.BodyContent) *hcl.BodyContent {
NameRange: blocks[0].TypeRange,
}
}

ret.MissingItemRange = b.MissingItemRange()
return &ret
}

Expand Down
48 changes: 48 additions & 0 deletions internal/lang/blocktoattr/fixup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,46 @@ container {
}),
}),
},

"missing nested block items": {
src: `
container {
foo {
bar = "one"
}
}
`,
schema: &configschema.Block{
BlockTypes: map[string]*configschema.NestedBlock{
"container": {
Nesting: configschema.NestingList,
MinItems: 2,
Block: configschema.Block{
Attributes: map[string]*configschema.Attribute{
"foo": {
Type: cty.List(cty.Object(map[string]cty.Type{
"bar": cty.String,
})),
Optional: true,
},
},
},
},
},
},
want: cty.ObjectVal(map[string]cty.Value{
"container": cty.ListVal([]cty.Value{
cty.ObjectVal(map[string]cty.Value{
"foo": cty.ListVal([]cty.Value{
cty.ObjectVal(map[string]cty.Value{
"bar": cty.StringVal("baz"),
}),
}),
}),
}),
}),
wantErrs: true,
},
}

ctx := &hcl.EvalContext{
Expand Down Expand Up @@ -398,6 +438,14 @@ container {
if !diags.HasErrors() {
t.Errorf("succeeded, but want error\ngot: %#v", got)
}

// check that our wrapped body returns the correct context by
// verifying the Subject is valid.
for _, d := range diags {
if d.Subject.Filename == "" {
t.Errorf("empty diagnostic subject: %#v", d.Subject)
}
}
return
}

Expand Down