Support await

Signed-off-by: Matheus Cruz <[email protected]>

Author: mcruzdev

impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunShellExecutor.java

@@ -27,6 +27,7 @@
 import io.serverlessworkflow.impl.expressions.ExpressionUtils;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Path;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -37,7 +38,8 @@ public class RunShellExecutor implements RunnableTask<RunShell> {
 
   @FunctionalInterface
   private interface ProcessResultSupplier {
-    ProcessResult apply(TaskContext taskContext, ProcessBuilder processBuilder);
+    WorkflowModel apply(
+        TaskContext taskContext, ProcessBuilder processBuilder, WorkflowModel input);
   }
 
   private interface CommandSupplier {
@@ -48,9 +50,9 @@ private interface CommandSupplier {
   public CompletableFuture<WorkflowModel> apply(
       WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
     ProcessBuilder processBuilder = this.commandSupplier.apply(taskContext, workflowContext);
-    ProcessResult processResult = this.processResultSupplier.apply(taskContext, processBuilder);
-    return CompletableFuture.completedFuture(
-        workflowContext.definition().application().modelFactory().fromAny(processResult));
+    WorkflowModel workflowModel =
+        this.processResultSupplier.apply(taskContext, processBuilder, input);
+    return CompletableFuture.completedFuture(workflowModel);
   }
 
   @Override
@@ -87,27 +89,37 @@ public void init(RunShell taskConfiguration, WorkflowDefinition definition) {
             }
           }
 
+          builder.directory(Path.of(System.getProperty("user.dir")).toFile());
+
           return builder;
         };
 
     this.processResultSupplier =
-        (taskContext, processBuilder) -> {
+        (taskContext, processBuilder, input) -> {
           if (shellCommand == null || shellCommand.isBlank()) {
             throw new IllegalStateException(
                 "Missing shell command in RunShell task: " + taskContext.taskName());
           }
 
           try {
             Process process = processBuilder.start();
-            StringBuilder stdout = new StringBuilder();
-            StringBuilder stderr = new StringBuilder();
-
-            process.getInputStream().transferTo(the(stdout));
-            process.getErrorStream().transferTo(the(stderr));
 
-            int exitCode = process.waitFor();
-
-            return new ProcessResult(exitCode, stdout.toString().trim(), stderr.toString().trim());
+            if (taskConfiguration.isAwait()) {
+              StringBuilder stdout = new StringBuilder();
+              StringBuilder stderr = new StringBuilder();
+
+              process.getInputStream().transferTo(the(stdout));
+              process.getErrorStream().transferTo(the(stderr));
+              int exitCode = process.waitFor();
+              return definition
+                  .application()
+                  .modelFactory()
+                  .fromAny(
+                      new ProcessResult(
+                          exitCode, stdout.toString().trim(), stderr.toString().trim()));
+            } else {
+              return input;
+            }
 
           } catch (IOException | InterruptedException e) {
             throw new RuntimeException(e);

impl/test/src/test/java/io/serverlessworkflow/impl/test/shell/RunTaskExecutorTest.java

@@ -21,6 +21,8 @@
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.executors.ProcessResult;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Map;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
@@ -117,6 +119,27 @@ void testMissingShellCommand() throws IOException {
     }
   }
 
+  @Test
+  void testAwaitBehavior() throws IOException {
+    Workflow workflow =
+        WorkflowReader.readWorkflowFromClasspath(
+            "workflows-samples/run-shell/echo-not-awaiting.yaml");
+    try (WorkflowApplication appl = WorkflowApplication.builder().build()) {
+      Map<String, String> inputMap = Map.of("full_name", "Matheus Cruz");
+
+      WorkflowModel outputModel =
+          appl.workflowDefinition(workflow).instance(inputMap).start().join();
+
+      String content = Files.readString(Path.of("/tmp/hello.txt"));
+
+      SoftAssertions.assertSoftly(
+          softly -> {
+            softly.assertThat(content).contains("hello world not awaiting (Matheus Cruz)");
+            softly.assertThat(outputModel.asMap().get()).isEqualTo(inputMap);
+          });
+    }
+  }
+
   record Input(User user) {}
 
   record User(String name) {}

impl/test/src/test/resources/workflows-samples/run-shell/echo-not-awaiting.yaml

@@ -0,0 +1,13 @@
+document:
+  dsl: '1.0.1'
+  namespace: test
+  name: run-shell-example
+  version: '0.1.0'
+do:
+  - runShell:
+      run:
+        shell:
+          command: echo "hello world not awaiting ($FULL_NAME)" > /tmp/hello.txt && cat /tmp/hello.txt
+          environment:
+            FULL_NAME: ${.full_name}
+        await: false