Merge pull request #423 from FlowCI/feature/1580

Feature/1580

Author: gy2006

core/src/main/java/com/flowci/core/common/config/MongoConfig.java

@@ -24,6 +24,8 @@
 import com.flowci.core.common.mongo.VariableMapConverter;
 import com.flowci.core.config.domain.SmtpConfig;
 import com.flowci.core.config.domain.TextConfig;
+import com.flowci.core.git.domain.GitConfig;
+import com.flowci.core.git.domain.GitConfigWithHost;
 import com.flowci.core.job.domain.JobItem;
 import com.flowci.core.secret.domain.*;
 import com.flowci.core.trigger.domain.EmailTrigger;
@@ -111,6 +113,8 @@ public MongoMappingContext mongoMappingContext(MongoCustomConversions customConv
         context.addEntity(EmailTrigger.class);
         context.addEntity(WebhookTrigger.class);
 
+        context.addEntity(GitConfigWithHost.class);
+
         return context;
     }
 

core/src/main/java/com/flowci/core/git/client/GerritAPIClient.java

@@ -0,0 +1,124 @@
+package com.flowci.core.git.client;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.flowci.core.git.domain.GitCommitStatus;
+import com.flowci.core.git.domain.GitConfig;
+import com.flowci.core.git.domain.GitConfigWithHost;
+import com.flowci.core.git.util.CommitHelper;
+import com.flowci.core.secret.domain.AuthSecret;
+import com.flowci.exception.ArgumentException;
+import com.flowci.exception.CIException;
+import com.flowci.exception.NotFoundException;
+import com.flowci.util.StringHelper;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+@Log4j2
+public class GerritAPIClient implements GitAPIClient {
+
+    private final HttpClient httpClient;
+
+    private final ObjectMapper objectMapper;
+
+    public GerritAPIClient(HttpClient httpClient, ObjectMapper objectMapper) {
+        this.httpClient = httpClient;
+        this.objectMapper = objectMapper;
+    }
+
+    /**
+     * Write commit status on change only
+     */
+    @Override
+    public void writeCommitStatus(GitCommitStatus commit, GitConfig config) {
+        if (!(config instanceof GitConfigWithHost)) {
+            throw new ArgumentException("GitConfigWithHost is required for Gerrit");
+        }
+
+        var secret = config.getSecretObj();
+        if (!(secret instanceof AuthSecret)) {
+            throw new ArgumentException("AuthSecret is required for Gerrit");
+        }
+
+        var changeId = CommitHelper.getChangeId(commit);
+        if (changeId.isEmpty()) {
+            throw new NotFoundException("Change-Id not found from commit message");
+        }
+
+        try {
+            var gitConfig = (GitConfigWithHost) config;
+
+            var url = UriComponentsBuilder.fromHttpUrl(gitConfig.getHost())
+                    .path("/a/changes/")
+                    .path(changeId.get())
+                    .path("/revisions/")
+                    .path(commit.getId())
+                    .path("/review")
+                    .build()
+                    .toUriString();
+
+            var request = getRequestBuilder(url, (AuthSecret) secret)
+                    .POST(HttpRequest.BodyPublishers.ofString(objectMapper.writeValueAsString(getBodyObj(commit))))
+                    .build();
+
+            httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString())
+                    .thenAccept(r -> {
+                        log.info("Update commit status on {} is {}", commit.getUrl(), r.statusCode());
+                        if (r.statusCode() != HttpStatus.OK.value()) {
+                            log.debug(r.body());
+                        }
+                    });
+
+        } catch (JsonProcessingException e) {
+            throw new CIException("Unable to convert gerrit commit body to json: " + e.getMessage());
+        }
+    }
+
+    private HttpRequest.Builder getRequestBuilder(String url, AuthSecret secret) {
+        var str = secret.getUsername() + ":" + secret.getPassword();
+        return HttpRequest.newBuilder(URI.create(url))
+                .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .setHeader(HttpHeaders.AUTHORIZATION, "Basic " + StringHelper.toBase64(str));
+    }
+
+    private SetReviewBody getBodyObj(GitCommitStatus c) {
+        var obj = new SetReviewBody();
+        obj.tag = "flow.ci";
+        obj.message = c.getDesc() + " - " + c.getTargetUrl();
+        obj.labels = new Labels(-1);
+
+        if (c.getStatus().contains("success")) {
+            obj.labels.codeReview = 1;
+        }
+
+        return obj;
+    }
+
+    private static class SetReviewBody {
+
+        public String tag;
+
+        public String message;
+
+        public Labels labels;
+    }
+
+    @AllArgsConstructor
+    @NoArgsConstructor
+    private static class Labels {
+
+        @JsonProperty("Code-Review")
+        public int codeReview;
+    }
+}

core/src/main/java/com/flowci/core/git/client/GitAPIClient.java

@@ -1,9 +1,9 @@
 package com.flowci.core.git.client;
 
 import com.flowci.core.git.domain.GitCommitStatus;
-import com.flowci.core.secret.domain.Secret;
+import com.flowci.core.git.domain.GitConfig;
 
 public interface GitAPIClient {
 
-    void writeCommitStatus(GitCommitStatus commit, Secret secret);
+    void writeCommitStatus(GitCommitStatus commit, GitConfig config);
 }

core/src/main/java/com/flowci/core/git/client/GithubAPIClient.java

@@ -5,8 +5,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.git.domain.GitCommit;
 import com.flowci.core.git.domain.GitCommitStatus;
+import com.flowci.core.git.domain.GitConfig;
 import com.flowci.core.git.domain.GitRepo;
-import com.flowci.core.secret.domain.Secret;
 import com.flowci.core.secret.domain.TokenSecret;
 import com.flowci.exception.ArgumentException;
 import com.flowci.exception.CIException;
@@ -43,9 +43,11 @@ public GithubAPIClient(HttpClient httpClient, ObjectMapper objectMapper) {
     }
 
     @Override
-    public void writeCommitStatus(GitCommitStatus commit, Secret secret) {
+    public void writeCommitStatus(GitCommitStatus commit, GitConfig config) {
+        var secret = config.getSecretObj();
+
         if (!(secret instanceof TokenSecret)) {
-            throw new ArgumentException("Token secret is required");
+            throw new ArgumentException("Token secret is required Github");
         }
 
         var tokenSecret = (TokenSecret) secret;

core/src/main/java/com/flowci/core/git/controller/GitConfigController.java

@@ -3,7 +3,8 @@
 import com.flowci.core.auth.annotation.Action;
 import com.flowci.core.common.domain.GitSource;
 import com.flowci.core.git.domain.GitConfig;
-import com.flowci.core.git.service.GitService;
+import com.flowci.core.git.service.GitConfigService;
+import com.flowci.exception.ArgumentException;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -16,29 +17,33 @@
 public class GitConfigController {
 
     @Autowired
-    private GitService gitService;
+    private GitConfigService gitConfigService;
 
     @Action(GitActions.LIST)
     @GetMapping
     public List<GitConfig> list() {
-        return gitService.list();
+        return gitConfigService.list();
     }
 
     @Action(GitActions.GET)
     @GetMapping("/{source}")
     public GitConfig get(@PathVariable String source) {
-        return gitService.get(GitSource.valueOf(source.toUpperCase()));
+        return gitConfigService.get(GitSource.valueOf(source.toUpperCase()));
     }
 
     @Action(GitActions.SAVE)
     @PostMapping()
     public GitConfig save(@RequestBody Request.SaveOptions options) {
-        return gitService.save(options.toGitConfig());
+        if (options.getSource() == GitSource.GERRIT && options.getHost() == null) {
+            throw new ArgumentException("Host address is required for Gerrit");
+        }
+
+        return gitConfigService.save(options.toGitConfig());
     }
 
     @Action(GitActions.DELETE)
     @DeleteMapping("/{source}")
     public void delete(@PathVariable String source) {
-        gitService.delete(GitSource.valueOf(source.toUpperCase()));
+        gitConfigService.delete(GitSource.valueOf(source.toUpperCase()));
     }
 }

core/src/main/java/com/flowci/core/git/controller/Request.java

@@ -2,6 +2,8 @@
 
 import com.flowci.core.common.domain.GitSource;
 import com.flowci.core.git.domain.GitConfig;
+import com.flowci.core.git.domain.GitConfigWithHost;
+import com.flowci.util.StringHelper;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,10 +19,16 @@ public static class SaveOptions {
         @NotNull
         private GitSource source;
 
+        private String host;
+
         @NotEmpty
         private String secret;
 
         public GitConfig toGitConfig() {
+            if (StringHelper.hasValue(host)) {
+                return new GitConfigWithHost(source, secret, host);
+            }
+
             return new GitConfig(source, secret);
         }
     }

core/src/main/java/com/flowci/core/git/domain/GitCommitStatus.java

@@ -7,7 +7,7 @@
 @Setter
 public class GitCommitStatus extends GitCommit {
 
-    private String status;
+    private String status; // lower case from job status
 
     private String targetUrl;
 

core/src/main/java/com/flowci/core/git/domain/GitConfig.java

@@ -2,21 +2,28 @@
 
 import com.flowci.core.common.domain.GitSource;
 import com.flowci.core.common.domain.Mongoable;
+import com.flowci.core.secret.domain.Secret;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 @Getter
 @Setter
 @NoArgsConstructor
+@Document(collection = "git_config")
 public class GitConfig extends Mongoable {
 
     @Indexed(unique = true)
     private GitSource source;
 
     private String secret;
 
+    @Transient
+    private Secret secretObj;
+
     public GitConfig(GitSource source, String secret) {
         this.source = source;
         this.secret = secret;

core/src/main/java/com/flowci/core/git/domain/GitConfigWithHost.java

@@ -0,0 +1,21 @@
+package com.flowci.core.git.domain;
+
+import com.flowci.core.common.domain.GitSource;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Setter
+@Getter
+@Document(collection = "git_config")
+@NoArgsConstructor
+public class GitConfigWithHost extends GitConfig {
+
+    private String host;
+
+    public GitConfigWithHost(GitSource source, String secret, String host) {
+        super(source, secret);
+        this.host = host;
+    }
+}

core/src/main/java/com/flowci/core/git/service/GitService.java renamed to core/src/main/java/com/flowci/core/git/service/GitConfigService.java

@@ -5,7 +5,7 @@
 
 import java.util.List;
 
-public interface GitService {
+public interface GitConfigService {
 
     List<GitConfig> list();