add pwsh in shell in

Author: gy2006

core/src/main/java/com/flowci/core/agent/domain/ShellIn.java

@@ -10,8 +10,6 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
@@ -36,7 +34,9 @@ public final class ShellIn extends CmdIn {
     @JsonIgnore
     private String condition;
 
-    private List<String> scripts;
+    private List<String> bash;
+
+    private List<String> pwsh;
 
     private int timeout = 1800;
 
@@ -48,11 +48,11 @@ public ShellIn() {
         super(Type.SHELL);
     }
 
-    public void addScript(String script) {
+    public void addBash(String script) {
         if (Strings.isNullOrEmpty(script)) {
             return;
         }
-        scripts.add(script);
+        bash.add(script);
     }
 
     public void addEnvFilters(Set<String> exports) {

core/src/main/java/com/flowci/core/job/manager/CmdManagerImpl.java

@@ -46,6 +46,12 @@
 @Component
 public class CmdManagerImpl implements CmdManager {
 
+    private enum ShellType {
+        Bash,
+
+        PowerShell;
+    }
+
     @Autowired
     private SpringEventManager eventManager;
 
@@ -60,7 +66,8 @@ public CmdIn createShellCmd(Job job, Step step, NodeTree tree) {
                 .setCondition(node.getCondition())
                 .setAllowFailure(node.isAllowFailure())
                 .setDockers(findDockerOptions(node))
-                .setScripts(linkScript(node))
+                .setBash(linkScript(node, ShellType.Bash))
+                .setPwsh(linkScript(node, ShellType.PowerShell))
                 .setEnvFilters(linkFilters(node))
                 .setInputs(linkInputs(node).merge(job.getContext(), false))
                 .setTimeout(job.getTimeout());
@@ -125,17 +132,24 @@ private Set<String> linkFilters(StepNode current) {
         return output;
     }
 
-    private List<String> linkScript(StepNode current) {
+    private List<String> linkScript(StepNode current, ShellType shellType) {
         List<String> output = new LinkedList<>();
 
         if (current.hasParent()) {
             Node parent = current.getParent();
             if (parent instanceof StepNode) {
-                output.addAll(linkScript((StepNode) parent));
+                output.addAll(linkScript((StepNode) parent, shellType));
             }
         }
 
-        output.add(current.getScript());
+        if (shellType == ShellType.Bash) {
+            output.add(current.getBash());
+        }
+
+        if (shellType == ShellType.PowerShell) {
+            output.add(current.getPwsh());
+        }
+
         return output;
     }
 
@@ -161,7 +175,7 @@ private void setPlugin(String name, ShellIn cmd) {
         cmd.setPlugin(name);
         cmd.setAllowFailure(plugin.isAllowFailure());
         cmd.addEnvFilters(plugin.getExports());
-        cmd.addScript(plugin.getScript());
+        cmd.addBash(plugin.getScript());
 
         // apply docker from plugin as run time if it's specified
         ObjectsHelper.ifNotNull(plugin.getDocker(), (docker) -> {

core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java

@@ -127,7 +127,7 @@ public void should_create_cmd_in_with_default_plugin_value() throws IOException
 
         // then:
         Vars<String> inputs = cmdIn.getInputs();
-        List<String> scripts = cmdIn.getScripts();
+        List<String> scripts = cmdIn.getBash();
         Assert.assertEquals(2, scripts.size());
 
         Assert.assertEquals("gittest", cmdIn.getPlugin());
@@ -168,8 +168,8 @@ public void should_handle_step_in_step() throws IOException {
         Assert.assertEquals("overwrite-parent", cmdStep2_1.getInputs().get("STEP_2"));
 
         // scripts should be linked
-        Assert.assertEquals("echo 2", cmdStep2_1.getScripts().get(0));
-        Assert.assertEquals("echo \"step-2-1\"\n", cmdStep2_1.getScripts().get(1));
+        Assert.assertEquals("echo 2", cmdStep2_1.getBash().get(0));
+        Assert.assertEquals("echo \"step-2-1\"\n", cmdStep2_1.getBash().get(1));
 
         // docker should from parent step
         Assert.assertEquals("ubuntu:18.04", cmdStep2_1.getDockers().get(0).getImage());
@@ -180,8 +180,8 @@ public void should_handle_step_in_step() throws IOException {
         Assert.assertEquals("parent", cmdStep2_2.getInputs().get("STEP_2"));
 
         // scripts should be linked
-        Assert.assertEquals("echo 2", cmdStep2_2.getScripts().get(0));
-        Assert.assertEquals("echo \"step-2-2\"\n", cmdStep2_2.getScripts().get(1));
+        Assert.assertEquals("echo 2", cmdStep2_2.getBash().get(0));
+        Assert.assertEquals("echo \"step-2-2\"\n", cmdStep2_2.getBash().get(1));
 
         // docker should be applied from step2-2
         Assert.assertEquals("redis", cmdStep2_2.getDockers().get(0).getImage());

core/src/test/java/com/flowci/core/test/job/JobServiceTest.java

@@ -295,7 +295,7 @@ public void should_finish_whole_job() throws InterruptedException, IOException {
         Assert.assertTrue(cmd.isAllowFailure());
         Assert.assertEquals("echo step version", cmd.getInputs().get("FLOW_VERSION"));
         Assert.assertEquals("echo step", cmd.getInputs().get("FLOW_WORKSPACE"));
-        Assert.assertEquals("echo hello\n", cmd.getScripts().get(0));
+        Assert.assertEquals("echo hello\n", cmd.getBash().get(0));
 
         // when: make dummy response from agent for step 1
         firstStep.setStatus(Step.Status.SUCCESS);
@@ -318,7 +318,7 @@ public void should_finish_whole_job() throws InterruptedException, IOException {
         cmd = (ShellIn) cmdForStep2.getValue();
         Assert.assertEquals(secondStep.getId(), cmd.getId());
         Assert.assertFalse(cmd.isAllowFailure());
-        Assert.assertEquals("echo 2", cmd.getScripts().get(0));
+        Assert.assertEquals("echo 2", cmd.getBash().get(0));
 
         // when: make dummy response from agent for step 2
         secondStep.setStatus(Step.Status.SUCCESS);

core/src/test/resources/flow-all-failure.yml

@@ -7,9 +7,9 @@ steps:
     FLOW_WORKSPACE: "echo step"
     FLOW_VERSION: "echo step version"
   allow_failure: true
-  script: |
+  bash: |
     echo hello
 
 - name: step2
   allow_failure: true
-  script: "echo 2"
+  bash: "echo 2"

core/src/test/resources/flow-with-condition.yml

@@ -12,9 +12,9 @@ steps:
     FLOW_VERSION: "echo step version"
   condition: |
     return false
-  script: |
+  bash: |
     echo hello
 
 - name: step2
   allow_failure: false
-  script: "echo 2"
+  bash: "echo 2"

core/src/test/resources/flow-with-failure.yml

@@ -6,8 +6,8 @@ steps:
 - envs:
     FLOW_WORKSPACE: "echo step"
     FLOW_VERSION: "echo step version"
-  script: |
+  bash: |
     echo shoulde failure
 
-- script: |
+- bash: |
     echo cannot run

core/src/test/resources/flow-with-filter.yml

@@ -11,9 +11,9 @@ steps:
     FLOW_WORKSPACE: "echo step"
     FLOW_VERSION: "echo step version"
   allow_failure: true
-  script: |
+  bash: |
     echo hello
 
 - name: step2
   allow_failure: false
-  script: "echo 2"
+  bash: "echo 2"

core/src/test/resources/flow-with-notify.yml

@@ -12,9 +12,9 @@ steps:
       FLOW_WORKSPACE: "echo step"
       FLOW_VERSION: "echo step version"
     allow_failure: true
-    script: |
+    bash: |
       echo hello
 
   - name: step2
     allow_failure: false
-    script: "echo 2"
+    bash: "echo 2"

core/src/test/resources/flow-with-plugin-not-found.yml

@@ -7,8 +7,8 @@ steps:
       FLOW_WORKSPACE: "echo step"
       FLOW_VERSION: "echo step version"
     allow_failure: true
-    plugin: "not found.."
+    bash: "not found.."
 
   - name: step2
     allow_failure: false
-    script: "echo 2"
+    bash: "echo 2"