feat: support JSON strings in JQ

flanksource · Sep 25, 2024 · 133502c · 133502c
1 parent 7a6ee6f
commit 133502c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/coll/jq.go b/coll/jq.go
@@ -22,6 +22,14 @@ func JQ(ctx context.Context, jqExpr string, in interface{}) (interface{}, error)
 		return nil, fmt.Errorf("jq type conversion: %w", err)
 	}
 
+	if inString, ok := in.(string); ok {
+		var v map[string]any
+		if err := json.Unmarshal([]byte(inString), &v); err == nil {
+			in = v
+		}
+
+	}
+
 	iter := query.RunWithContext(ctx, in)
 	var out interface{}
 	a := []interface{}{}

diff --git a/tests/cel_test.go b/tests/cel_test.go
@@ -175,6 +175,8 @@ func TestCelJSON(t *testing.T) {
 		Address: &Address{City: "Kathmandu"},
 	}
 
+	personJSONString, _ := json.Marshal(person)
+
 	runTests(t, []Test{
 		{nil, `dyn([{'name': 'John', 'age': 30}]).toJSON()`, `[{"age":30,"name":"John"}]`},
 		{nil, `[{'name': 'John'}].toJSON()`, `[{"name":"John"}]`},
@@ -188,10 +190,13 @@ func TestCelJSON(t *testing.T) {
 		{nil, `'{"name": "John"}'.JSON().name`, `John`},
 		{nil, `'{"name": "Alice", "age": 30}'.JSON().name`, `Alice`},
 		{nil, `'[1, 2, 3, 4, 5]'.JSONArray()[0]`, `1`},
-		{map[string]interface{}{"i": person}, "jq('.Address.city_name', i)", "Kathmandu"},
 		{map[string]interface{}{"i": person}, "i.toJSONPretty('\t')", "{\n\t\"Address\": {\n\t\t\"city_name\": \"Kathmandu\"\n\t},\n\t\"name\": \"Aditya\"\n}"},
 		{nil, "[\"Alice\", 30].toJSONPretty('\t')", "[\n\t\"Alice\",\n\t30\n]"},
 		{nil, "{'name': 'aditya'}.toJSONPretty('\t')", "{\n\t\"name\": \"aditya\"\n}"},
+
+		// JQ
+		{map[string]interface{}{"i": person}, "jq('.Address.city_name', i)", "Kathmandu"},
+		{map[string]interface{}{"i": personJSONString}, "jq('.Address.city_name', i)", "Kathmandu"},
 	})
 }