Merge pull request #135 from FlowCI/feature/api/git_webhook_bitbucket

Feature/api/git webhook bitbucket

Author: yang.guo

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

@@ -87,7 +87,7 @@ public void onEventReceived(@RequestHeader HttpHeaders headers, HttpServletReque
             // extract git related env variables from event, and temporary set to node for git loading
             final Map<String, String> gitEnvs = GitEventEnvConverter.convert(hookEvent);
 
-            if (!allowEventType(flow, gitEnvs)) {
+            if (!canExecuteGitEvent(flow, gitEnvs)) {
                 LOGGER.warn("The git event not match flow settings");
                 return;
             }
@@ -103,7 +103,7 @@ public void onEventReceived(@RequestHeader HttpHeaders headers, HttpServletReque
         }
     }
 
-    private boolean allowEventType(Node flow, Map<String, String> gitEnvs) {
+    private boolean canExecuteGitEvent(Node flow, Map<String, String> gitEnvs) {
         String gitEventType = gitEnvs.get(GitEnvs.FLOW_GIT_EVENT_TYPE.name());
         String gitBranch = gitEnvs.get(GitEnvs.FLOW_GIT_BRANCH.name());
 

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

@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Extract required GitEnv from git event
@@ -76,6 +77,12 @@ public static Map<String, String> convert(GitEvent event) {
                 info.put(GitEnvs.FLOW_GIT_AUTHOR.name(), pr.getMergedBy());
             }
 
+            // set commit id and url from PR request id and pr url
+            if (pr.getRequestId() != null && pr.getUrl() != null) {
+                info.put(GitEnvs.FLOW_GIT_COMMIT_ID.name(), pr.getRequestId().toString());
+                info.put(GitEnvs.FLOW_GIT_COMMIT_URL.name(), pr.getUrl());
+            }
+
             info.put(GitEnvs.FLOW_GIT_CHANGELOG.name(), pr.getTitle());
             info.put(GitEnvs.FLOW_GIT_PR_URL.name(), pr.getUrl());
             return info;
@@ -97,6 +104,8 @@ public static Map<String, String> convert(GitEvent event) {
             // TODO: multi change log
             if (pt.getCommits().size() > 0) {
                 info.put(GitEnvs.FLOW_GIT_CHANGELOG.name(), pt.getCommits().get(0).getMessage());
+            } else if (Objects.equals(pt.getType(), GitEventType.TAG)) {
+                info.put(GitEnvs.FLOW_GIT_CHANGELOG.name(), pt.getMessage());
             }
 
             return info;

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

@@ -116,10 +116,11 @@ public void delete(String name) {
     public RSAKeyPair generateRsaKey() {
         String comment = "FLOWCI";
         int type = KeyPair.RSA;
+        final int keySize = 2048; // default 1024, bitbucket support at least 2048
         JSch jsch = new JSch();
 
         try {
-            KeyPair kpair = KeyPair.genKeyPair(jsch, type);
+            KeyPair kpair = KeyPair.genKeyPair(jsch, type, keySize);
             RSAKeyPair pair = new RSAKeyPair();
 
             // private key

platform-control-center/src/main/java/com/flow/platform/cc/consumer/CmdQueueConsumer.java

@@ -96,13 +96,15 @@ public void onQueueItem(Message message) {
                 LOGGER.trace("wait for idle agent time out %s seconds for cmd %s", idleAgentTimeout, cmdId);
             }
 
-            // reset cmd status to pending, record num of retry
-            int retry = item.getRetry() - 1;
             Cmd cmd = cmdService.find(cmdId);
+
+            // do not re-enqueue if cmd been stopped or killed
             if (cmd.getStatus() == CmdStatus.STOPPED || cmd.getStatus() == CmdStatus.KILLED) {
                 return;
             }
 
+            // reset cmd status to pending, record num of retry
+            int retry = item.getRetry() - 1;
             cmd.setStatus(CmdStatus.PENDING);
             cmd.setRetry(retry);
             cmdService.save(cmd);