Merge pull request #110 from FlowCI/develop

Develop

Author: yang.guo

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

@@ -65,6 +65,11 @@
       <artifactId>gson</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator</artifactId>

platform-api/pom.xml

@@ -0,0 +1,50 @@
+/*
+ * 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.config;
+
+import com.google.common.cache.CacheBuilder;
+import java.util.concurrent.TimeUnit;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.guava.GuavaCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author yh@firim
+ */
+@Configuration
+@EnableCaching
+public class CachingConfig {
+
+    private final static int EXPIRE_CACHE_SECOND = 3600 * 24;
+
+    private final static int MAX_CACHE_NUM = 100;
+
+    private CacheBuilder cacheBuilder = CacheBuilder
+        .newBuilder()
+        .expireAfterAccess(EXPIRE_CACHE_SECOND, TimeUnit.SECONDS)
+        .maximumSize(MAX_CACHE_NUM);
+
+
+    @Bean
+    public CacheManager cacheManager() {
+        GuavaCacheManager guavaCacheManager = new GuavaCacheManager();
+        guavaCacheManager.setCacheBuilder(cacheBuilder);
+        return guavaCacheManager;
+    }
+}

platform-api/src/main/java/com/flow/platform/api/config/CachingConfig.java

@@ -64,7 +64,7 @@
     "com.flow.platform.api.util",
     "com.flow.platform.api.consumer",
     "com.flow.platform.api.initializers"})
-@Import({AppConfig.class})
+@Import({AppConfig.class, CachingConfig.class})
 public class WebConfig extends WebMvcConfigurerAdapter {
 
     private final static Gson GSON_CONFIG_FOR_RESPONE = new GsonBuilder()

platform-api/src/main/java/com/flow/platform/api/config/WebConfig.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");
         }
@@ -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

@@ -16,9 +16,9 @@
 
 package com.flow.platform.api.controller;
 
-import com.flow.platform.api.domain.permission.Actions;
 import com.flow.platform.api.domain.node.Flow;
 import com.flow.platform.api.domain.node.Node;
+import com.flow.platform.api.domain.permission.Actions;
 import com.flow.platform.api.domain.request.ListParam;
 import com.flow.platform.api.domain.response.BooleanValue;
 import com.flow.platform.api.domain.user.User;
@@ -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
@@ -235,6 +235,7 @@ public BooleanValue isFlowNameExist() {
     /**
      * @api {get} /flows/:root/branches List Branches
      * @apiParam {String} root flow node name
+     * @apiParam {Boolean} [refresh] true or false, the default is false
      * @apiGroup Flows
      *
      * @apiSuccessExample {json} Success-Response
@@ -246,9 +247,13 @@ public BooleanValue isFlowNameExist() {
      *  ]
      */
     @GetMapping("/{root}/branches")
-    public List<String> listBranches() {
+    public List<String> listBranches(@RequestParam(required = false) Boolean refresh) {
+        if (refresh == null) {
+            refresh = false;
+        }
+
         Node root = nodeService.find(currentNodePath.get());
-        return gitService.branches(root);
+        return gitService.branches(root, refresh);
     }
 
     /**
@@ -266,7 +271,7 @@ public List<String> listBranches() {
     @GetMapping("/{root}/tags")
     public List<String> listTags() {
         Node root = nodeService.find(currentNodePath.get());
-        return gitService.tags(root);
+        return gitService.tags(root, false);
     }
 
     /**
@@ -415,7 +420,7 @@ public Node createFromYml(@RequestBody String yml) {
      */
     @PostMapping("/{root}/users/auth")
     @WebSecurity(action = Actions.FLOW_AUTH)
-    public List<User> flowAuthUsers(@RequestBody ListParam<String> listParam){
+    public List<User> flowAuthUsers(@RequestBody ListParam<String> listParam) {
         return nodeService.authUsers(listParam.getArrays(), currentNodePath.get());
     }
 }

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