feat: add comma separation for json fields in rs search

flanksource · Jan 24, 2025 · f4dc518 · f4dc518
1 parent b074373
commit f4dc518
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/query/models.go b/query/models.go
@@ -40,7 +40,11 @@ var JSONPathMapper = func(ctx context.Context, tx *gorm.DB, column string, op ty
 	if !slices.Contains([]types.QueryOperator{types.Eq, types.Neq}, op) {
 		op = types.Eq
 	}
-	return tx.Where(fmt.Sprintf(`TRIM(BOTH '"' from jsonb_path_query_first(%s, '$.%s')::TEXT) %s ?`, column, path, op), val)
+	values := strings.Split(val, ",")
+	for _, v := range values {
+		tx = tx.Where(fmt.Sprintf(`TRIM(BOTH '"' from jsonb_path_query_first(%s, '$.%s')::TEXT) %s ?`, column, path, op), v)
+	}
+	return tx
 }
 
 var CommonFields = map[string]func(ctx context.Context, tx *gorm.DB, val string) (*gorm.DB, error){

diff --git a/tests/query_resource_selector_test.go b/tests/query_resource_selector_test.go
@@ -437,6 +437,12 @@ var _ = ginkgo.Describe("Resoure Selector with PEG", ginkgo.Ordered, func() {
 			expectedIDs: []uuid.UUID{dummy.KubernetesCluster.ID, dummy.EC2InstanceA.ID},
 			resource:    "config",
 		},
+		{
+			description: "config labels multiple with ,",
+			query:       `labels.account=flanksource labels.environment!=production,development`,
+			expectedIDs: []uuid.UUID{dummy.EC2InstanceA.ID},
+			resource:    "config",
+		},
 		{
 			description: "config array query",
 			query:       `config.spec.template.spec.containers[0].name=logistics-api`,