Merge pull request #389 from FlowCI/develop

Develop

Author: gy2006

.gitignore

@@ -7,4 +7,5 @@ target/
 .settings/
 .classpath
 .factorypath
-*Proto.java
+*Proto.java
+.run/

.run/Application - 1.run.xml

@@ -16,21 +16,17 @@
 
 package com.flowci.core.agent.controller;
 
+import com.flowci.core.agent.domain.Agent;
 import com.flowci.core.agent.domain.AgentAction;
 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.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 java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 import java.util.Optional;
 
@@ -45,9 +41,6 @@ public class AgentController {
     @Autowired
     private AgentService agentService;
 
-    @Autowired
-    private LoggingService loggingService;
-
     @GetMapping("/{name}")
     @Action(AgentAction.GET)
     public Agent getByName(@PathVariable String name) {
@@ -75,23 +68,4 @@ public Agent createOrUpdate(@Validated @RequestBody CreateOrUpdateAgent body) {
     public Agent delete(@Validated @RequestBody DeleteAgent body) {
         return agentService.delete(body.getToken());
     }
-
-    // --------------------------------------------------------
-    //      Functions require agent token header
-    // --------------------------------------------------------
-
-    @PostMapping("/api/profile")
-    public void profile(@RequestHeader(AgentAuth.HeaderAgentToken) String token,
-                               @RequestBody Agent.Resource resource) {
-        agentService.update(token, resource);
-    }
-
-    @PostMapping("/api/logs/upload")
-    public void upload(@RequestPart("file") MultipartFile file) {
-        try(InputStream stream = file.getInputStream()) {
-            loggingService.save(file.getOriginalFilename(), stream);
-        } catch (IOException e) {
-            log.warn("Unable to save log, cause {}", e.getMessage());
-        }
-    }
 }

.run/Application - 2.run.xml

@@ -51,17 +51,14 @@ public AgentHost getByName(@PathVariable String name) {
     @DeleteMapping("/{name}")
     @Action(AgentHostAction.DELETE)
     public AgentHost deleteByName(@PathVariable String name) {
-        AgentHost host = agentHostService.get(name);
-        agentHostService.delete(host);
-        return host;
+        return agentHostService.delete(name);
     }
 
     @PostMapping
     @Action(AgentHostAction.CREATE_UPDATE)
     public AgentHost createOrUpdate(@RequestBody @Validated SaveAgentHost body) {
         AgentHost host = body.toObj();
-        agentHostService.createOrUpdate(host);
-        return host;
+        return agentHostService.createOrUpdate(host);
     }
 
     @PostMapping("/{name}/test")
@@ -70,4 +67,10 @@ public void testConnection(@PathVariable String name) {
         AgentHost host = agentHostService.get(name);
         agentHostService.testConn(host);
     }
+
+    @PostMapping("/{name}/switch/{value}")
+    @Action(AgentHostAction.CREATE_UPDATE)
+    public AgentHost disableOrEnableByName(@PathVariable String name, @PathVariable boolean value) {
+        return agentHostService.disableOrEnable(name, value);
+    }
 }

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

@@ -21,16 +21,13 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author yang
  */
 @Repository
 public interface AgentDao extends MongoRepository<Agent, String>, CustomAgentDao {
 
-    List<Agent> findAllByTagsIn(Set<String> tags);
-
     List<Agent> findAllByHostId(String hostId);
 
     Agent findByToken(String token);

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

@@ -2,7 +2,12 @@
 
 import com.flowci.core.agent.domain.Agent;
 
+import java.util.Collection;
+import java.util.List;
+
 public interface CustomAgentDao {
 
     long updateAllStatus(Agent.Status status);
+
+    List<Agent> findAll(Collection<String> tags, Collection<Agent.Status> statuses);
 }

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

@@ -1,12 +1,17 @@
 package com.flowci.core.agent.dao;
 
 import com.flowci.core.agent.domain.Agent;
+import com.flowci.util.ObjectsHelper;
 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.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 
+import java.util.Collection;
+import java.util.List;
+
 public class CustomAgentDaoImpl implements CustomAgentDao {
 
     @Autowired
@@ -17,4 +22,23 @@ public long updateAllStatus(Agent.Status status) {
         UpdateResult r = operations.updateMulti(new Query(), new Update().set("status", status), Agent.class);
         return r.getModifiedCount();
     }
+
+    @Override
+    public List<Agent> findAll(Collection<String> tags, Collection<Agent.Status> statuses) {
+        Query q = new Query();
+
+        if (ObjectsHelper.hasCollection(tags)) {
+            q.addCriteria(Criteria.where("tags").in(tags));
+        } else {
+            q.addCriteria(Criteria.where("tags.0").exists(false));
+        }
+
+        if (ObjectsHelper.hasCollection(statuses)) {
+            q.addCriteria(Criteria.where("status").in(statuses));
+        }
+
+        return operations.find(q, Agent.class);
+    }
+
+
 }

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

@@ -20,6 +20,7 @@
 import com.flowci.core.common.domain.Mongoable;
 import com.flowci.domain.Common.OS;
 import com.flowci.domain.SimpleKeyPair;
+import com.flowci.tree.Selector;
 import com.google.common.base.Strings;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -29,6 +30,7 @@
 import java.time.Instant;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -116,14 +118,18 @@ public Agent(String name) {
 
     public Agent(String name, Set<String> tags) {
         this.name = name;
-        this.tags = tags;
+        this.setTags(tags);
     }
 
     public void setStatus(Status status) {
         this.status = status;
         this.statusUpdatedAt = new Date();
     }
 
+    public void setTags(Set<String> tags) {
+        this.tags = tags == null ? Collections.emptySet() : tags;
+    }
+
     @JsonIgnore
     public boolean isStartingOver(int seconds) {
         if (status == Status.STARTING) {
@@ -169,4 +175,14 @@ public boolean isOnline() {
     public boolean isStarting() {
         return status == Status.STARTING;
     }
+
+    public boolean match(Selector selector) {
+        Set<String> labels = new HashSet<>(selector.getLabel());
+        if (labels.isEmpty() && tags.isEmpty()) {
+            return true;
+        }
+
+        labels.retainAll(tags);
+        return !labels.isEmpty();
+    }
 }