Merge branch 'feature/api/delete_agent' into develop

Author: stargwq

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

@@ -86,7 +86,7 @@ public List<AgentWithFlow> index() {
      *  }
      */
     @PostMapping(path = "/create")
-    public Agent create(@RequestBody AgentPath agentPath) {
+    public AgentWithFlow create(@RequestBody AgentPath agentPath) {
         if (agentPath.isEmpty()) {
             throw new IllegalParameterException("Zone and agent name are required");
         }

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

@@ -42,7 +42,7 @@ public interface AgentService {
     /**
      * Create agent and return token from cc
      */
-    Agent create(AgentPath agentPath);
+    AgentWithFlow create(AgentPath agentPath);
 
     /**
      * Get agent setting by token from cc

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

@@ -135,7 +135,7 @@ public Boolean shutdown(String zone, String name, String password) {
     }
 
     @Override
-    public Agent create(AgentPath agentPath) {
+    public AgentWithFlow create(AgentPath agentPath) {
         try {
             AgentPathWithWebhook pathWithWebhook = new AgentPathWithWebhook(agentPath, buildAgentWebhook());
 
@@ -149,7 +149,10 @@ public Agent create(AgentPath agentPath) {
                 throw new HttpException("Unable to create agent via control center");
             }
 
-            return Agent.parse(response.getBody(), Agent.class);
+            Agent agent = Agent.parse(response.getBody(), Agent.class);
+
+            AgentWithFlow agentWithFlow = new AgentWithFlow(agent, null);
+            return agentWithFlow;
 
         } catch (UnsupportedEncodingException | JsonSyntaxException e) {
             throw new IllegalStatusException("Unable to create agent", e);
@@ -172,14 +175,15 @@ public AgentSettings settings(String token) {
     }
 
     @Override
-    public void delete(AgentPath agentPath){
+    public void delete(AgentPath agentPath) {
         Agent agent = findAgent(agentPath);
 
         try {
             HttpClient.build(platformURL.getAgentDeleteUrl())
                 .post(agent.toJson())
                 .withContentType(ContentType.APPLICATION_JSON)
-                .retry(httpRetryTimes);
+                .retry(httpRetryTimes)
+                .bodyAsString();
 
         } catch (UnsupportedEncodingException e) {
             throw new IllegalStatusException(e.getMessage());
@@ -199,8 +203,9 @@ private String buildAgentWebhook() {
     /**
      * find agent
      */
-    private Agent findAgent(AgentPath agentPath){
-        String url = platformURL.getAgentFindUrl() + "?" + "zone=" + agentPath.getZone() + "&" + "name=" + agentPath.getName();
+    private Agent findAgent(AgentPath agentPath) {
+        String url =
+            platformURL.getAgentFindUrl() + "?" + "zone=" + agentPath.getZone() + "&" + "name=" + agentPath.getName();
         HttpResponse<String> response = HttpClient.build(url)
             .get()
             .retry(httpRetryTimes)
@@ -212,7 +217,11 @@ private Agent findAgent(AgentPath agentPath){
 
         Agent agent = Agent.parse(response.getBody(), Agent.class);
 
-        if (agent.getStatus() == AgentStatus.BUSY){
+        if (agent == null){
+            throw new IllegalStatusException("agent is not exist");
+        }
+
+        if (agent.getStatus() == AgentStatus.BUSY) {
             throw new IllegalStatusException("agent is busy, please wait");
         }