fix(core): properly handle select input with expression (#5035) (#5036)

Fix: #5035
kestra-io · Sep 23, 2024 · 3df5a7f · 3df5a7f
1 parent 242d2c4
commit 3df5a7f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 6 deletions.
diff --git a/core/src/main/java/io/kestra/core/models/flows/input/MultiselectInput.java b/core/src/main/java/io/kestra/core/models/flows/input/MultiselectInput.java
@@ -14,6 +14,7 @@
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -104,7 +105,6 @@ public Input<?> render(final Function<String, Object> renderer) {
         return this;
     }
 
-    @SuppressWarnings("unchecked")
     private List<String> renderExpressionValues(final Function<String, Object> renderer) {
         Object result;
         try {
@@ -120,8 +120,9 @@ private List<String> renderExpressionValues(final Function<String, Object> rende
         }
 
         if (result instanceof List<?> list) {
-            return (List<String>) list;
+            return list.stream().filter(Objects::nonNull).map(Object::toString).toList();
         }
+
         String type = Optional.ofNullable(result).map(Object::getClass).map(Class::getSimpleName).orElse("<null>");
         throw ManualConstraintViolation.toConstraintViolationException(
             "Invalid expression result. Expected a list of strings, but received " + type,

diff --git a/core/src/main/java/io/kestra/core/models/flows/input/SelectInput.java b/core/src/main/java/io/kestra/core/models/flows/input/SelectInput.java
@@ -13,6 +13,7 @@
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -74,7 +75,6 @@ public Input<?> render(final Function<String, Object> renderer) {
         return this;
     }
 
-    @SuppressWarnings("unchecked")
     private List<String> renderExpressionValues(final Function<String, Object> renderer) {
         Object result;
         try {
@@ -90,8 +90,9 @@ private List<String> renderExpressionValues(final Function<String, Object> rende
         }
 
         if (result instanceof List<?> list) {
-            return (List<String>) list;
+            return list.stream().filter(Objects::nonNull).map(Object::toString).toList();
         }
+
         String type = Optional.ofNullable(result).map(Object::getClass).map(Class::getSimpleName).orElse("<null>");
         throw ManualConstraintViolation.toConstraintViolationException(
             "Invalid expression result. Expected a list of strings, but received " + type,

diff --git a/core/src/test/java/io/kestra/core/models/flows/input/MultiselectInputTest.java b/core/src/test/java/io/kestra/core/models/flows/input/MultiselectInputTest.java
@@ -20,7 +20,7 @@ class MultiselectInputTest {
     RunContextFactory runContextFactory;
 
     @Test
-    void shouldRenderInputGivenExpression() {
+    void shouldRenderInputGivenExpressionReturningStrings() {
         // Given
         RunContext runContext = runContextFactory.of(Map.of("values", List.of("V1", "V2")));
         MultiselectInput input = MultiselectInput
@@ -39,4 +39,25 @@ void shouldRenderInputGivenExpression() {
         // Then
         Assertions.assertEquals(((MultiselectInput)renderInput).getValues(), List.of("V1", "V2"));
     }
+
+    @Test
+    void shouldRenderInputGivenExpressionReturningIntegers() {
+        // Given
+        RunContext runContext = runContextFactory.of(Map.of("values", List.of(1, 2)));
+        MultiselectInput input = MultiselectInput
+            .builder()
+            .id("id")
+            .expression("{{ values }}")
+            .build();
+        // When
+        Input<?> renderInput = RenderableInput.mayRenderInput(input, s -> {
+            try {
+                return runContext.renderTyped(s);
+            } catch (IllegalVariableEvaluationException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        // Then
+        Assertions.assertEquals(((MultiselectInput)renderInput).getValues(), List.of("1", "2"));
+    }
 }
diff --git a/core/src/test/java/io/kestra/core/models/flows/input/SelectInputTest.java b/core/src/test/java/io/kestra/core/models/flows/input/SelectInputTest.java
@@ -20,7 +20,7 @@ class SelectInputTest {
     RunContextFactory runContextFactory;
 
     @Test
-    void shouldRenderInputGivenExpression() {
+    void shouldRenderInputGivenExpressionReturningStrings() {
         // Given
         RunContext runContext = runContextFactory.of(Map.of("values", List.of("V1", "V2")));
         SelectInput input = SelectInput
@@ -39,4 +39,25 @@ void shouldRenderInputGivenExpression() {
         // Then
         Assertions.assertEquals(((SelectInput)renderInput).getValues(), List.of("V1", "V2"));
     }
+
+    @Test
+    void shouldRenderInputGivenExpressionReturningIntegers() {
+        // Given
+        RunContext runContext = runContextFactory.of(Map.of("values", List.of(1, 2)));
+        SelectInput input = SelectInput
+            .builder()
+            .id("id")
+            .expression("{{ values }}")
+            .build();
+        // When
+        Input<?> renderInput = RenderableInput.mayRenderInput(input, s -> {
+            try {
+                return runContext.renderTyped(s);
+            } catch (IllegalVariableEvaluationException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        // Then
+        Assertions.assertEquals(((SelectInput)renderInput).getValues(), List.of("1", "2"));
+    }
 }