lang/funcs: Don't panic when distinct called with empty list

hashicorp · May 31, 2019 · 55794eb · 55794eb
1 parent 8118bf8
commit 55794eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lang/funcs/collection.go b/lang/funcs/collection.go
@@ -363,6 +363,9 @@ var DistinctFunc = function.New(&function.Spec{
 			}
 		}
 
+		if len(list) == 0 {
+			return cty.ListValEmpty(retType.ElementType()), nil
+		}
 		return cty.ListVal(list), nil
 	},
 })

diff --git a/lang/funcs/collection_test.go b/lang/funcs/collection_test.go
@@ -901,6 +901,11 @@ func TestDistinct(t *testing.T) {
 			}),
 			false,
 		},
+		{
+			cty.ListValEmpty(cty.String),
+			cty.ListValEmpty(cty.String),
+			false,
+		},
 		{
 			cty.ListVal([]cty.Value{
 				cty.StringVal("a"),
-Original file line number
+Diff line change
@@ Expand Up / @@ -363,6 +363,9 @@ var DistinctFunc = function.New(&function.Spec{ @@
     			}
     		}
+    		if len(list) == 0 {
+    			return cty.ListValEmpty(retType.ElementType()), nil
+    		}
     		return cty.ListVal(list), nil
     	},
     })
@@ Expand Down @@