Move GVK fields to public

Author: tomleb

pkg/stores/sqlproxy/proxy_store.go

@@ -65,12 +65,7 @@ var (
 	paramScheme = runtime.NewScheme()
 	paramCodec  = runtime.NewParameterCodec(paramScheme)
 	// Please keep the gvkKey entries in alphabetical order, on a field-by-field basis
-	typeSpecificIndexedFields = map[string][][]string{
-		gvkKey("fruits.cattle.io", "v1", "Banana"): {
-			{"color"},
-			{"number"},
-			{"numberString"},
-		},
+	TypeSpecificIndexedFields = map[string][][]string{
 		gvkKey("", "v1", "Event"): {
 			{"_type"},
 			{"involvedObject", "kind"},
@@ -503,7 +498,7 @@ func (s *Store) initializeNamespaceCache() error {
 func getFieldForGVK(gvk schema.GroupVersionKind) [][]string {
 	fields := [][]string{}
 	fields = append(fields, commonIndexFields...)
-	typeFields := typeSpecificIndexedFields[gvkKey(gvk.Group, gvk.Version, gvk.Kind)]
+	typeFields := TypeSpecificIndexedFields[gvkKey(gvk.Group, gvk.Version, gvk.Kind)]
 	if typeFields != nil {
 		fields = append(fields, typeFields...)
 	}

pkg/stores/sqlproxy/proxy_store_test.go

@@ -284,7 +284,7 @@ func TestListByPartitions(t *testing.T) {
 				Version: "test",
 				Kind:    "gvk",
 			}
-			typeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
+			TypeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
 
 			setupContext(req)
 			attributes.SetGVK(schema, gvk)
@@ -370,7 +370,7 @@ func TestListByPartitions(t *testing.T) {
 				Version: "test",
 				Kind:    "gvk",
 			}
-			typeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
+			TypeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
 
 			setupContext(req)
 			attributes.SetGVK(schema, gvk)
@@ -448,7 +448,7 @@ func TestListByPartitions(t *testing.T) {
 				Version: "test",
 				Kind:    "gvk",
 			}
-			typeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
+			TypeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
 
 			attributes.SetGVK(schema, gvk)
 			// ListByPartitions copies point so we need some original record of items to ensure as asserting listToReturn's
@@ -536,7 +536,7 @@ func TestListByPartitions(t *testing.T) {
 				Version: "test",
 				Kind:    "gvk",
 			}
-			typeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
+			TypeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
 
 			setupContext(req)
 			attributes.SetGVK(schema, gvk)
@@ -625,7 +625,7 @@ func TestListByPartitions(t *testing.T) {
 				Version: "test",
 				Kind:    "gvk",
 			}
-			typeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
+			TypeSpecificIndexedFields["some_test_gvk"] = [][]string{{"gvk", "specific", "fields"}}
 
 			setupContext(req)
 			attributes.SetGVK(schema, gvk)

tests/integration_test.go

@@ -92,6 +92,11 @@ func (i *IntegrationSuite) SetupSuite() {
 	sqlproxy.TypeGuidanceTable[schema.GroupVersionKind{Group: "fruits.cattle.io", Version: "v1", Kind: "Banana"}] = map[string]string{
 		"number": "INT",
 	}
+	sqlproxy.TypeSpecificIndexedFields["fruits.cattle.io_v1_Banana"] = [][]string{
+		{"color"},
+		{"number"},
+		{"numberString"},
+	}
 }
 
 func (i *IntegrationSuite) TearDownSuite() {

tests/testdata/filtering/scenario1.test.yaml

@@ -6,6 +6,8 @@ customizations:
   # - path: numberString
   # - path: color
 tests:
+- query: filter=color=green
+  expected: [green]
 - query: filter=metadata.name+IN+(yellow)
   expected: [yellow]
 - query: filter=metadata.name+NOTIN+(yellow)