Skip to content

Commit 737ebe9

Browse files
committed
suport host field on git config
1 parent 5483488 commit 737ebe9

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.flowci.core.common.domain.GitSource;
55
import com.flowci.core.git.domain.GitConfig;
66
import com.flowci.core.git.service.GitService;
7+
import com.flowci.exception.ArgumentException;
78
import lombok.extern.log4j.Log4j2;
89
import org.springframework.beans.factory.annotation.Autowired;
910
import org.springframework.web.bind.annotation.*;
@@ -33,6 +34,10 @@ public GitConfig get(@PathVariable String source) {
3334
@Action(GitActions.SAVE)
3435
@PostMapping()
3536
public GitConfig save(@RequestBody Request.SaveOptions options) {
37+
if (options.getSource() == GitSource.GERRIT && options.getHost() == null) {
38+
throw new ArgumentException("Host address is required for Gerrit");
39+
}
40+
3641
return gitService.save(options.toGitConfig());
3742
}
3843

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import com.flowci.core.common.domain.GitSource;
44
import com.flowci.core.git.domain.GitConfig;
5+
import com.flowci.core.git.domain.GitConfigWithHost;
6+
import com.flowci.util.StringHelper;
57
import lombok.Getter;
68
import lombok.Setter;
79

@@ -17,10 +19,16 @@ public static class SaveOptions {
1719
@NotNull
1820
private GitSource source;
1921

22+
private String host;
23+
2024
@NotEmpty
2125
private String secret;
2226

2327
public GitConfig toGitConfig() {
28+
if (StringHelper.hasValue(host)) {
29+
return new GitConfigWithHost(source, secret, host);
30+
}
31+
2432
return new GitConfig(source, secret);
2533
}
2634
}

0 commit comments

Comments
 (0)