Revert "filter nulls when shimming a config"

This reverts commit 97bde5467c.
This commit is contained in:
James Bardin 2019-04-02 17:04:09 -04:00
parent f5395bd98a
commit e024960c74
3 changed files with 3 additions and 25 deletions

View File

@ -167,10 +167,7 @@ func ConfigValueFromHCL2(v cty.Value) interface{} {
it := v.ElementIterator()
for it.Next() {
_, ev := it.Element()
cv := ConfigValueFromHCL2(ev)
if cv != nil {
l = append(l, cv)
}
l = append(l, ConfigValueFromHCL2(ev))
}
return l
}

View File

@ -232,26 +232,6 @@ func TestConfigValueFromHCL2Block(t *testing.T) {
&configschema.Block{},
nil,
},
// nulls should be filtered out of the config, since they couldn't exist
// in hcl.
{
cty.ObjectVal(map[string]cty.Value{
"list": cty.ListVal([]cty.Value{
cty.StringVal("ok"),
cty.NullVal(cty.String)}),
}),
&configschema.Block{
Attributes: map[string]*configschema.Attribute{
"list": {
Type: cty.List(cty.String),
Optional: true,
},
},
},
map[string]interface{}{
"list": []interface{}{"ok"},
},
},
}
for _, test := range tests {

View File

@ -1342,7 +1342,8 @@ func validateConfigNulls(v cty.Value, path cty.Path) []*proto.Diagnostic {
if ev.IsNull() {
diags = append(diags, &proto.Diagnostic{
Severity: proto.Diagnostic_ERROR,
Summary: "null value found in list",
Summary: "Null value found in list",
Detail: "Null values are not allowed for this attribute value.",
Attribute: convert.PathToAttributePath(append(path, cty.IndexStep{Key: kv})),
})
continue