expand shell task to run series of cmds as text

parodos-model-api/src/main/java/com/redhat/parodos/workflow/task/shell/ShellRunnerTask.java → prebuilt-tasks/src/main/java/com/redhat/parodos/tasks/shell/ShellRunnerTask.java

@@ -1,7 +1,8 @@
-package com.redhat.parodos.workflow.task.shell;
+package com.redhat.parodos.tasks.shell;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
@@ -49,8 +50,7 @@ private static class ShellRunnerTaskParams {
 			if (command == null || command.isBlank()) {
 				throw new IllegalArgumentException("argument 'command' is empty or blank");
 			}
-			this.cmdline = new ArrayList<>() {
-			};
+			this.cmdline = new ArrayList<>();
 			this.cmdline.add(command);
 			if (workContext.get("args") != null) {
 				this.cmdline.addAll(List.of(workContext.get("args").toString().split(" ")));
@@ -64,17 +64,28 @@ private static class ShellRunnerTaskParams {
 
 	@Override
 	public WorkReport execute(WorkContext workContext) {
+		try {
+			workContext.put("command", workContext.get("command"));
+		}
+		catch (Exception e) {
+			log.error("error command");
+		}
 		var params = new ShellRunnerTaskParams(workContext);
-		var pb = new ProcessBuilder(params.cmdline);
-		File tmpDir = null;
+		File tmpFile = null;
 		try {
-			tmpDir = Files
-					.createTempDirectory("parodos-shelltask-runner",
+			tmpFile = Files
+					.createTempFile("parodos-shelltask-runner", "",
 							PosixFilePermissions.asFileAttribute(EnumSet.of(OWNER_READ, OWNER_WRITE, OWNER_EXECUTE)))
 					.toFile();
-			pb.directory(tmpDir);
-			pb.redirectErrorStream(true);
-
+			FileWriter writer = new FileWriter(tmpFile.getAbsolutePath(), true);
+			writer.append((String) workContext.get("command"));
+			writer.close();
+		}
+		catch (Exception e) {
+			log.error("file write failed");
+		}
+		try {
+			var pb = new ProcessBuilder(tmpFile.getAbsolutePath());
 			log.info("begin shell task invocation");
 			Process p = pb.start();
 			var elapsed = !p.waitFor(params.timeoutInSeconds, TimeUnit.SECONDS);
@@ -87,15 +98,18 @@ public WorkReport execute(WorkContext workContext) {
 			try (var r = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
 				r.lines().forEach(outputConsumer);
 			}
+			try (var r = new BufferedReader(new InputStreamReader(p.getErrorStream()))) {
+				r.lines().forEach(outputConsumer);
+			}
 			log.info("ended shell task invocation");
 			return new DefaultWorkReport(p.exitValue() == 0 ? WorkStatus.COMPLETED : WorkStatus.FAILED, workContext);
 		}
 		catch (IOException | InterruptedException e) {
 			throw new RuntimeException(e);
 		}
 		finally {
-			if (tmpDir != null) {
-				tmpDir.delete();
+			if (tmpFile != null) {
+				tmpFile.delete();
 			}
 		}
 	}

parodos-model-api/src/test/java/com/redhat/parodos/workflow/task/shell/ShellRunnerTaskTest.java → prebuilt-tasks/src/test/java/com/redhat/parodos/tasks/shell/ShellRunnerTaskTest.java

@@ -1,4 +1,4 @@
-package com.redhat.parodos.workflow.task.shell;
+package com.redhat.parodos.tasks.shell;
 
 import java.util.UUID;
 
@@ -26,11 +26,9 @@ public void setUp() {
 	@Test
 	public void executeWithOutput() {
 		UUID randomUUID = UUID.randomUUID();
-		ctx.put("command", "echo");
-		ctx.put("args", randomUUID);
+		ctx.put("command", "#!/bin/bash\n echo \"%s\"\n".formatted(randomUUID));
 		var output = new StringBuilder();
 		underTest.outputConsumer = output::append;
-
 		assertThat(underTest.execute(ctx).getStatus(), equalTo(WorkStatus.COMPLETED));
 		assertThat(output.toString(), equalTo(randomUUID.toString()));
 	}
@@ -64,4 +62,4 @@ public void failsOnMissingCommand() {
 		assertThat("argument 'command' is empty or blank", equalTo(thrown.getMessage()));
 	}
 
-}
+}