Merge pull request #370 from FlowCI/develop

Develop

Author: gy2006

Makefile

@@ -9,7 +9,7 @@ MVN_TEST		:= mvn test -T 4C
 CURRENT_DIR 	:= $(shell pwd)
 
 DOCKER_VOLUME	:= -v $(HOME)/.m2:/root/.m2 -v $(CURRENT_DIR):/ws
-DOCKER_IMG		:= flowci/javasdk:1.0
+DOCKER_IMG		:= maven:3-openjdk-8
 DOCKER_RUN 		:= docker run -it --rm -w /ws $(DOCKER_VOLUME) --network host $(DOCKER_IMG)
 
 DOCKER_BUILD 	:= ./build.sh

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

@@ -3,7 +3,7 @@
 import com.flowci.core.agent.event.AgentCreatedEvent;
 import com.flowci.core.common.domain.PushEvent;
 import com.flowci.core.common.manager.SocketPushManager;
-import com.flowci.domain.Agent;
+import com.flowci.core.agent.domain.Agent;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;

core/src/main/java/com/flowci/core/agent/consumer/OnAgentCreated.java

@@ -19,7 +19,7 @@
 import com.flowci.core.agent.event.AgentStatusEvent;
 import com.flowci.core.common.domain.PushEvent;
 import com.flowci.core.common.manager.SocketPushManager;
-import com.flowci.domain.Agent;
+import com.flowci.core.agent.domain.Agent;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;

core/src/main/java/com/flowci/core/agent/consumer/OnAgentStatusChange.java

@@ -17,21 +17,18 @@
 package com.flowci.core.agent.controller;
 
 import com.flowci.core.agent.domain.AgentAction;
-import com.flowci.core.agent.domain.AgentInit;
 import com.flowci.core.agent.domain.CreateOrUpdateAgent;
 import com.flowci.core.agent.domain.DeleteAgent;
 import com.flowci.core.agent.service.AgentService;
 import com.flowci.core.auth.annotation.Action;
 import com.flowci.core.job.service.LoggingService;
-import com.flowci.domain.Agent;
-import com.flowci.domain.Settings;
+import com.flowci.core.agent.domain.Agent;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
@@ -83,15 +80,6 @@ public Agent delete(@Validated @RequestBody DeleteAgent body) {
     //      Functions require agent token header
     // --------------------------------------------------------
 
-    @PostMapping("/api/connect")
-    public Settings connect(@RequestHeader(AgentAuth.HeaderAgentToken) String token,
-                            @RequestBody AgentInit init,
-                            HttpServletRequest request) {
-        init.setToken(token);
-        init.setIp(request.getRemoteHost());
-        return agentService.connect(init);
-    }
-
     @PostMapping("/api/profile")
     public void profile(@RequestHeader(AgentAuth.HeaderAgentToken) String token,
                                @RequestBody Agent.Resource resource) {

core/src/main/java/com/flowci/core/agent/controller/AgentController.java

@@ -18,7 +18,7 @@
 
 import com.flowci.core.agent.domain.AgentHost;
 import com.flowci.core.agent.domain.AgentHostAction;
-import com.flowci.core.agent.domain.CreateOrUpdateSshAgentHost;
+import com.flowci.core.agent.domain.SaveAgentHost;
 import com.flowci.core.agent.service.AgentHostService;
 import com.flowci.core.auth.annotation.Action;
 import lombok.extern.log4j.Log4j2;
@@ -58,7 +58,7 @@ public AgentHost deleteByName(@PathVariable String name) {
 
     @PostMapping
     @Action(AgentHostAction.CREATE_UPDATE)
-    public AgentHost createOrUpdate(@RequestBody @Validated CreateOrUpdateSshAgentHost body) {
+    public AgentHost createOrUpdate(@RequestBody @Validated SaveAgentHost body) {
         AgentHost host = body.toObj();
         agentHostService.createOrUpdate(host);
         return host;

core/src/main/java/com/flowci/core/agent/controller/AgentHostController.java

@@ -16,22 +16,20 @@
 
 package com.flowci.core.agent.dao;
 
-import com.flowci.domain.Agent;
-import com.flowci.domain.Agent.Status;
-import java.util.List;
-import java.util.Set;
+import com.flowci.core.agent.domain.Agent;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author yang
  */
 @Repository
-public interface AgentDao extends MongoRepository<Agent, String> {
-
-    List<Agent> findAllByStatusAndTagsIn(Status status, Set<String> tags);
+public interface AgentDao extends MongoRepository<Agent, String>, CustomAgentDao {
 
-    List<Agent> findAllByStatus(Status status);
+    List<Agent> findAllByTagsIn(Set<String> tags);
 
     List<Agent> findAllByHostId(String hostId);
 

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

@@ -0,0 +1,8 @@
+package com.flowci.core.agent.dao;
+
+import com.flowci.core.agent.domain.Agent;
+
+public interface CustomAgentDao {
+
+    long updateAllStatus(Agent.Status status);
+}

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

@@ -0,0 +1,20 @@
+package com.flowci.core.agent.dao;
+
+import com.flowci.core.agent.domain.Agent;
+import com.mongodb.client.result.UpdateResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+public class CustomAgentDaoImpl implements CustomAgentDao {
+
+    @Autowired
+    private MongoOperations operations;
+
+    @Override
+    public long updateAllStatus(Agent.Status status) {
+        UpdateResult r = operations.updateMulti(new Query(), new Update().set("status", status), Agent.class);
+        return r.getModifiedCount();
+    }
+}