Merge branch 'develop' into feature/api/branches_cache

Author: Yang Guo

docker/app-cc.properties

@@ -28,6 +28,7 @@ mq.host = amqp://localhost:5672
 mq.management.host = http://localhost:15672
 
 #### cmd queue settings ###
+queue.cmd.retry.enable = false
 queue.cmd.rabbit.enable = false
 queue.cmd.rabbit.name = flow-cmd-queue-default
 queue.cmd.idle_agent.timeout = 30

lib/org/gitlab/java-gitlab-api/4.0.0-SNAPSHOT/java-gitlab-api-4.0.0-SNAPSHOT.jar

@@ -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");
         }
@@ -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);
+    }
 }

platform-api/src/main/java/com/flow/platform/api/controller/AgentController.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/controller/FlowController.java

@@ -26,6 +26,11 @@ public enum GitEnvs implements EnvKey {
      */
     FLOW_GIT_SOURCE,
 
+    /**
+     * For diff FLOW_GIT_SOURCE
+     *  - UNDEFINED_SSH and UNDEFINED_HTTP is repo url
+     *  - GITLAB is gitlab host url
+     */
     FLOW_GIT_URL,
 
     FLOW_GIT_BRANCH,
@@ -69,5 +74,12 @@ public enum GitEnvs implements EnvKey {
 
     FLOW_GIT_HTTP_USER,
 
-    FLOW_GIT_HTTP_PASS
+    FLOW_GIT_HTTP_PASS,
+
+    /**
+     * Env variables for GitLab
+     */
+    FLOW_GITLAB_TOKEN,
+
+    FLOW_GITLAB_PROJECT
 }

platform-api/src/main/java/com/flow/platform/api/domain/envs/GitEnvs.java

@@ -19,6 +19,7 @@
 import com.flow.platform.api.domain.envs.GitEnvs;
 import com.flow.platform.api.domain.node.Node;
 import com.flow.platform.util.git.GitClient;
+import com.flow.platform.util.git.GitException;
 import java.nio.file.Path;
 
 /**
@@ -41,5 +42,5 @@ public GitClientBuilder(final Node node, final Path sourceFolder) {
         this.sourceFolder = sourceFolder;
     }
 
-    public abstract GitClient build();
+    public abstract GitClient build() throws GitException;
 }

platform-api/src/main/java/com/flow/platform/api/git/GitClientBuilder.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.flow.platform.api.git;
+
+import com.flow.platform.api.domain.envs.GitEnvs;
+import com.flow.platform.api.domain.node.Node;
+import com.flow.platform.util.git.GitClient;
+import com.flow.platform.util.git.GitException;
+import com.flow.platform.util.git.GitLabClient;
+import java.nio.file.Path;
+
+/**
+ * @author yang
+ */
+public class GitLabClientBuilder extends GitClientBuilder {
+
+    private final String host;
+
+    private final String token;
+
+    private final String project;
+
+    public GitLabClientBuilder(Node node, Path sourceFolder) {
+        super(node, sourceFolder);
+        host = node.getEnv(GitEnvs.FLOW_GIT_URL);
+        token = node.getEnv(GitEnvs.FLOW_GITLAB_TOKEN);
+        project = node.getEnv(GitEnvs.FLOW_GITLAB_PROJECT);
+    }
+
+    @Override
+    public GitClient build() throws GitException {
+        return new GitLabClient(host, token, project);
+    }
+}

platform-api/src/main/java/com/flow/platform/api/git/GitLabClientBuilder.java

@@ -42,13 +42,17 @@ 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
      */
     AgentSettings settings(String token);
 
+    /**
+     * Delete agent by agentPath from cc
+     */
+    void delete(AgentPath agentPath);
     /**
      * send sys cmd
      * @param agentPath required

platform-api/src/main/java/com/flow/platform/api/service/AgentService.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;
@@ -134,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());
 
@@ -148,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);
@@ -170,13 +174,58 @@ 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)
+                .bodyAsString();
+
+        } 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 == null){
+            throw new IllegalStatusException("agent is not exist");
+        }
+
+        if (agent.getStatus() == AgentStatus.BUSY) {
+            throw new IllegalStatusException("agent is busy, please wait");
+        }
+
+        return agent;
+    }
+
 }

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

@@ -46,8 +46,6 @@ interface ProgressListener {
         void onProgressing(String task, int total, int progress);
 
         void onFinishTask(String task);
-
-        void onFinish();
     }
 
     /**
@@ -58,7 +56,7 @@ interface ProgressListener {
      * @param progress listener for git progress
      * @return file content
      */
-    String clone(Node node, String filePath, ProgressListener progress) throws GitException;
+    String fetch(Node node, String filePath, ProgressListener progress) throws GitException;
 
     /**
      * Fetch branches from git repo