Merge pull request #102 from FlowCI/feature/api/delete_agent

stargwq · web-flow · commit 07596ff83e7d · 2017-10-15T21:56:24.000-05:00
delete  &amp; create agent
diff --git a/platform-api/src/main/java/com/flow/platform/api/controller/AgentController.java b/platform-api/src/main/java/com/flow/platform/api/controller/AgentController.java
@@ -195,4 +195,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);
+    }
 }
diff --git a/platform-api/src/main/java/com/flow/platform/api/controller/FlowController.java b/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
diff --git a/platform-api/src/main/java/com/flow/platform/api/service/AgentService.java b/platform-api/src/main/java/com/flow/platform/api/service/AgentService.java
@@ -49,6 +49,10 @@ public interface AgentService {
      */
     AgentSettings settings(String token);
 
+    /**
+     * Delete agent by agentPath from cc
+     */
+    void delete(AgentPath agentPath);
     /**
      * send sys cmd
      * @param agentPath required
diff --git a/platform-api/src/main/java/com/flow/platform/api/service/AgentServiceImpl.java b/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.CmdInfo;
 import com.flow.platform.domain.CmdType;
 import com.flow.platform.domain.Jsonable;
@@ -170,13 +171,52 @@ public AgentSettings settings(String token) {
         return AgentSettings.parse(response.getBody(), AgentSettings.class);
     }
 
-    private String buildAgentWebhook() {
-        return domain + "/agents/callback";
+    @Override
+    public void delete(AgentPath agentPath){
+        Agent agent = findAgent(agentPath);
+
+        try {
+            HttpClient.build(platformURL.getAgentDeleteUrl())
+                .post(agent.toJson())
+                .withContentType(ContentType.APPLICATION_JSON)
+                .retry(httpRetryTimes);
+
+        } catch (UnsupportedEncodingException e) {
+            throw new IllegalStatusException(e.getMessage());
+        }
     }
 
     @Override
     public void sendSysCmd(AgentPath agentPath) {
         CmdInfo cmdInfo = new CmdInfo(agentPath, CmdType.SYSTEM_INFO, "");
         cmdService.sendCmd(agentPath, cmdInfo);
     }
+
+    private String buildAgentWebhook() {
+        return domain + "/agents/callback";
+    }
+
+    /**
+     * find agent
+     */
+    private Agent findAgent(AgentPath agentPath){
+        String url = platformURL.getAgentFindUrl() + "?" + "zone=" + agentPath.getZone() + "&" + "name=" + agentPath.getName();
+        HttpResponse<String> response = HttpClient.build(url)
+            .get()
+            .retry(httpRetryTimes)
+            .bodyAsString();
+
+        if (!response.hasSuccess()) {
+            throw new HttpException("Unable to delete agent");
+        }
+
+        Agent agent = Agent.parse(response.getBody(), Agent.class);
+
+        if (agent.getStatus() == AgentStatus.BUSY){
+            throw new IllegalStatusException("agent is busy, please wait");
+        }
+
+        return agent;
+    }
+
 }
diff --git a/platform-api/src/main/java/com/flow/platform/api/util/PlatformURL.java b/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 + '\'' +
             '}';
     }
-}
+}
diff --git a/platform-api/src/test/java/com/flow/platform/api/test/service/AgentServiceTest.java b/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;
diff --git a/platform-control-center/src/main/java/com/flow/platform/cc/controller/AgentController.java b/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);
+    }
 }
diff --git a/platform-control-center/src/main/java/com/flow/platform/cc/service/AgentService.java b/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);
 }
diff --git a/platform-control-center/src/main/java/com/flow/platform/cc/service/AgentServiceImpl.java b/platform-control-center/src/main/java/com/flow/platform/cc/service/AgentServiceImpl.java
@@ -38,6 +38,7 @@
 import com.flow.platform.util.Logger;
 import com.google.common.base.Strings;
 import com.google.gson.annotations.Expose;
+import java.sql.SQLDataException;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Collection;
@@ -235,4 +236,14 @@ public AgentSettings settings(String token) {
         agentSettings.setAgentPath(agent.getPath());
         return agentSettings;
     }
+
+    @Override
+    public void delete(Agent agent){
+        try {
+            agentDao.delete(agent);
+        } catch (Throwable e){
+            throw new UnsupportedOperationException("delete agent failure " + e.getMessage());
+        }
+
+    }
 }
diff --git a/platform-control-center/src/test/java/com/flow/platform/cc/test/controller/AgentControllerTest.java b/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);
+
+    }
 }
diff --git a/platform-control-center/src/test/java/com/flow/platform/cc/test/dao/AgentDaoTest.java b/platform-control-center/src/test/java/com/flow/platform/cc/test/dao/AgentDaoTest.java
@@ -128,4 +128,22 @@ public void should_batch_update_agent_status() throws Throwable {
         Assert.assertEquals(AgentStatus.OFFLINE, agentDao.get(agent3.getPath()).getStatus());
 
     }
+
+    @Test
+    public void should_delete_agent(){
+        final String zone = "zone-3";
+
+        Agent agent = new Agent(zone, "agent-3");
+        agent.setStatus(AgentStatus.OFFLINE);
+        agent.setWebhook("http://test.com/agent/callback");
+        agentDao.save(agent);
+
+        agentDao.delete(agent);
+
+        List<Agent> agents = agentDao.list(zone, null,AgentStatus.OFFLINE);
+
+        agents = agentDao.list(zone, null, AgentStatus.OFFLINE);
+        Assert.assertEquals(0, agents.size());
+
+    }
 }
diff --git a/platform-control-center/src/test/java/com/flow/platform/cc/test/service/AgentServiceTest.java b/platform-control-center/src/test/java/com/flow/platform/cc/test/service/AgentServiceTest.java
@@ -239,4 +239,24 @@ public void should_agent_session_timeout() throws Throwable {
         Thread.sleep(1500); // wait for 2 seconds
         Assert.assertTrue(agentService.isSessionTimeout(mockAgent, DateUtil.utcNow(), 1));
     }
+
+    @Test
+    public void should_delete_agent() throws Exception{
+        String zoneName = defaultZones.get(0).getName();
+        String agentName = "test-agent-for-status";
+        String agentPath = ZKHelper.buildPath(zoneName, agentName);
+        zkClient.createEphemeral(agentPath, null);
+
+        Thread.sleep(500);
+
+        // when: report status
+        AgentPath pathObj = new AgentPath(zoneName, agentName);
+        Agent created = agentService.find(pathObj);
+        agentService.saveWithStatus(created, AgentStatus.BUSY);
+
+        agentService.delete(created);
+
+        Assert.assertEquals(0, agentService.list(zoneName).size());
+
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public Node createEmptyFlow() {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/**`
`117`		`- * @api {delete} /flows/:root/delete Delete`
	`117`	`+ * @api {delete} /flows/:root Delete`
`118`	`118`	`* @apiParam {String} root flow node name will be deleted`
`119`	`119`	`* @apiDescription Delete flow node by name and return flow node object`
`120`	`120`	`* @apiGroup Flows`
Original file line number	Diff line number	Diff line change
`@@ -98,4 +98,9 @@ public void reportStatus(@RequestBody Agent agent) {`
`98`	`98`
`99`	`99`	`agentService.saveWithStatus(agent, agent.getStatus());`
`100`	`100`	`}`
	`101`	`+`
	`102`	`+ @PostMapping(path = "/delete")`
	`103`	`+ public void delete(@RequestBody Agent agent){`
	`104`	`+ agentService.delete(agent);`
	`105`	`+ }`
`101`	`106`	`}`