Merge pull request #425 from FlowCI/develop

Develop

Author: gy2006

.gitignore

@@ -7,5 +7,4 @@ target/
 .settings/
 .classpath
 .factorypath
-*Proto.java
-.run/
+*Proto.java

.run/Application - 1.run.xml

@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Application - 1" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <module name="core" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.flowci.core.Application" />
+    <option name="VM_PARAMETERS" value="-Xms1g -Xmx1g -Xmn600m -XX:-UseAdaptiveSizePolicy -XX:SurvivorRatio=4 -verbose:gc" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <envs>
+      <env name="FLOWCI_LOG_LEVEL" value="DEBUG" />
+      <env name="FLOWCI_PLUGIN_URL" value="https://raw.githubusercontent.com/FlowCI/plugins/develop/repository.json" />
+      <env name="FLOWCI_RABBITMQ_URI" value="amqp://guest:[email protected]:5672" />
+      <env name="FLOWCI_ZK_HOST" value="127.0.0.1" />
+      <env name="FLOWCI_AUTO_AGENT" value="false" />
+      <env name="FLOWCI_AGENT_VOLUMES" value="name=pyenv,dest=/ci/python,script=init.sh,image=flowci/pyenv,init=init-pyenv-volume.sh" />
+      <env name="FLOWCI_SERVER_PORT" value="8080" />
+      <env name="FLOWCI_TEMPLATES" value="https://raw.githubusercontent.com/FlowCI/templates/develop/templates.json" />
+      <env name="FLOWCI_AGENT_IMAGE" value="flowci/agent:dev" />
+      <env name="FLOWCI_SERVER_URL" value="http://192.168.31.173:8080" />
+    </envs>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

build.sh

@@ -6,4 +6,4 @@ if [[ -n ${tag} ]]; then
   versionTag="-t flowci/core:$tag"
 fi
 
-docker build -f ./core/Dockerfile -t flowci/core:latest $versionTag ./core
+docker buildx build -f ./core/Dockerfile --platform linux/arm64,linux/amd64 --push -t flowci/core:latest $versionTag ./core

core/src/main/java/com/flowci/core/auth/config/AuthConfig.java

@@ -22,9 +22,10 @@
 import com.flowci.core.common.domain.Settings;
 import com.flowci.core.config.domain.ConfigAction;
 import com.flowci.core.flow.domain.FlowAction;
+import com.flowci.core.git.controller.GitActions;
 import com.flowci.core.job.domain.JobAction;
-import com.flowci.core.trigger.domain.TriggerOperations;
-import com.flowci.core.secret.domain.SecretAction;
+import com.flowci.core.trigger.domain.TriggerActions;
+import com.flowci.core.secret.controller.SecretActions;
 import com.flowci.core.user.domain.User;
 import com.flowci.core.user.domain.UserAction;
 import org.springframework.context.annotation.Bean;
@@ -43,19 +44,20 @@ public PermissionMap actionMap() {
         // admin
         permissionMap.add(User.Role.Admin, FlowAction.ALL);
         permissionMap.add(User.Role.Admin, JobAction.ALL);
-        permissionMap.add(User.Role.Admin, SecretAction.ALL);
+        permissionMap.add(User.Role.Admin, SecretActions.ALL);
         permissionMap.add(User.Role.Admin, AgentAction.ALL);
         permissionMap.add(User.Role.Admin, AgentHostAction.ALL);
         permissionMap.add(User.Role.Admin, UserAction.ALL);
         permissionMap.add(User.Role.Admin, ConfigAction.ALL);
-        permissionMap.add(User.Role.Admin, TriggerOperations.ALL);
+        permissionMap.add(User.Role.Admin, TriggerActions.ALL);
+        permissionMap.add(User.Role.Admin, GitActions.ALL);
         permissionMap.add(User.Role.Admin, Settings.Action.ALL);
 
         // developer
         permissionMap.add(User.Role.Developer,
                 FlowAction.GET, FlowAction.LIST, FlowAction.LIST_BRANCH, FlowAction.GET, FlowAction.GET_YML);
         permissionMap.add(User.Role.Developer, JobAction.ALL);
-        permissionMap.add(User.Role.Developer, SecretAction.LIST_NAME);
+        permissionMap.add(User.Role.Developer, SecretActions.LIST_NAME);
         permissionMap.add(User.Role.Developer, AgentAction.GET, AgentAction.LIST);
         permissionMap.add(User.Role.Developer, AgentHostAction.GET, AgentHostAction.LIST);
         permissionMap.add(User.Role.Developer, UserAction.CHANGE_PASSWORD, UserAction.UPDATE_AVATAR);

core/src/main/java/com/flowci/core/common/adviser/ExceptionAdviser.java

@@ -45,6 +45,7 @@
         "com.flowci.core.config",
         "com.flowci.core.trigger",
         "com.flowci.core.api",
+        "com.flowci.core.git",
         "com.flowci.core.common.controller"
 })
 public class ExceptionAdviser {

core/src/main/java/com/flowci/core/common/adviser/ResponseMessageAdviser.java

@@ -41,6 +41,7 @@
         "com.flowci.core.config",
         "com.flowci.core.trigger",
         "com.flowci.core.api",
+        "com.flowci.core.git",
         "com.flowci.core.common.controller"
 })
 public class ResponseMessageAdviser implements ResponseBodyAdvice {

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

@@ -130,11 +130,12 @@ public void multicastEvent(ApplicationEvent event, ResolvableType eventType) {
     }
 
     @Bean("httpClient")
-    public HttpClient httpClient() {
+    public HttpClient httpClient(TaskExecutor appTaskExecutor) {
         return HttpClient.newBuilder()
                 .version(HttpClient.Version.HTTP_1_1)
                 .followRedirects(HttpClient.Redirect.NORMAL)
                 .connectTimeout(Duration.ofSeconds(10))
+                .executor(appTaskExecutor)
                 .build();
     }
 }

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/common/config/WebConfig.java

@@ -80,6 +80,7 @@ public void addInterceptors(InterceptorRegistry registry) {
                         .addPathPatterns("/configs/**")
                         .addPathPatterns("/triggers/**")
                         .addPathPatterns("/system/**")
+                        .addPathPatterns("/gitconfig/**")
                         .addPathPatterns("/auth/logout");
 
                 registry.addInterceptor(apiAuth)

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

@@ -27,4 +27,6 @@ public enum GitSource {
     GOGS,
 
     GITEE,
+
+    GERRIT
 }