Merge pull request #344 from FlowCI/feature/1410

Feature/1410

Author: gy2006

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/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);
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.flowci.core.agent.domain;
+
+import com.flowci.core.job.domain.Executed;
+import com.flowci.domain.StringVars;
+import com.flowci.domain.Vars;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public final class ShellOut implements Executed, CmdOut {
+
+    private String id;
+
+    private int processId;
+
+    private String containerId;
+
+    private Executed.Status status;
+
+    private Integer code;
+
+    private Vars<String> output = new StringVars();
+
+    private Date startAt;
+
+    private Date finishAt;
+
+    private String error;
+
+    private long logSize;
+}

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

@@ -0,0 +1,59 @@
+package com.flowci.core.agent.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @author yang
+ */
+public abstract class TtyCmd {
+
+    public enum Action {
+        OPEN,
+
+        CLOSE,
+
+        SHELL
+    }
+
+    @Getter
+    @Setter
+    @Accessors(chain = true)
+    public final static class In extends CmdIn {
+
+        private String id;
+
+        private Action action;
+
+        private String input;
+
+        public In() {
+            super(Type.TTY);
+        }
+    }
+
+    @Getter
+    @Setter
+    @Accessors(chain = true)
+    public final static class Out implements CmdOut {
+
+        private String id;
+
+        private Action action;
+
+        private boolean success;
+
+        private String error;
+    }
+
+    @Getter
+    @Setter
+    @Accessors(chain = true)
+    public final static class Log {
+
+        private String id;
+
+        private String content;
+    }
+}

core/src/main/java/com/flowci/core/agent/event/CmdSentEvent.java

@@ -16,8 +16,8 @@
 
 package com.flowci.core.agent.event;
 
+import com.flowci.core.agent.domain.CmdIn;
 import com.flowci.domain.Agent;
-import com.flowci.domain.CmdIn;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 

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

@@ -17,11 +17,10 @@
 package com.flowci.core.agent.service;
 
 import com.flowci.core.agent.domain.AgentInit;
+import com.flowci.core.agent.domain.CmdIn;
 import com.flowci.core.job.domain.Job;
 import com.flowci.domain.Agent;
-import com.flowci.domain.CmdIn;
 import com.flowci.domain.Settings;
-import com.flowci.tree.Selector;
 
 import java.util.List;
 import java.util.Optional;