For INLINE task, corrected reasonForIncompletion field to include the script error message.

Author: aravindanr

core/src/main/java/com/netflix/conductor/core/execution/evaluators/JavascriptEvaluator.java

@@ -36,9 +36,8 @@ public Object evaluate(String expression, Object input) {
             LOGGER.debug("Javascript evaluator -- result: {}", result);
             return result;
         } catch (ScriptException e) {
-            String errorMsg = String.format("Error while evaluating script: %s", expression);
-            LOGGER.error(errorMsg, e);
-            throw new TerminateWorkflowException(errorMsg);
+            LOGGER.error("Error while evaluating script: {}", expression, e);
+            throw new TerminateWorkflowException(e.getMessage());
         }
     }
 }

core/src/main/java/com/netflix/conductor/core/execution/tasks/Inline.java

@@ -82,38 +82,43 @@ public boolean execute(
             taskOutput.put("result", evalResult);
             task.setStatus(TaskModel.Status.COMPLETED);
         } catch (Exception e) {
+            String errorMessage = e.getCause() != null ? e.getCause().getMessage() : e.getMessage();
             LOGGER.error(
                     "Failed to execute Inline Task: {} in workflow: {}",
                     task.getTaskId(),
                     workflow.getWorkflowId(),
                     e);
-            task.setStatus(TaskModel.Status.FAILED);
-            task.setReasonForIncompletion(e.getMessage());
-            taskOutput.put(
-                    "error", e.getCause() != null ? e.getCause().getMessage() : e.getMessage());
+            // TerminateWorkflowException is thrown when the script evaluation fails
+            // Retry will result in the same error, so FAILED_WITH_TERMINAL_ERROR status is used.
+            task.setStatus(
+                    e instanceof TerminateWorkflowException
+                            ? TaskModel.Status.FAILED_WITH_TERMINAL_ERROR
+                            : TaskModel.Status.FAILED);
+            task.setReasonForIncompletion(errorMessage);
+            taskOutput.put("error", errorMessage);
         }
 
         return true;
     }
 
     private void checkEvaluatorType(String evaluatorType) {
         if (StringUtils.isBlank(evaluatorType)) {
-            LOGGER.error("Empty {} in Inline task. ", QUERY_EVALUATOR_TYPE);
+            LOGGER.error("Empty {} in INLINE task. ", QUERY_EVALUATOR_TYPE);
             throw new TerminateWorkflowException(
                     "Empty '"
                             + QUERY_EVALUATOR_TYPE
-                            + "' in Inline task's input parameters. A non-empty String value must be provided.");
+                            + "' in INLINE task's input parameters. A non-empty String value must be provided.");
         }
         if (evaluators.get(evaluatorType) == null) {
-            LOGGER.error("Evaluator {} for Inline task not registered", evaluatorType);
+            LOGGER.error("Evaluator {} for INLINE task not registered", evaluatorType);
             throw new TerminateWorkflowException(
-                    "Unknown evaluator '" + evaluatorType + "' in Inline task.");
+                    "Unknown evaluator '" + evaluatorType + "' in INLINE task.");
         }
     }
 
     private void checkExpression(String expression) {
         if (StringUtils.isBlank(expression)) {
-            LOGGER.error("Empty {} in Inline task. ", QUERY_EXPRESSION_PARAMETER);
+            LOGGER.error("Empty {} in INLINE task. ", QUERY_EXPRESSION_PARAMETER);
             throw new TerminateWorkflowException(
                     "Empty '"
                             + QUERY_EXPRESSION_PARAMETER

core/src/test/java/com/netflix/conductor/core/execution/tasks/InlineTest.java

@@ -44,7 +44,7 @@ public void testInlineTaskValidationFailures() {
         TaskModel task = new TaskModel();
         task.getInputData().putAll(inputObj);
         inline.execute(workflow, task, executor);
-        assertEquals(TaskModel.Status.FAILED, task.getStatus());
+        assertEquals(TaskModel.Status.FAILED_WITH_TERMINAL_ERROR, task.getStatus());
         assertEquals(
                 "Empty 'expression' in Inline task's input parameters. A non-empty String value must be provided.",
                 task.getReasonForIncompletion());
@@ -57,9 +57,9 @@ public void testInlineTaskValidationFailures() {
         task = new TaskModel();
         task.getInputData().putAll(inputObj);
         inline.execute(workflow, task, executor);
-        assertEquals(TaskModel.Status.FAILED, task.getStatus());
+        assertEquals(TaskModel.Status.FAILED_WITH_TERMINAL_ERROR, task.getStatus());
         assertEquals(
-                "Empty 'evaluatorType' in Inline task's input parameters. A non-empty String value must be provided.",
+                "Empty 'evaluatorType' in INLINE task's input parameters. A non-empty String value must be provided.",
                 task.getReasonForIncompletion());
     }