function/stdlib: flatten no longer treats null values as unknown

zclconf · Jul 6, 2021 · 1712101 · 1712101
1 parent 55b3bcf
commit 1712101
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/cty/function/stdlib/collection.go b/cty/function/stdlib/collection.go
@@ -538,7 +538,7 @@ func flattener(flattenList cty.Value) ([]cty.Value, []cty.ValueMarks, bool) {
 
 		// Any dynamic types could result in more collections that need to be
 		// flattened, so the type cannot be known.
-		if val.Type().Equals(cty.DynamicPseudoType) {
+		if val == cty.DynamicVal {
 			isKnown = false
 		}
 

diff --git a/cty/function/stdlib/collection_test.go b/cty/function/stdlib/collection_test.go
@@ -2031,6 +2031,39 @@ func TestFlatten(t *testing.T) {
 			}),
 			"",
 		},
+		{
+			cty.TupleVal([]cty.Value{
+				cty.TupleVal([]cty.Value{
+					cty.StringVal("a"),
+					cty.StringVal("b"),
+				}),
+				cty.NullVal(cty.DynamicPseudoType),
+				cty.TupleVal([]cty.Value{
+					cty.StringVal("c"),
+				}),
+			}),
+			cty.TupleVal([]cty.Value{
+				cty.StringVal("a"),
+				cty.StringVal("b"),
+				cty.NullVal(cty.DynamicPseudoType),
+				cty.StringVal("c"),
+			}),
+			"",
+		},
+		{
+			cty.TupleVal([]cty.Value{
+				cty.TupleVal([]cty.Value{
+					cty.StringVal("a"),
+					cty.StringVal("b"),
+				}),
+				cty.DynamicVal,
+				cty.TupleVal([]cty.Value{
+					cty.StringVal("c"),
+				}),
+			}),
+			cty.UnknownVal(cty.DynamicPseudoType),
+			"",
+		},
 	}
 
 	for _, test := range tests {