tpl: Send actual values to in from intersect

The `intersect` function uses `in` to avoid adding duplicates to the
resulting set.  We were passing `reflect.Value` items when we should
have been using `Value.Interface()` to send the actual data structure.
This fixes that.

See #1952

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index b4a737fae9b9f322b50e807946f5431da94c7d11..b7d0095204b5b881332b2f73ab4fa4d4c08e9c4b 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -330,20 +330,20 @@ func intersect(l1, l2 interface{}) (interface{}, error) {
                                        l2vv := l2v.Index(j)
                                        switch l1vv.Kind() {
                                        case reflect.String:
-                                               if l1vv.Type() == l2vv.Type() && l1vv.String() == l2vv.String() && !in(r, l2vv) {
+                                               if l1vv.Type() == l2vv.Type() && l1vv.String() == l2vv.String() && !in(r.Interface(), l2vv.Interface()) {
                                                        r = reflect.Append(r, l2vv)
                                                }
                                        case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
                                                switch l2vv.Kind() {
                                                case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-                                                       if l1vv.Int() == l2vv.Int() && !in(r, l2vv) {
+                                                       if l1vv.Int() == l2vv.Int() && !in(r.Interface(), l2vv.Interface()) {
                                                                r = reflect.Append(r, l2vv)
                                                        }
                                                }
                                        case reflect.Float32, reflect.Float64:
                                                switch l2vv.Kind() {
                                                case reflect.Float32, reflect.Float64:
-                                                       if l1vv.Float() == l2vv.Float() && !in(r, l2vv) {
+                                                       if l1vv.Float() == l2vv.Float() && !in(r.Interface(), l2vv.Interface()) {
                                                                r = reflect.Append(r, l2vv)
                                                        }
                                                }

diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go
index 28b18c927885ca8e6e7ed85ec0ef0800bc405c11..a6a284bbf6708f9962ec78141e84a0be2e23322f 100644 (file)
--- a/tpl/template_funcs_test.go
+++ b/tpl/template_funcs_test.go
@@ -776,7 +776,7 @@ func TestIntersect(t *testing.T) {
                sequence2 interface{}
                expect    interface{}
        }{
-               {[]string{"a", "b", "c"}, []string{"a", "b"}, []string{"a", "b"}},
+               {[]string{"a", "b", "c", "c"}, []string{"a", "b", "b"}, []string{"a", "b"}},
                {[]string{"a", "b"}, []string{"a", "b", "c"}, []string{"a", "b"}},
                {[]string{"a", "b", "c"}, []string{"d", "e"}, []string{}},
                {[]string{}, []string{}, []string{}},