Merge pull request #371 from FlowCI/feature/1501

Feature/1501

Author: gy2006

.run/Application - 1.run.xml

@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Application - 1" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <module name="core" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.flowci.core.Application" />
+    <option name="VM_PARAMETERS" value="-Xms1g -Xmx1g -Xmn600m -XX:-UseAdaptiveSizePolicy -XX:SurvivorRatio=4 -verbose:gc -XX:+PrintGCDateStamps -XX:+PrintGCDetails" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <envs>
+      <env name="FLOWCI_LOG_LEVEL" value="DEBUG" />
+      <env name="FLOWCI_PLUGIN_URL" value="https://raw.githubusercontent.com/FlowCI/plugins/develop/repository.json" />
+      <env name="FLOWCI_RABBITMQ_URI" value="amqp://guest:[email protected]:5672" />
+      <env name="FLOWCI_ZK_HOST" value="127.0.0.1" />
+      <env name="FLOWCI_AUTO_AGENT" value="false" />
+      <env name="FLOWCI_AGENT_VOLUMES" value="name=pyenv,dest=/ci/python,script=init.sh,image=flowci/pyenv:1.3,init=init-pyenv-volume.sh" />
+      <env name="FLOWCI_SERVER_PORT" value="8080" />
+      <env name="FLOWCI_TEMPLATES" value="https://raw.githubusercontent.com/FlowCI/templates/master/templates.json" />
+      <env name="FLOWCI_AGENT_IMAGE" value="flowci/agent:dev" />
+    </envs>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/Application - 2.run.xml

@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Application - 2" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <module name="core" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.flowci.core.Application" />
+    <option name="VM_PARAMETERS" value="-Xms1g -Xmx1g -Xmn600m -XX:-UseAdaptiveSizePolicy -XX:SurvivorRatio=4 -verbose:gc -XX:+PrintGCDateStamps -XX:+PrintGCDetails" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <envs>
+      <env name="FLOWCI_LOG_LEVEL" value="DEBUG" />
+      <env name="FLOWCI_SERVER_URL" value="http://192.168.0.104:8081" />
+      <env name="FLOWCI_DEFAULT_ADMIN_EMAIL" value="[email protected]" />
+      <env name="FLOWCI_DEFAULT_ADMIN_PASSWORD" value="12345" />
+      <env name="FLOWCI_PLUGIN_URL" value="https://raw.githubusercontent.com/FlowCI/plugins/develop/repository.json" />
+      <env name="FLOWCI_RABBITMQ_URI" value="amqp://guest:[email protected]:5672" />
+      <env name="FLOWCI_ZK_HOST" value="192.168.0.104" />
+      <env name="FLOWCI_AUTO_AGENT" value="false" />
+      <env name="FLOWCI_AGENT_VOLUMES" value="name=pyenv,dest=/ci/python,script=init.sh" />
+      <env name="FLOWCI_SERVER_PORT" value="8081" />
+    </envs>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

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;
 
@@ -20,6 +18,12 @@
 @Accessors(chain = true)
 public final class ShellIn extends CmdIn {
 
+    public enum ShellType {
+        Bash,
+
+        PowerShell;
+    }
+
     // from ExecutedCmd id
     private String id;
 
@@ -36,7 +40,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 +54,18 @@ public ShellIn() {
         super(Type.SHELL);
     }
 
-    public void addScript(String script) {
+    public void addScript(String script, ShellType type) {
         if (Strings.isNullOrEmpty(script)) {
             return;
         }
-        scripts.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/agent/manager/AgentEventManager.java

@@ -120,6 +120,15 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus status)
         agentSessionStore.remove(token, session);
     }
 
+    private <T> void writeMessage(WebSocketSession session, ResponseMessage<T> msg) {
+        try {
+            byte[] bytes = objectMapper.writeValueAsBytes(msg);
+            session.sendMessage(new BinaryMessage(bytes));
+        } catch (IOException e) {
+            log.warn(e);
+        }
+    }
+
     private void onConnected(WebSocketSession session, String token, byte[] body) {
         try {
             AgentInit init = objectMapper.readValue(body, AgentInit.class);
@@ -134,7 +143,7 @@ private void onConnected(WebSocketSession session, String token, byte[] body) {
             log.debug("Agent {} is connected with status {}", token, init.getStatus());
         } catch (Exception e) {
             log.warn(e);
-            writeMessage(token, new ResponseMessage<Void>(StatusCode.FATAL, e.getMessage(), null));
+            writeMessage(session, new ResponseMessage<Void>(StatusCode.FATAL, e.getMessage(), null));
         }
     }
 

core/src/main/java/com/flowci/core/agent/service/AgentServiceImpl.java

@@ -354,10 +354,13 @@ public void onConnected(OnConnectedEvent event) {
 
     @EventListener
     public void onDisconnected(OnDisconnectedEvent event) {
-        Agent target = getByToken(event.getToken());
+        try {
+            Agent target = getByToken(event.getToken());
+            update(target, OFFLINE);
+            syncLockNode(target, false);
+        } catch (NotFoundException ignore) {
 
-        update(target, OFFLINE);
-        syncLockNode(target, false);
+        }
     }
 
     @EventListener

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

@@ -60,7 +60,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, ShellIn.ShellType.Bash))
+                .setPwsh(linkScript(node, ShellIn.ShellType.PowerShell))
                 .setEnvFilters(linkFilters(node))
                 .setInputs(linkInputs(node).merge(job.getContext(), false))
                 .setTimeout(job.getTimeout());
@@ -125,17 +126,24 @@ private Set<String> linkFilters(StepNode current) {
         return output;
     }
 
-    private List<String> linkScript(StepNode current) {
+    private List<String> linkScript(StepNode current, ShellIn.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 == ShellIn.ShellType.Bash) {
+            output.add(current.getBash());
+        }
+
+        if (shellType == ShellIn.ShellType.PowerShell) {
+            output.add(current.getPwsh());
+        }
+
         return output;
     }
 
@@ -161,7 +169,8 @@ private void setPlugin(String name, ShellIn cmd) {
         cmd.setPlugin(name);
         cmd.setAllowFailure(plugin.isAllowFailure());
         cmd.addEnvFilters(plugin.getExports());
-        cmd.addScript(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/main/resources/flow.properties

@@ -1,4 +1,4 @@
-app.workspace=${FLOWCI_WORKSPACE:${HOME}/.flow.ci}
+app.workspace=${FLOWCI_WORKSPACE:${user.home}/.flow.ci}
 app.flow-dir=${app.workspace}/flows
 app.site-dir=${app.workspace}/sites-static-resources
 app.secret=${FLOWCI_SECRET:qazWSXedcRFV12#$}