rm script instead of bash and pwsh

Author: gy2006

tree/src/main/java/com/flowci/tree/StepNode.java

@@ -22,9 +22,14 @@ public class StepNode extends Node {
     private String condition;
 
     /**
-     * Node execute script, can be null
+     * bash script
      */
-    private String script;
+    private String bash;
+
+    /**
+     * powershell script
+     */
+    private String pwsh;
 
     /**
      * Plugin name
@@ -56,7 +61,7 @@ public boolean hasCondition() {
 
     @JsonIgnore
     public boolean hasScript() {
-        return !Strings.isNullOrEmpty(script);
+        return !Strings.isNullOrEmpty(bash) || !Strings.isNullOrEmpty(pwsh);
     }
 
     @JsonIgnore

tree/src/main/java/com/flowci/tree/yml/StepYml.java

@@ -45,7 +45,9 @@ public class StepYml extends YmlBase<StepNode> {
      */
     private String condition;
 
-    private String script;
+    private String bash; // bash script
+
+    private String pwsh; // powershell script
 
     private String plugin;
 
@@ -56,15 +58,17 @@ public class StepYml extends YmlBase<StepNode> {
     StepYml(StepNode node) {
         setName(node.getName());
         setEnvs(node.getEnvironments());
-        setScript(node.getScript());
+        setBash(node.getBash());
+        setPwsh(node.getPwsh());
         setPlugin(node.getPlugin());
         setAllow_failure(node.isAllowFailure());
     }
 
     public StepNode toNode(Node parent, int index) {
         StepNode node = new StepNode(buildName(index), parent);
         node.setCondition(condition);
-        node.setScript(script);
+        node.setBash(bash);
+        node.setPwsh(pwsh);
         node.setPlugin(plugin);
         node.setExports(Sets.newHashSet(exports));
         node.setAllowFailure(allow_failure);

tree/src/test/java/com/flowci/tree/test/YmlParserTest.java

@@ -86,7 +86,8 @@ public void should_get_node_from_yml() {
 
         StepNode step2 = steps.get(1);
         Assert.assertEquals("step2", step2.getName());
-        Assert.assertEquals("echo 2", step2.getScript());
+        Assert.assertEquals("echo 2", step2.getBash());
+        Assert.assertEquals("echo powershell", step2.getPwsh());
 
         DockerOption dockerOption = step2.getDockers().get(0);
         Assert.assertNotNull(dockerOption);

tree/src/test/resources/flow-with-exports.yml

@@ -27,4 +27,4 @@ steps:
 
 - name: step2
   allow_failure: false
-  script: "echo 2"
+  bash: "echo 2"

tree/src/test/resources/flow-with-invalid-name.yml

@@ -27,4 +27,4 @@ steps:
 
   - name: step;'2
     allow_failure: false
-    script: "echo 2"
+    bash: "echo 2"

tree/src/test/resources/flow.yml

@@ -42,4 +42,5 @@ steps:
        - "2700:2700"
      entrypoint: ["/bin/sh"]
      network: host
-   script: "echo 2"
+   bash: "echo 2"
+   pwsh: "echo powershell"

tree/src/test/resources/parent-step-with-plugin.yml

@@ -16,14 +16,14 @@ steps:
       - image: "ubuntu:18.04"
         is_runtime: true
       - image: "mysql"
-    script: "echo 2"
+    bash: "echo 2"
     plugin: "invalid"
 
     steps:
       - name: step-2-1
-        script: |
+        bash: |
           echo "step-1 in step2"
 
       - name: step-2-2
-        script: |
+        bash: |
           echo "step-2 in step2"

tree/src/test/resources/runtime-with-command.yml

@@ -17,4 +17,4 @@ steps:
           MY_PW: "12345"
         network_mode: none
 
-    script: "echo 2"
+    bash: "echo 2"

tree/src/test/resources/step-in-step.yml

@@ -16,16 +16,16 @@ steps:
       - image: "ubuntu:18.04"
         is_runtime: true
       - image: "mysql"
-    script: "echo 2"
+    bash: "echo 2"
 
     steps:
       - name: step-2-1
-        script: |
+        bash: |
           echo "step-1 in step2"
 
       - name: step-2-2
-        script: |
+        bash: |
           echo "step-2 in step2"
 
   - name: create test
-    script: "echo end"
+    bash: "echo end"

tree/src/test/resources/step-with-dockers.yml

@@ -30,4 +30,4 @@ steps:
         environment:
           MY_PW: "12345"
         network: none
-    script: "echo 2"
+    bash: "echo 2"