Merge pull request #347 from FlowCI/develop

Author: gy2006

core/debug.yaml

@@ -10,7 +10,7 @@ services:
       - "27017:27017"
 
   zk:
-    image: zookeeper:3.4
+    image: zookeeper:3.6
     container_name: flowci-debug-zk
     restart: always
     ports:

core/pom.xml

@@ -129,11 +129,6 @@
       <artifactId>springfox-swagger-ui</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-engine-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.cronutils</groupId>
       <artifactId>cron-utils</artifactId>

core/src/main/java/com/flowci/core/agent/config/AgentConfig.java

@@ -53,7 +53,8 @@ public Settings baseSettings() {
         Settings.RabbitMQ mq = new Settings.RabbitMQ();
         mq.setUri(getRabbitUri());
         mq.setCallback(rabbitProperties.getCallbackQueue());
-        mq.setLogsExchange(rabbitProperties.getLoggingExchange());
+        mq.setShellLogEx(rabbitProperties.getShellLogEx());
+        mq.setTtyLogEx(rabbitProperties.getTtyLogEx());
 
         Settings settings = new Settings();
         settings.setZookeeper(zk);

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

@@ -17,6 +17,10 @@
 
 package com.flowci.core.agent.domain;
 
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
 public abstract class AgentAction {
 
     public static final String GET = "get_agent";
@@ -27,10 +31,10 @@ public abstract class AgentAction {
 
     public static final String DELETE = "delete_agent";
 
-    public static final String[] ALL = {
+    public static final List<String> ALL = ImmutableList.of(
             GET,
             LIST,
             CREATE_UPDATE,
             DELETE
-    };
+    );
 }

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

@@ -16,6 +16,10 @@
 
 package com.flowci.core.agent.domain;
 
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
 public abstract class AgentHostAction {
 
     public static final String GET = "get_agent_host";
@@ -26,11 +30,10 @@ public abstract class AgentHostAction {
 
     public static final String DELETE = "delete_agent_host";
 
-    public static final String[] ALL = {
+    public static final List<String> ALL = ImmutableList.of(
             GET,
             LIST,
             CREATE_UPDATE,
             DELETE
-    };
-
+    );
 }

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

@@ -0,0 +1,37 @@
+package com.flowci.core.agent.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public abstract class CmdIn {
+
+    public enum Type {
+        /**
+         * Execute shell script
+         */
+        SHELL,
+
+        /**
+         * Kill running shell
+         */
+        KILL,
+
+        /**
+         * TTY cmd
+         */
+        TTY,
+
+        /**
+         * Close agent
+         */
+        CLOSE;
+    }
+
+    protected Type type;
+
+    protected CmdIn(Type type) {
+        this.type = type;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.flowci.core.agent.domain;
+
+/**
+ * Cmd output from callback queue,
+ * first byte is indicator to indicate cmd out type
+ *
+ * @author yang
+ */
+public interface CmdOut {
+
+    /**
+     * ShellOut
+     */
+    byte ShellOutInd = 1;
+
+    /**
+     * TtyOut
+     */
+    byte TtyOutInd = 2;
+}

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

@@ -0,0 +1,24 @@
+package com.flowci.core.agent.domain;
+
+import com.flowci.core.common.rabbit.RabbitOperations;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public abstract class CmdStdLog {
+
+    public static final String ID_HEADER = "id";
+
+    public static Optional<String> getId(RabbitOperations.Message message) {
+        if (!message.hasHeader()) {
+            return Optional.empty();
+        }
+
+        Object id = message.getHeaders().get(CmdStdLog.ID_HEADER);
+        if (Objects.isNull(id)) {
+            return Optional.empty();
+        }
+
+        return Optional.of(id.toString());
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.flowci.core.agent.domain;
+
+import com.flowci.domain.DockerOption;
+import com.flowci.domain.StringVars;
+import com.flowci.domain.Vars;
+import com.google.common.base.Strings;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public final class ShellIn extends CmdIn {
+
+    // from ExecutedCmd id
+    private String id;
+
+    private String flowId;
+
+    private String jobId;
+
+    private boolean allowFailure;
+
+    private String plugin;
+
+    private DockerOption docker;
+
+    private List<String> scripts = new LinkedList<>();
+
+    private int timeout = 1800;
+
+    private Vars<String> inputs = new StringVars();
+
+    private Set<String> envFilters = new LinkedHashSet<>();
+
+    public ShellIn() {
+        super(Type.SHELL);
+    }
+
+    public void addScript(String script) {
+        if (Strings.isNullOrEmpty(script)) {
+            return;
+        }
+        scripts.add(script);
+    }
+
+    public void addEnvFilters(Set<String> exports) {
+        this.envFilters.addAll(exports);
+    }
+
+    public void addInputs(StringVars vars) {
+        inputs.putAll(vars);
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.flowci.core.agent.domain;
+
+/**
+ * Kill current executing shell command
+ */
+public final class ShellKill extends CmdIn {
+
+    public ShellKill() {
+        super(Type.KILL);
+    }
+}