fix(core): JQ filters now allow object / array destructuring after do…

…ing its thing closes #1748
kestra-io · Jul 13, 2023 · 0e65692 · 0e65692
1 parent 44ecc27
commit 0e65692
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/core/src/main/java/io/kestra/core/runners/pebble/filters/JqFilter.java b/core/src/main/java/io/kestra/core/runners/pebble/filters/JqFilter.java
@@ -1,15 +1,12 @@
 package io.kestra.core.runners.pebble.filters;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.BooleanNode;
-import com.fasterxml.jackson.databind.node.NullNode;
-import com.fasterxml.jackson.databind.node.NumericNode;
-import com.fasterxml.jackson.databind.node.TextNode;
+import com.fasterxml.jackson.databind.node.*;
+import io.kestra.core.serializers.JacksonMapper;
 import io.pebbletemplates.pebble.error.PebbleException;
 import io.pebbletemplates.pebble.extension.Filter;
 import io.pebbletemplates.pebble.template.EvaluationContext;
 import io.pebbletemplates.pebble.template.PebbleTemplate;
-import io.kestra.core.serializers.JacksonMapper;
 import net.thisptr.jackson.jq.BuiltinFunctionLoader;
 import net.thisptr.jackson.jq.JsonQuery;
 import net.thisptr.jackson.jq.Scope;
@@ -71,17 +68,21 @@ public Object apply(Object input, Map<String, Object> args, PebbleTemplate self,
                         out.add(v.numberValue());
                     } else if (v instanceof BooleanNode) {
                         out.add(v.booleanValue());
+                    } else if (v instanceof ObjectNode) {
+                        out.add(JacksonMapper.ofJson().convertValue(v, Map.class));
+                    } else if (v instanceof ArrayNode) {
+                        out.add(JacksonMapper.ofJson().convertValue(v, List.class));
                     } else {
                         out.add(v);
                     }
                 });
             } catch (Exception e) {
-                throw new Exception("Failed to resolve JQ expression '" + pattern +  "' and value '" + input +  "'", e);
+                throw new Exception("Failed to resolve JQ expression '" + pattern + "' and value '" + input + "'", e);
             }
 
             return out;
         } catch (Exception e) {
-            throw new PebbleException(e, "Unable to parse jq value '" + input +  "' with type '" + input.getClass().getName() + "'", lineNumber, self.getName());
+            throw new PebbleException(e, "Unable to parse jq value '" + input + "' with type '" + input.getClass().getName() + "'", lineNumber, self.getName());
         }
     }
 }
diff --git a/core/src/test/java/io/kestra/core/runners/pebble/filters/JqFilterTest.java b/core/src/test/java/io/kestra/core/runners/pebble/filters/JqFilterTest.java
@@ -4,6 +4,7 @@
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
 import io.kestra.core.runners.VariableRenderer;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
 import java.time.ZoneId;
@@ -12,7 +13,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.inject.Inject;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
@@ -128,4 +128,20 @@ void typed() throws IllegalVariableEvaluationException {
         assertThat(variableRenderer.render("{{ vars | jq(\".bool\") | first | className }}", vars), is("java.lang.Boolean"));
         assertThat(variableRenderer.render("{{ vars | jq(\".null\") | first | className }}", vars), is(""));
     }
+
+    @Test
+    void object() throws IllegalVariableEvaluationException {
+        ImmutableMap<String, Object> vars = ImmutableMap.of(
+            "vars", ImmutableMap.of(
+                "object", Map.of("key", "value"),
+                "array", new String[]{"arrayValue"}
+            )
+        );
+
+        String render = variableRenderer.render("{% set object = vars | jq(\".object\") %}{{object[0].key}}", vars);
+        assertThat(render, is("value"));
+
+        render = variableRenderer.render("{% set array = vars | jq(\".array\") %}{{array[0][0]}}", vars);
+        assertThat(render, is("arrayValue"));
+    }
 }