fix(core): json schema was invalid for monaco on trigger

kestra-io · Feb 27, 2023 · d9d592a · d9d592a
1 parent 2f65588
commit d9d592a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java b/core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java
@@ -65,6 +65,8 @@ public <T> Map<String, Object> schemas(Class<? extends T> cls) {
                 fixFlow(map);
             } else if (cls == Task.class) {
                 fixTask(map);
+            } else if (cls == AbstractTrigger.class) {
+                fixTrigger(map);
             }
 
             return map;
@@ -123,6 +125,14 @@ private static void fixTask(Map<String, Object> map) {
         allOf.remove(1);
     }
 
+    @SuppressWarnings("unchecked")
+    private static void fixTrigger(Map<String, Object> map) {
+        var definitions = (Map<String, Map<String, Object>>) map.get("definitions");
+        var task = (Map<String, Object>) definitions.get("io.kestra.core.models.triggers.AbstractTrigger-2");
+        var allOf = (List<Object>) task.get("allOf");
+        allOf.remove(1);
+    }
+
     public <T> Map<String, Object> properties(Class<T> base, Class<? extends T> cls) {
         return this.generate(cls, base);
     }

diff --git a/core/src/test/java/io/kestra/core/docs/JsonSchemaGeneratorTest.java b/core/src/test/java/io/kestra/core/docs/JsonSchemaGeneratorTest.java
@@ -4,6 +4,7 @@
 import io.kestra.core.models.annotations.PluginProperty;
 import io.kestra.core.models.tasks.RunnableTask;
 import io.kestra.core.models.tasks.VoidOutput;
+import io.kestra.core.models.triggers.AbstractTrigger;
 import io.kestra.core.runners.RunContext;
 import io.kestra.core.tasks.scripts.ScriptOutput;
 import io.kestra.core.Helpers;
@@ -105,6 +106,22 @@ void task() throws URISyntaxException {
         });
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    void trigger() throws URISyntaxException {
+        Helpers.runApplicationContext((applicationContext) -> {
+            JsonSchemaGenerator jsonSchemaGenerator = applicationContext.getBean(JsonSchemaGenerator.class);
+
+            Map<String, Object> generate = jsonSchemaGenerator.schemas(AbstractTrigger.class);
+
+            var definitions = (Map<String, Map<String, Object>>) generate.get("definitions");
+            var task = (Map<String, Object>) definitions.get("io.kestra.core.models.triggers.AbstractTrigger-2");
+            var allOf = (List<Object>) task.get("allOf");
+
+            assertThat(allOf.size(), is(1));
+        });
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     void bash() throws URISyntaxException {