Merge pull request #122 from FlowCI/feature/api/domain_properity

Feature/api/domain properity

Author: yang.guo

config/app-api.properties

@@ -0,0 +1,26 @@
+## flow api config file ##
+
+### JDBC config ###
+jdbc.url = jdbc:mysql://127.0.0.1:3306/flow_api_db?useSSL=false
+jdbc.username = db_username
+jdbc.password = db_password
+jdbc.pool.size = 200
+jdbc.commit.auto = false
+jdbc.connection.timeout = 20000
+
+### Hibernate config ###
+hibernate.show_sql = false
+hibernate.hbm2ddl.auto = validate
+
+### api settings ###
+api.workspace = ${HOME}/flow-api-data
+api.zone.default = default
+
+### expiration duration of token, it's in millisecond ###
+### 86400000 = 1000 * 60 * 60 * 24 = 1 day (will expiration after one day) ###
+api.user.expire = 86400000
+
+### domain ###
+domain.api = http://localhost:8080
+domain.web = http://localhost:3000
+domain.cc = http://localhost:8080

config/app-cc.properties

@@ -0,0 +1,45 @@
+## for flow control center docker env ##
+
+### jdbc config ###
+jdbc.url = jdbc:mysql://127.0.0.1:3306/flow_cc_db?useSSL=false&createDatabaseIfNotExist=true
+jdbc.username = root
+jdbc.password =
+jdbc.pool.size = 10
+jdbc.commit.auto = false
+jdbc.connection.timeout = 20000
+
+### hibernate config ###
+hibernate.show_sql = false
+hibernate.hbm2ddl.auto = validate
+
+### zookeeper config ###
+zk.server.embedded = true
+zk.host = 127.0.0.1:2181
+zk.timeout = 30
+zk.node.root = flow-agents
+
+# zone names and cloud provider config, ex: a=xxx;b=xxx;c=xxx
+zk.node.zone = default
+zone.default.agent_session_timeout = 600
+zone.default.default_cmd_timeout = 600
+
+### rabbitmq config ###
+mq.host = amqp://localhost:5672
+mq.management.host = http://localhost:15672
+
+#### cmd queue settings ###
+queue.cmd.retry.enable = false
+queue.cmd.rabbit.enable = false
+queue.cmd.rabbit.name = flow-cmd-queue-default
+queue.cmd.idle_agent.timeout = 30
+queue.cmd.idle_agent.period = 5
+
+### agent config ###
+agent.config.ws = ws://localhost:8088
+agent.config.cc = http://localhost:8080
+
+### task toggles ###
+task.zone.toggle.keep_idle_agent = false
+task.agent.toggle.session_timeout = true
+task.cmd.toggle.execution_timeout = true
+task.instance.mos.toggle.clean = true

platform-agent/src/main/resources/application.properties

@@ -1 +1 @@
-version=${client.version}
+version=${agent.version}

platform-api/src/main/java/com/flow/platform/api/config/AppConfig.java

@@ -71,8 +71,8 @@ public class AppConfig extends AppConfigBase {
     @Value("${api.workspace}")
     private String workspace;
 
-    @Value("${platform.url}")
-    private String platFormBaseURL;
+    @Value("${domain.cc}")
+    private String ccDomain;
 
     @Bean
     public Path workspace() {
@@ -121,7 +121,7 @@ protected String getVersion() {
 
     @Bean
     public PlatformURL platformURL() {
-        PlatformURL platformURL = new PlatformURL(platFormBaseURL);
+        PlatformURL platformURL = new PlatformURL(ccDomain);
         LOGGER.trace(platformURL.toString());
         return platformURL;
     }

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

@@ -20,12 +20,10 @@
 import com.flow.platform.api.domain.AgentWithFlow;
 import com.flow.platform.api.domain.job.Job;
 import com.flow.platform.api.domain.job.JobStatus;
-import com.flow.platform.api.domain.job.NodeResult;
 import com.flow.platform.api.domain.job.NodeStatus;
 import com.flow.platform.api.events.AgentStatusChangeEvent;
 import com.flow.platform.api.service.job.CmdService;
 import com.flow.platform.api.service.job.JobService;
-import com.flow.platform.api.service.job.NodeResultService;
 import com.flow.platform.api.util.PlatformURL;
 import com.flow.platform.core.exception.HttpException;
 import com.flow.platform.core.exception.IllegalStatusException;
@@ -42,6 +40,7 @@
 import com.flow.platform.util.Logger;
 import com.flow.platform.util.http.HttpClient;
 import com.flow.platform.util.http.HttpResponse;
+import com.flow.platform.util.http.HttpURL;
 import com.google.common.base.Strings;
 import com.google.gson.JsonSyntaxException;
 import java.io.UnsupportedEncodingException;
@@ -65,7 +64,7 @@ public class AgentServiceImpl extends ApplicationEventService implements AgentSe
 
     private final int httpRetryTimes = 5;
 
-    @Value(value = "${platform.zone}")
+    @Value(value = "${api.zone.default}")
     private String zone;
 
     @Autowired
@@ -80,11 +79,8 @@ public class AgentServiceImpl extends ApplicationEventService implements AgentSe
     @Autowired
     private JobService jobService;
 
-    @Autowired
-    private NodeResultService nodeResultService;
-
-    @Value(value = "${domain}")
-    private String domain;
+    @Value(value = "${domain.api}")
+    private String apiDomain;
 
     @Override
     public List<AgentWithFlow> list() {
@@ -209,7 +205,7 @@ public void sendSysCmd(AgentPath agentPath) {
     }
 
     private String buildAgentWebhook() {
-        return domain + "/agents/callback";
+        return HttpURL.build(apiDomain).append("/agents/callback").toString();
     }
 
     /**

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

@@ -30,6 +30,7 @@
 import com.flow.platform.core.exception.NotFoundException;
 import com.flow.platform.util.ExceptionUtil;
 import com.flow.platform.util.Logger;
+import com.flow.platform.util.http.HttpURL;
 import java.io.StringWriter;
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -178,8 +179,9 @@ private String getEmailSubject(JobStatus jobStatus) {
 
 
     private String buildEmailTemplate(Job job, JobStatus jobStatus) {
-        Template template = null;
         try {
+            Template template = null;
+
             if (Job.SUCCESS_STATUS.contains(jobStatus)) {
                 template = velocityEngine.getTemplate("email/success_email.vm");
             }
@@ -188,18 +190,25 @@ private String buildEmailTemplate(Job job, JobStatus jobStatus) {
                 template = velocityEngine.getTemplate("email/failure_email.vm");
             }
 
+            final String detailUrl = HttpURL.build(webDomain)
+                .append("flows")
+                .append(job.getNodeName())
+                .append("jobs")
+                .append(job.getNumber().toString())
+                .toString();
+
             VelocityContext velocityContext = new VelocityContext();
             velocityContext.put("job", job);
-            velocityContext
-                .put("detailUrl", String.format("%s/flows/%s/jobs/%s", webDomain, job.getNodeName(), job.getNumber()));
+            velocityContext.put("detailUrl", detailUrl);
             StringWriter stringWriter = new StringWriter();
             template.merge(velocityContext, stringWriter);
             return stringWriter.toString();
 
         } catch (Throwable e) {
             LOGGER.warn("sendMessage", "send message to all member error : %s",
                 ExceptionUtil.findRootCause(e).getMessage());
+
+            return null;
         }
-        return null;
     }
 }

platform-api/src/main/java/com/flow/platform/api/service/job/CmdServiceImpl.java

@@ -55,11 +55,11 @@ public class CmdServiceImpl implements CmdService {
     @Autowired
     private PlatformURL platformURL;
 
-    @Value(value = "${platform.zone}")
+    @Value(value = "${api.zone.default}")
     private String zone;
 
-    @Value(value = "${domain}")
-    private String domain;
+    @Value(value = "${domain.api}")
+    private String apiDomain;
 
     @Override
     public String createSession(Job job, Integer retry) {
@@ -195,6 +195,9 @@ private Cmd sendToQueue(CmdInfo cmdInfo, Integer retry) {
      * Build cmd callback webhook url with job id as identifier
      */
     private String buildCmdWebhook(Job job) {
-        return domain + "/hooks/cmd?identifier=" + HttpURL.encode(job.getId().toString());
+        return HttpURL.build(apiDomain)
+            .append("/hooks/cmd")
+            .withParam("identifier", HttpURL.encode(job.getId().toString()))
+            .toString();
     }
 }

platform-api/src/main/java/com/flow/platform/api/service/job/JobServiceImpl.java

@@ -61,11 +61,10 @@
 import com.flow.platform.util.Logger;
 import com.flow.platform.util.git.model.GitCommit;
 import com.flow.platform.util.git.model.GitEventType;
+import com.flow.platform.util.http.HttpURL;
 import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
 import java.math.BigInteger;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.ZonedDateTime;
 import java.util.HashSet;
 import java.util.List;
@@ -131,8 +130,8 @@ public class JobServiceImpl extends ApplicationEventService implements JobServic
     @Autowired
     private JobYmlDao jobYmlDao;
 
-    @Value(value = "${domain}")
-    private String domain;
+    @Value(value = "${domain.api}")
+    private String apiDomain;
 
     @Override
     public Job find(String flowName, Integer number) {
@@ -634,7 +633,10 @@ private void updateJobAndNodeResultTimeout(Job job) {
     }
 
     private String logUrl(final Job job) {
-        Path path = Paths.get("/", "jobs", job.getNodeName(), job.getNumber().toString(), "log", "download");
-        return domain + path.toString();
+        return HttpURL.build(apiDomain)
+            .append("/jobs/")
+            .append(job.getNodeName())
+            .append(job.getNumber().toString())
+            .append("/log/download").toString();
     }
 }

platform-api/src/main/java/com/flow/platform/api/service/node/NodeServiceImpl.java

@@ -38,6 +38,7 @@
 import com.flow.platform.api.util.PathUtil;
 import com.flow.platform.core.exception.IllegalParameterException;
 import com.flow.platform.util.Logger;
+import com.flow.platform.util.http.HttpURL;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import java.nio.file.Path;
@@ -91,8 +92,8 @@ public class NodeServiceImpl extends CurrentUser implements NodeService {
     @Autowired
     private RoleService roleService;
 
-    @Value(value = "${domain}")
-    private String domain;
+    @Value(value = "${domain.api}")
+    private String apiDomain;
 
     @Override
     public Node createOrUpdate(final String path, String yml) {
@@ -316,7 +317,7 @@ public List<User> authUsers(List<String> emailList, String rootPath) {
     }
 
     private String hooksUrl(final Flow flow) {
-        return String.format("%s/hooks/git/%s", domain, flow.getName());
+        return HttpURL.build(apiDomain).append("/hooks/git/").append(flow.getName()).toString();
     }
 
     private Boolean checkFlowName(String flowName) {

platform-api/src/main/java/com/flow/platform/api/service/node/YmlService.java

@@ -67,6 +67,11 @@ public interface YmlService {
      */
     void stopLoadYmlContent(Node root);
 
+    /**
+     * Config load yml thread pool
+     *
+     * @param threadConfigParam
+     */
     void threadConfig(ThreadConfigParam threadConfigParam);
 
 }