Avoid duplicate entries when same GVK is used

Signed-off-by: John Hunkins <[email protected]>

Author: jchunkins

pkg/lib/catalogsource/image_template.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
@@ -237,9 +238,34 @@ func InitializeCatalogSourceTemplates(catalogSource *v1alpha1.CatalogSource) []G
 			}
 			jsonPath := subGroupMap[cap_subgrp_jsonpath]
 
-			foundGVKs = append(foundGVKs, key)
+			// see if we've already added this key (don't add duplicates)
+			gvkPresent := false
+			for _, existingGVK := range foundGVKs {
+				if reflect.DeepEqual(existingGVK, key) {
+					gvkPresent = true
+				}
+			}
+			if !gvkPresent {
+				foundGVKs = append(foundGVKs, key)
+			}
+
 			// add this entry to the map and append the jsonPath to the array
-			gvkToJSONPathMap[key] = append(gvkToJSONPathMap[key], jsonPath)
+			if existingJsonPaths, ok := gvkToJSONPathMap[key]; ok {
+				// map already has this key, now find out if we've already added this path
+				foundEntry := false
+				for _, existingJsonPath := range existingJsonPaths {
+					if jsonPath == existingJsonPath {
+						foundEntry = true
+					}
+				}
+				// if we did not find a jsonpath entry then add it now
+				if !foundEntry {
+					gvkToJSONPathMap[key] = append(gvkToJSONPathMap[key], jsonPath)
+				}
+			} else {
+				gvkToJSONPathMap[key] = append(gvkToJSONPathMap[key], jsonPath)
+			}
+
 		}
 	}
 	return foundGVKs

pkg/lib/catalogsource/image_template_test.go

@@ -363,6 +363,41 @@ func TestImageTemplateFlow(t *testing.T) {
 			expectedCatalogTemplate:     "foo/v1/myimage",
 			expectedUnresolvedTemplates: []string{},
 		},
+		{
+			description: "multiple gvk template - reusing same gvk",
+			catsrc: v1alpha1.CatalogSource{
+				ObjectMeta: v1.ObjectMeta{
+					Annotations: map[string]string{
+						CatalogImageTemplateAnnotation: fmt.Sprintf("foo/v%s/%s", "{group:,version:v1,kind:Pod,name:fooA,namespace:bar,jsonpath:{.metadata.annotations.fooA}}", "{group:,version:v1,kind:Pod,name:fooA,namespace:bar,jsonpath:{.metadata.annotations.fooA}}"),
+					},
+				},
+			},
+			serverVersion: &defaultServerVersion,
+			gvks: []*v1.PartialObjectMetadata{
+				{
+					TypeMeta: v1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Pod",
+					},
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "fooA",
+						Namespace: "bar",
+						Annotations: map[string]string{
+							"fooA": "1",
+						},
+					},
+				},
+			},
+			expectedGVKKeys: []GVK_Key{
+				{
+					GroupVersionKind: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Pod"},
+					name:             "fooA",
+					namespace:        "bar",
+				},
+			},
+			expectedCatalogTemplate:     "foo/v1/1",
+			expectedUnresolvedTemplates: []string{},
+		},
 		{
 			description: "gvk template with missing object",
 			catsrc: v1alpha1.CatalogSource{