delete & create agent

Author: stargwq

platform-api/src/main/java/com/flow/platform/api/controller/AgentController.java

@@ -181,4 +181,30 @@ public BooleanValue shutDown(@RequestParam String zone,
     public void callback(@RequestBody Agent agent) {
         this.dispatchEvent(new AgentStatusChangeEvent(this, agent));
     }
+
+    /**
+     * @api {Post} /agents/delete Delete
+     * @apiName Delete Agent
+     * @apiGroup Agent
+     * @apiDescription Delete agent by agentPath
+     *
+     * @apiParamExample {json} Request-Example:
+     *     {
+     *         zone: xxx,
+     *         name: xxx
+     *     }
+     *
+     * @apiSuccessExample {json} Success-Response:
+     *     HTTP/1.1 200 OK
+     *
+     * @apiErrorExample {json} Error-Response:
+     *     HTTP/1.1 400
+     *     {
+     *         "message": xxx
+     *     }
+     */
+    @PostMapping(path = "/delete")
+    public void delete(@RequestBody AgentPath agentPath){
+        agentService.delete(agentPath);
+    }
 }

platform-api/src/main/java/com/flow/platform/api/controller/FlowController.java

@@ -114,7 +114,7 @@ public Node createEmptyFlow() {
     }
 
     /**
-     * @api {delete} /flows/:root/delete Delete
+     * @api {delete} /flows/:root Delete
      * @apiParam {String} root flow node name will be deleted
      * @apiDescription Delete flow node by name and return flow node object
      * @apiGroup Flows

platform-api/src/main/java/com/flow/platform/api/service/AgentService.java

@@ -48,4 +48,9 @@ public interface AgentService {
      * Get agent setting by token from cc
      */
     AgentSettings settings(String token);
+
+    /**
+     * Delete agent by agentPath from cc
+     */
+    void delete(AgentPath agentPath);
 }

platform-api/src/main/java/com/flow/platform/api/service/AgentServiceImpl.java

@@ -28,6 +28,7 @@
 import com.flow.platform.domain.AgentPath;
 import com.flow.platform.domain.AgentPathWithWebhook;
 import com.flow.platform.domain.AgentSettings;
+import com.flow.platform.domain.AgentStatus;
 import com.flow.platform.domain.Jsonable;
 import com.flow.platform.util.CollectionUtil;
 import com.flow.platform.util.Logger;
@@ -168,7 +169,46 @@ public AgentSettings settings(String token) {
         return AgentSettings.parse(response.getBody(), AgentSettings.class);
     }
 
+    @Override
+    public void delete(AgentPath agentPath){
+        Agent agent = findAgent(agentPath);
+
+        try {
+            HttpClient.build(platformURL.getAgentDeleteUrl())
+                .post(agent.toJson())
+                .withContentType(ContentType.APPLICATION_JSON)
+                .retry(httpRetryTimes)
+                .bodyAsString().getBody();
+
+        } catch (UnsupportedEncodingException e) {
+            throw new IllegalStatusException(e.getMessage());
+        }
+    }
+
     private String buildAgentWebhook() {
         return domain + "/agents/callback";
     }
+
+    /**
+     * find agent
+     */
+    private Agent findAgent(AgentPath agentPath){
+        String url = platformURL.getAgentFindUrl() + "?" + "zone=" + agentPath.getZone() + "&" + "name=" + agentPath.getName();
+        String res = HttpClient.build(url)
+            .get()
+            .retry(httpRetryTimes)
+            .bodyAsString().getBody();
+
+        if (Strings.isNullOrEmpty(res)) {
+            throw new HttpException("Unable to delete agent");
+        }
+        Agent agent = Agent.parse(res, Agent.class);
+        if (agent.getStatus() == AgentStatus.BUSY){
+            throw new IllegalStatusException("agent is busy, please wait");
+        }
+
+        return agent;
+    }
+
+
 }

platform-api/src/main/java/com/flow/platform/api/util/PlatformURL.java

@@ -40,6 +40,10 @@ public class PlatformURL {
 
     private final String cmdDownloadLogUrl;
 
+    private final String agentDeleteUrl;
+
+    private final String agentFindUrl;
+
     public PlatformURL(String baseURL) {
         queueUrl = HttpURL.build(baseURL).append("cmd/queue/send").toString();
         cmdUrl = HttpURL.build(baseURL).append("cmd/send").toString();
@@ -51,6 +55,8 @@ public PlatformURL(String baseURL) {
         agentUrl = HttpURL.build(baseURL).append("agents/list").toString();
         agentCreateUrl = HttpURL.build(baseURL).append("agents/create").toString();
         agentSettingsUrl = HttpURL.build(baseURL).append("agents/settings").toString();
+        agentDeleteUrl = HttpURL.build(baseURL).append("agents/delete").toString();
+        agentFindUrl = HttpURL.build(baseURL).append("agents/find").toString();
     }
 
     public String getAgentCreateUrl() {
@@ -85,17 +91,26 @@ public String getSysInfoUrl() {
         return sysInfoUrl;
     }
 
+    public String getAgentDeleteUrl() {
+        return agentDeleteUrl;
+    }
+    public String getAgentFindUrl() {
+        return agentFindUrl;
+    }
+
     @Override
     public String toString() {
         return "PlatformURL{" +
             "cmdUrl='" + cmdUrl + '\'' +
             ", queueUrl='" + queueUrl + '\'' +
             ", agentUrl='" + agentUrl + '\'' +
             ", agentSettingsUrl='" + agentSettingsUrl + '\'' +
+            ", agentDeleteUrl='" + agentDeleteUrl + '\'' +
+            ", agentFindUrl='" + agentFindUrl + '\'' +
             ", sysInfoUrl='" + sysInfoUrl + '\'' +
             ", sysIndexUrl='" + sysIndexUrl + '\'' +
             ", agentCreateUrl='" + agentCreateUrl + '\'' +
             ", cmdDownloadLogUrl='" + cmdDownloadLogUrl + '\'' +
             '}';
     }
-}
+}

platform-api/src/test/java/com/flow/platform/api/test/service/AgentServiceTest.java

@@ -30,6 +30,7 @@
 import com.flow.platform.api.test.TestBase;
 import com.flow.platform.api.util.CommonUtil;
 import com.flow.platform.domain.Agent;
+import com.flow.platform.domain.AgentPath;
 import com.flow.platform.domain.Jsonable;
 import com.google.common.collect.Lists;
 import java.util.List;

platform-control-center/src/main/java/com/flow/platform/cc/controller/AgentController.java

@@ -98,4 +98,9 @@ public void reportStatus(@RequestBody Agent agent) {
 
         agentService.saveWithStatus(agent, agent.getStatus());
     }
+
+    @PostMapping(path = "/delete")
+    public void delete(@RequestBody Agent agent){
+        agentService.delete(agent);
+    }
 }

platform-control-center/src/main/java/com/flow/platform/cc/service/AgentService.java

@@ -99,4 +99,10 @@ public interface AgentService extends WebhookService {
      * @return agent setting
      */
     AgentSettings settings(String token);
+
+
+    /**
+     * delete agent
+     */
+    void delete(Agent agent);
 }

platform-control-center/src/main/java/com/flow/platform/cc/service/AgentServiceImpl.java

@@ -224,4 +224,9 @@ public AgentSettings settings(String token) {
         agentSettings.setAgentPath(agent.getPath());
         return agentSettings;
     }
+
+    @Override
+    public void delete(Agent agent){
+        agentDao.delete(agent);
+    }
 }

platform-control-center/src/test/java/com/flow/platform/cc/test/controller/AgentControllerTest.java

@@ -163,4 +163,44 @@ public void should_4xx_when_create_agent_with_invalid_zone_name() throws Excepti
             .andExpect(status().isBadRequest())
             .andReturn();
     }
+
+    @Test
+    public void should_delete_agent() throws Exception{
+        // given:
+        final String webhook = "http://flow.ci/agent/callback";
+        AgentPathWithWebhook agentPath = new AgentPathWithWebhook("default", "test", webhook);
+
+        // when: create agent
+        MockHttpServletRequestBuilder content = post("/agents/create")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(agentPath.toJson());
+
+        MvcResult result = this.mockMvc.perform(content)
+            .andExpect(status().isOk())
+            .andReturn();
+
+        // then: verify agent been created with token
+        String agentJson = result.getResponse().getContentAsString();
+        Assert.assertNotNull(agentJson);
+
+        Agent created = Agent.parse(agentJson, Agent.class);
+
+        MockHttpServletRequestBuilder content1 = post("/agents/delete")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(created.toJson());
+        this.mockMvc.perform(content1);
+
+
+        MvcResult result1 = this.mockMvc.perform(get("/agents/list").param(created.getZone(), created.getName()))
+            .andDo(print())
+            .andExpect(status().isOk())
+            .andReturn();
+
+        // then:
+        String json = result1.getResponse().getContentAsString();
+
+        Agent[] agentList = gsonConfig.fromJson(json, Agent[].class);
+        Assert.assertEquals(0, agentList.length);
+
+    }
 }