write github commit status

Author: gy2006

core/src/main/java/com/flowci/core/common/domain/Variables.java

@@ -117,7 +117,7 @@ public abstract static class Git {
         public static final String EVENT = "FLOWCI_GIT_EVENT";
 
         /**
-         * Used for git clone
+         * Used for git clone, will be put to job context from gitclone plugin
          */
         public static final String COMMIT_ID = "FLOWCI_GIT_COMMIT_ID";
 

core/src/main/java/com/flowci/core/git/client/GitClient.java renamed to core/src/main/java/com/flowci/core/git/client/GitAPIClient.java

@@ -2,7 +2,7 @@
 
 import com.flowci.core.git.domain.GitCommitStatus;
 
-public interface GitClient {
+public interface GitAPIClient {
 
     void writeCommitStatus(GitCommitStatus commit);
 }

core/src/main/java/com/flowci/core/git/client/GithubClient.java renamed to core/src/main/java/com/flowci/core/git/client/GithubAPIClient.java

@@ -23,8 +23,8 @@
 import java.util.Objects;
 
 @Log4j2
-@Component
-public class GithubClient implements GitClient {
+@Component("githubClient")
+public class GithubAPIClient implements GitAPIClient {
 
     private final static UriTemplate HttpTemplate = new UriTemplate("https://github.com/{owner}/{repo}.git");
 
@@ -40,7 +40,7 @@ public class GithubClient implements GitClient {
 
     private final ObjectMapper objectMapper;
 
-    public GithubClient(GitSettingsDao gitSettingsDao, HttpClient httpClient, ObjectMapper objectMapper) {
+    public GithubAPIClient(GitSettingsDao gitSettingsDao, HttpClient httpClient, ObjectMapper objectMapper) {
         this.gitSettingsDao = gitSettingsDao;
         this.httpClient = httpClient;
         this.objectMapper = objectMapper;

core/src/main/java/com/flowci/core/git/service/GitService.java

@@ -1,8 +1,5 @@
 package com.flowci.core.git.service;
 
-import com.flowci.core.git.domain.GitCommitStatus;
-
 public interface GitService {
 
-    void writeStatus(GitCommitStatus commit);
 }

core/src/main/java/com/flowci/core/git/service/GitServiceImpl.java

@@ -1,40 +1,61 @@
 package com.flowci.core.git.service;
 
 import com.flowci.core.common.domain.GitSource;
-import com.flowci.core.common.domain.Variables;
-import com.flowci.core.git.domain.GitCommit;
+import com.flowci.core.git.client.GitAPIClient;
 import com.flowci.core.git.domain.GitCommitStatus;
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.event.JobFinishedEvent;
 import com.flowci.core.job.util.JobContextHelper;
 import com.flowci.util.StringHelper;
 import lombok.extern.log4j.Log4j2;
 import org.jvnet.hk2.annotations.Service;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+
 @Log4j2
 @Service
 public class GitServiceImpl implements GitService {
 
-    @Override
-    public void writeStatus(GitCommitStatus commit) {
+    @Autowired
+    private GitAPIClient githubClient;
+
+    private final Map<GitSource, GitAPIClient> clients = new HashMap<>(5);
 
+    @PostConstruct
+    public void init() {
+        clients.put(GitSource.GITHUB, githubClient);
     }
 
     @EventListener
     public void onJobFinishEvent(JobFinishedEvent event) {
         Job job = event.getJob();
 
-        String gitSourceStr = job.getContext().get(Variables.Git.SOURCE);
+        String gitSourceStr = JobContextHelper.getGitSource(job);
         if (!StringHelper.hasValue(gitSourceStr)) {
             log.info("no git source on job {} - {}", job.getFlowName(), job.getBuildNumber());
             return;
         }
 
         var commit = new GitCommitStatus();
+        commit.setId(JobContextHelper.getCommitId(job));
         commit.setUrl(JobContextHelper.getGitUrl(job));
         commit.setTargetUrl(JobContextHelper.getJobUrl(job));
         commit.setStatus(JobContextHelper.getStatus(job).name().toLowerCase());
+        commit.setDesc(String.format("build %s from flow.ci", commit.getStatus()));
 
+        try {
+            var source = GitSource.valueOf(gitSourceStr);
+            var apiClient = clients.get(source);
+
+            if (apiClient != null) {
+                apiClient.writeCommitStatus(commit);
+            }
+        } catch (Throwable e) {
+            log.warn(e.getMessage());
+        }
     }
 }

core/src/main/java/com/flowci/core/job/util/JobContextHelper.java

@@ -70,4 +70,12 @@ public static void setJobUrl(Job job, String url) {
     public static String getJobUrl(Job job) {
         return job.getContext().get(Variables.Job.Url);
     }
+
+    public static String getCommitId(Job job) {
+        return job.getContext().get(Variables.Git.COMMIT_ID);
+    }
+
+    public static String getGitSource(Job job) {
+        return job.getContext().get(Variables.Git.SOURCE);
+    }
 }

core/src/test/java/com/flowci/core/test/git/GitHubClientTest.java

@@ -1,6 +1,6 @@
 package com.flowci.core.test.git;
 
-import com.flowci.core.git.client.GithubClient;
+import com.flowci.core.git.client.GithubAPIClient;
 import com.flowci.core.git.domain.GitCommit;
 import com.flowci.core.git.domain.GitRepo;
 import org.junit.Test;
@@ -13,17 +13,17 @@ public void should_extract_owner_repo_from_commit_url() {
         GitCommit commit = new GitCommit();
         commit.setUrl("https://github.com/gy2006/ci-test.git");
 
-        GitRepo repo = GithubClient.getRepo(commit);
+        GitRepo repo = GithubAPIClient.getRepo(commit);
         Assert.assertEquals("gy2006", repo.getOwner());
         Assert.assertEquals("ci-test", repo.getRepo());
 
         commit.setUrl("[email protected]:gy2006/ci-test.git");
-        repo = GithubClient.getRepo(commit);
+        repo = GithubAPIClient.getRepo(commit);
         Assert.assertEquals("gy2006", repo.getOwner());
         Assert.assertEquals("ci-test", repo.getRepo());
 
         commit.setUrl("ssh://[email protected]:gy2006/ci-test.git");
-        repo = GithubClient.getRepo(commit);
+        repo = GithubAPIClient.getRepo(commit);
         Assert.assertEquals("gy2006", repo.getOwner());
         Assert.assertEquals("ci-test", repo.getRepo());
     }