resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22044 from saveriomiroddi/sav-allow_null_values_in_compact_function 

Allow null values in Compact function
This commit is contained in:
Radek Simko 2019-07-18 15:13:24 +01:00 committed by GitHub
parent eb02f9313a 983af7a183
commit c1844c093d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/funcs/collection.go
View File

@ -246,7 +246,7 @@ var CompactFunc = function.New(&function.Spec{
for it := listVal.ElementIterator(); it.Next(); {
_, v := it.Element()
if v.AsString() == "" {
if v.IsNull() || v.AsString() == "" {
continue
}
outputList = append(outputList, v)

10
lang/funcs/collection_test.go
View File

@ -572,6 +572,7 @@ func TestCompact(t *testing.T) {
cty.StringVal("test"),
cty.StringVal(""),
cty.StringVal("test"),
cty.NullVal(cty.String),
}),
cty.ListVal([]cty.Value{
cty.StringVal("test"),
@ -588,6 +589,14 @@ func TestCompact(t *testing.T) {
cty.ListValEmpty(cty.String),
false,
},
{
cty.ListVal([]cty.Value{
cty.NullVal(cty.String),
cty.NullVal(cty.String),
}),
cty.ListValEmpty(cty.String),
false,
},
{
cty.ListValEmpty(cty.String),
cty.ListValEmpty(cty.String),
@ -610,6 +619,7 @@ func TestCompact(t *testing.T) {
cty.StringVal("test"),
cty.UnknownVal(cty.String),
cty.StringVal(""),
cty.NullVal(cty.String),
}),
cty.UnknownVal(cty.List(cty.String)),
false,