support bash and pwsh in plugin

Author: gy2006

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

@@ -18,6 +18,12 @@
 @Accessors(chain = true)
 public final class ShellIn extends CmdIn {
 
+    public enum ShellType {
+        Bash,
+
+        PowerShell;
+    }
+
     // from ExecutedCmd id
     private String id;
 
@@ -48,11 +54,18 @@ public ShellIn() {
         super(Type.SHELL);
     }
 
-    public void addBash(String script) {
+    public void addScript(String script, ShellType type) {
         if (Strings.isNullOrEmpty(script)) {
             return;
         }
-        bash.add(script);
+
+        if (type == ShellType.Bash) {
+            bash.add(script);
+        }
+
+        if (type == ShellType.PowerShell) {
+            pwsh.add(script);
+        }
     }
 
     public void addEnvFilters(Set<String> exports) {

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

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

core/src/main/java/com/flowci/core/job/service/LocalTaskServiceImpl.java

@@ -140,7 +140,7 @@ public ExecutedLocalTask execute(Job job, LocalTask task) {
             }
 
             Plugin plugin = event.getFetched();
-            option.addEntryPoint(plugin.getScript());
+            option.addEntryPoint(plugin.getBash());
             option.addBind(event.getDir().toString(), "/ws/.plugins/" + plugin.getName());
             ObjectsHelper.ifNotNull(plugin.getDocker(), (docker) -> option.setImage(docker.getImage()));
         }

core/src/main/java/com/flowci/core/plugin/domain/Plugin.java

@@ -57,7 +57,9 @@ public class Plugin extends PluginRepoInfo {
 
     private DockerOption docker;
 
-    private String script;
+    private String bash;
+
+    private String pwsh;
 
     private String icon;
 
@@ -72,7 +74,8 @@ public void update(Plugin src) {
         this.setInputs(src.inputs);
         this.setStatsTypes(src.statsTypes);
         this.setAllowFailure(src.allowFailure);
-        this.setScript(src.script);
+        this.setBash(src.bash);
+        this.setPwsh(src.pwsh);
         this.setDocker(src.docker);
     }
 }

core/src/main/java/com/flowci/core/plugin/domain/PluginParser.java

@@ -22,10 +22,12 @@
 import com.flowci.domain.Version;
 import com.flowci.tree.yml.DockerYml;
 import com.flowci.util.ObjectsHelper;
+import com.flowci.util.StringHelper;
 import com.flowci.util.YamlHelper;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import org.yaml.snakeyaml.Yaml;
+import sun.jvm.hotspot.oops.ObjectHeap;
 
 import java.io.InputStream;
 import java.util.LinkedList;
@@ -62,14 +64,19 @@ private static class PluginWrapper {
 
         public Boolean allow_failure;
 
+        public String bash;
+
+        public String pwsh;
+
         public String script;
 
         public DockerYml docker;
 
         public Plugin toPlugin() {
             Plugin plugin = new Plugin(name, Version.parse(version));
             plugin.setIcon(icon);
-            plugin.setScript(script);
+            plugin.setBash(bash);
+            plugin.setPwsh(pwsh);
 
             ObjectsHelper.ifNotNull(docker, val -> plugin.setDocker(val.toDockerOption()));
             ObjectsHelper.ifNotNull(exports, plugin::setExports);
@@ -85,6 +92,13 @@ public Plugin toPlugin() {
                 }
             });
 
+            // backward compatible, set script to bash
+            if (StringHelper.hasValue(script)) {
+                if (!StringHelper.hasValue(bash)) {
+                    plugin.setBash(script);
+                }
+            }
+
             return plugin;
         }
     }

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

@@ -207,7 +207,7 @@ private Plugin createDummyPlugin() {
         plugin.setName("gittest");
         plugin.setInputs(Lists.newArrayList(intInput, strInput));
         plugin.setDocker(option);
-        plugin.setScript("echo ${GIT_DEFAULT_VAL} ${GIT_STR_VAL}");
+        plugin.setBash("echo ${GIT_DEFAULT_VAL} ${GIT_STR_VAL}");
 
         return plugin;
     }

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

@@ -37,7 +37,7 @@ public void should_execute_local_task() {
         Plugin p = new Plugin();
         p.setName("test-plugin");
         p.setVersion(Version.parse("0.1.0"));
-        p.setScript("echo aaa \n echo bbb");
+        p.setBash("echo aaa \n echo bbb");
         p.setDocker(new DockerOption().setImage("sonarqube:latest"));
         pluginDao.save(p);