Merge pull request #336 from FlowCI/feature/1420

Feature/1420

Author: gy2006

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

@@ -16,7 +16,7 @@
 
 package com.flowci.core.agent.config;
 
-import com.flowci.core.common.config.ConfigProperties;
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.domain.Variables.App;
 import com.flowci.core.common.helper.ThreadHelper;
 import com.flowci.domain.Settings;
@@ -39,10 +39,10 @@ public class AgentConfig {
     private Environment env;
 
     @Autowired
-    private ConfigProperties.Zookeeper zkProperties;
+    private AppProperties.Zookeeper zkProperties;
 
     @Autowired
-    private ConfigProperties.RabbitMQ rabbitProperties;
+    private AppProperties.RabbitMQ rabbitProperties;
 
     @Bean("baseSettings")
     public Settings baseSettings() {

core/src/main/java/com/flowci/core/agent/dao/AgentHostDao.java

@@ -16,15 +16,14 @@
 
 package com.flowci.core.agent.dao;
 
+import com.flowci.core.agent.domain.AgentHost;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import com.flowci.core.agent.domain.AgentHost;
-
 @Repository
 public interface AgentHostDao extends MongoRepository<AgentHost, String> {
 

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

@@ -16,26 +16,23 @@
 
 package com.flowci.core.agent.event;
 
-import com.flowci.core.common.domain.SyncEvent;
+import com.flowci.core.common.event.AbstractSyncEvent;
 import com.flowci.domain.Agent;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.context.ApplicationEvent;
 
 import java.util.Set;
 
 @Getter
 @Setter
-public class CreateAgentEvent extends ApplicationEvent implements SyncEvent {
+public class CreateAgentEvent extends AbstractSyncEvent<Agent> {
 
     private final String name;
 
     private final Set<String> tags;
 
     private final String hostId;
 
-    private Agent created;
-
     public CreateAgentEvent(Object source, String name, Set<String> tags, String hostId) {
         super(source);
         this.name = name;

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

@@ -24,9 +24,8 @@
 import com.flowci.core.agent.event.AgentCreatedEvent;
 import com.flowci.core.agent.event.AgentHostStatusEvent;
 import com.flowci.core.agent.event.CreateAgentEvent;
-import com.flowci.core.common.config.ConfigProperties;
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
-import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.secret.domain.RSASecret;
 import com.flowci.core.secret.domain.Secret;
@@ -50,6 +49,7 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.github.dockerjava.api.DockerClient;
 import com.google.common.base.Preconditions;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -82,7 +82,7 @@ public class AgentHostServiceImpl implements AgentHostService {
     private String collectTaskZkPath;
 
     @Autowired
-    private ConfigProperties appProperties;
+    private AppProperties appProperties;
 
     @Autowired
     private String serverUrl;
@@ -97,13 +97,13 @@ public class AgentHostServiceImpl implements AgentHostService {
     private SpringEventManager eventManager;
 
     @Autowired
-    private SessionManager sessionManager;
+    private ZookeeperClient zk;
 
     @Autowired
-    private ZookeeperClient zk;
+    private DockerClient dockerClient;
 
     @Autowired
-    private ConfigProperties.Zookeeper zkProperties;
+    private AppProperties.Zookeeper zkProperties;
 
     @Autowired
     private ThreadPoolTaskExecutor agentHostExecutor;
@@ -228,10 +228,10 @@ public boolean start(AgentHost host) {
         // create new agent
         if (agents.size() < host.getMaxSize()) {
             String name = String.format("%s-%s", host.getName(), StringHelper.randomString(5));
-            CreateAgentEvent syncEvent = new CreateAgentEvent(this, name, host.getTags(), host.getId());
-            eventManager.publish(syncEvent);
+            CreateAgentEvent syncEvent =
+                    eventManager.publish(new CreateAgentEvent(this, name, host.getTags(), host.getId()));
 
-            Agent agent = syncEvent.getCreated();
+            Agent agent = syncEvent.getFetched();
             eventManager.publish(new AgentCreatedEvent(this, agent, host));
 
             StartContext context = new StartContext();
@@ -539,7 +539,11 @@ public void create(AgentHost host) {
         @Override
         public PoolManager<?> init(AgentHost host) throws Exception {
             PoolManager<SocketInitContext> poolManager = new SocketPoolManager();
-            poolManager.init(new SocketInitContext());
+
+            SocketInitContext context = new SocketInitContext();
+            context.setClient(dockerClient);
+
+            poolManager.init(context);
             return poolManager;
         }
 
@@ -571,7 +575,7 @@ public PoolManager<?> init(AgentHost host) throws Exception {
             GetSecretEvent event = new GetSecretEvent(this, sshHost.getSecret());
             eventManager.publish(event);
 
-            Secret c = event.getSecret();
+            Secret c = event.getFetched();
             Preconditions.checkArgument(c != null, "Secret not found");
             Preconditions.checkArgument(c.getCategory() == SSH_RSA, "Invalid credential category");
 

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

@@ -23,7 +23,7 @@
 import com.flowci.core.agent.event.AgentStatusEvent;
 import com.flowci.core.agent.event.CmdSentEvent;
 import com.flowci.core.agent.event.CreateAgentEvent;
-import com.flowci.core.common.config.ConfigProperties;
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CipherHelper;
 import com.flowci.core.common.helper.ThreadHelper;
 import com.flowci.core.common.manager.SpringEventManager;
@@ -75,7 +75,7 @@ public class AgentServiceImpl implements AgentService {
     private static final long RetryIntervalOnNotFound = 10 * 1000; // 10 seconds
 
     @Autowired
-    private ConfigProperties.Zookeeper zkProperties;
+    private AppProperties.Zookeeper zkProperties;
 
     @Autowired
     private ZookeeperClient zk;
@@ -329,7 +329,7 @@ public void dispatch(CmdIn cmd, Agent agent) {
     @EventListener
     public void onCreateAgentEvent(CreateAgentEvent event) {
         Agent agent = this.create(event.getName(), event.getTags(), Optional.of(event.getHostId()));
-        event.setCreated(agent);
+        event.setFetched(agent);
     }
 
     @EventListener

core/src/main/java/com/flowci/core/api/adviser/ApiAuth.java

@@ -18,7 +18,6 @@
 
 import com.flowci.core.agent.service.AgentService;
 import com.flowci.exception.AuthenticationException;
-import com.flowci.exception.NotFoundException;
 import com.flowci.util.StringHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -33,6 +32,8 @@
 @Component("apiAuth")
 public class ApiAuth implements HandlerInterceptor {
 
+    public static final String LocalTaskToken = "local-task";
+
     private static final String HeaderAgentToken = "AGENT-TOKEN";
 
     @Autowired
@@ -42,8 +43,10 @@ public class ApiAuth implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         String token = request.getHeader(HeaderAgentToken);
 
-        if (StringHelper.hasValue(token) && agentService.isExisted(token)) {
-            return true;
+        if (StringHelper.hasValue(token)) {
+            if (agentService.isExisted(token) || token.equals(LocalTaskToken)) {
+                return true;
+            }
         }
 
         throw new AuthenticationException("Invalid token");

core/src/main/java/com/flowci/core/auth/config/AuthConfig.java

@@ -19,7 +19,7 @@
 import com.flowci.core.agent.domain.AgentAction;
 import com.flowci.core.agent.domain.AgentHostAction;
 import com.flowci.core.auth.domain.PermissionMap;
-import com.flowci.core.common.config.ConfigProperties;
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.config.domain.ConfigAction;
 import com.flowci.core.secret.domain.SecretAction;
 import com.flowci.core.flow.domain.FlowAction;
@@ -48,7 +48,7 @@ public class AuthConfig {
     private static final long MaxCacheSize = 500;
 
     @Autowired
-    private ConfigProperties.Auth authProperties;
+    private AppProperties.Auth authProperties;
 
     @Bean
     public Cache onlineUsersCache() {

core/src/main/java/com/flowci/core/auth/service/AuthServiceImpl.java

@@ -21,7 +21,7 @@
 import com.flowci.core.auth.domain.PermissionMap;
 import com.flowci.core.auth.domain.Tokens;
 import com.flowci.core.auth.helper.JwtHelper;
-import com.flowci.core.common.config.ConfigProperties;
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.user.domain.User;
 import com.flowci.core.user.service.UserService;
@@ -39,7 +39,7 @@
 public class AuthServiceImpl implements AuthService {
 
     @Autowired
-    private ConfigProperties.Auth authProperties;
+    private AppProperties.Auth authProperties;
 
     @Autowired
     private UserService userService;

core/src/main/java/com/flowci/core/common/config/AppConfig.java

@@ -17,7 +17,7 @@
 package com.flowci.core.common.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.flowci.core.common.domain.SyncEvent;
+import com.flowci.core.common.event.SyncEvent;
 import com.flowci.core.common.helper.JacksonHelper;
 import com.flowci.util.FileHelper;
 import lombok.extern.log4j.Log4j2;
@@ -34,9 +34,6 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import javax.annotation.PostConstruct;
@@ -59,7 +56,7 @@ public class AppConfig {
     private MultipartProperties multipartProperties;
 
     @Autowired
-    private ConfigProperties appProperties;
+    private AppProperties appProperties;
 
     @PostConstruct
     private void initWorkspace() throws IOException {

…core/common/config/ConfigProperties.java …ci/core/common/config/AppProperties.javacore/src/main/java/com/flowci/core/common/config/ConfigProperties.java renamed to core/src/main/java/com/flowci/core/common/config/AppProperties.java core/src/main/java/com/flowci/core/common/config/ConfigProperties.java renamed to core/src/main/java/com/flowci/core/common/config/AppProperties.java

@@ -38,7 +38,7 @@
 @Configuration
 @ConfigurationProperties(prefix = "app")
 @PropertySource("classpath:flow.properties")
-public class ConfigProperties {
+public class AppProperties {
 
     private Path workspace;
 
@@ -56,6 +56,8 @@ public class ConfigProperties {
 
     private boolean autoLocalAgentHost;
 
+    private boolean defaultSmtpConfig;
+
     @Bean("adminProperties")
     @ConfigurationProperties(prefix = "app.admin")
     public Admin admin() {
@@ -113,11 +115,11 @@ public static class Admin {
     @Data
     public static class Job {
 
-        private Long timeoutInSeconds; // job execution timeout
+        private int timeoutInSeconds; // job execution timeout
 
-        private Long expireInSeconds; // job queue up timeout
+        private int expireInSeconds; // job queue up timeout
 
-        private Long retryWaitingSeconds;
+        private int retryWaitingSeconds;
     }
 
     @Data