fix(core): add flow revision to failed execution in case of trigger e…

…valuation failure
kestra-io · Sep 12, 2024 · 6f01732 · 6f01732
1 parent 5b431bf
commit 6f01732
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/core/src/main/java/io/kestra/core/runners/FlowExecutorInterface.java b/core/src/main/java/io/kestra/core/runners/FlowExecutorInterface.java
@@ -23,6 +23,10 @@ default Optional<Flow> findByIdFromFlowTask(String tenantId, String namespace, S
     }
 
     default Optional<Flow> findByExecution(Execution execution) {
+        if (execution.getFlowRevision() == null) {
+            return Optional.empty();
+        }
+
         return this.findById(
             execution.getTenantId(),
             execution.getNamespace(),

diff --git a/core/src/main/java/io/kestra/core/schedulers/AbstractScheduler.java b/core/src/main/java/io/kestra/core/schedulers/AbstractScheduler.java
@@ -432,7 +432,7 @@ else if (f.getPollingTrigger() instanceof Schedule schedule) {
                             .tenantId(f.getTriggerContext().getTenantId())
                             .namespace(f.getTriggerContext().getNamespace())
                             .flowId(f.getTriggerContext().getFlowId())
-                            .flowRevision(f.getTriggerContext().getFlowRevision())
+                            .flowRevision(f.getFlow().getRevision())
                             .labels(f.getFlow().getLabels())
                             .state(new State().withState(State.Type.FAILED))
                             .build();

diff --git a/core/src/test/java/io/kestra/core/schedulers/SchedulerPollingTriggerTest.java b/core/src/test/java/io/kestra/core/schedulers/SchedulerPollingTriggerTest.java
@@ -167,6 +167,7 @@ void failedEvaluationTest() throws Exception {
 
             assertThat(queueCount.getCount(), is(0L));
             assertThat(last.get(), notNullValue());
+            assertThat(last.get().getFlowRevision(), notNullValue());
             assertThat(last.get().getState().getCurrent(), is(State.Type.FAILED));
         }
     }