Merge pull request #406 from FlowCI/feature/1548

Feature/1548

Author: gy2006

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

@@ -23,6 +23,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.io.Resource;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotBlank;
@@ -51,6 +52,9 @@ public class AppProperties {
     @Length(max = 16, min = 16)
     private String secret;
 
+    // indicate load yaml template and plugin from where
+    private String resourceDomain;
+
     private boolean autoLocalAgentHost;
 
     private boolean defaultSmtpConfig;
@@ -106,7 +110,7 @@ public Minio minio() {
     @Data
     public static class Flow {
 
-        private String templatesUrl;
+        private Resource templatesUrl;
     }
 
     @Data
@@ -118,7 +122,7 @@ public static class Job {
     @Data
     public static class Plugin {
 
-        private String defaultRepo;
+        private Resource defaultRepo;
 
         private Boolean autoUpdate;
     }

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

@@ -32,6 +32,11 @@ public static class Action {
 
     private String serverUrl;
 
+    /**
+     * Indicate load resource(cn) from where
+     */
+    private String source;
+
     public Settings() {
         setId(DefaultId);
     }

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

@@ -0,0 +1,28 @@
+package com.flowci.core.common.domain;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.flowci.util.StringHelper;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+public abstract class SourceWithDomain implements Serializable {
+
+    private static final String DOMAIN_CN = "cn";
+
+    @JsonAlias("url")
+    private String source;
+
+    @JsonAlias("url_cn")
+    @JsonProperty("source_cn")
+    private String sourceCn;
+
+    public String getSourceWithDomain(String domain) {
+        if (!StringHelper.hasValue(domain)) return source;
+        return DOMAIN_CN.equalsIgnoreCase(domain) ? sourceCn : source;
+    }
+}

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

@@ -29,6 +29,7 @@ public abstract static class App {
 
         public static final String Host = "FLOWCI_SERVER_HOST";
 
+        public static final String ResourceDomain = "FLOWCI_RESOURCE_DOMAIN";
     }
 
     public abstract static class Flow {

core/src/main/java/com/flowci/core/common/service/SettingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.flowci.core.common.service;
 
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.dao.SettingsDao;
 import com.flowci.core.common.domain.Settings;
 import com.flowci.core.common.domain.Variables;
@@ -18,6 +19,9 @@ public class SettingServiceImpl implements SettingService {
     @Autowired
     private Environment environment;
 
+    @Autowired
+    private AppProperties appProperties;
+
     @Autowired
     private ServerProperties serverProperties;
 
@@ -49,6 +53,7 @@ public void setDefaultValue() {
             }
 
             s.setServerUrl(serverUrl);
+            s.setSource(appProperties.getResourceDomain());
             settingsDao.save(s);
         });
     }

core/src/main/java/com/flowci/core/flow/config/FlowConfig.java

@@ -20,14 +20,14 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
-import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.flow.domain.Template;
 import com.flowci.tree.NodeTree;
 import com.github.benmanes.caffeine.cache.Cache;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 
@@ -58,13 +58,13 @@ public Cache<String, List<String>> gitBranchCache() {
     }
 
     @Bean("templates")
-    public List<Template> getTemplates(HttpRequestManager httpManager) throws IOException {
-        String body = httpManager.get(flowProperties.getTemplatesUrl());
+    public List<Template> getTemplates() throws IOException {
+        Resource r = flowProperties.getTemplatesUrl();
 
         TypeReference<List<Template>> typeRef = new TypeReference<List<Template>>() {
         };
 
-        List<Template> list = objectMapper.readValue(body, typeRef);
+        List<Template> list = objectMapper.readValue(r.getInputStream(), typeRef);
         log.info("Templates is loaded from {}", flowProperties.getTemplatesUrl());
         return list;
     }

core/src/main/java/com/flowci/core/flow/controller/YmlController.java

@@ -62,14 +62,13 @@ public void saveYml(@PathVariable String flowName,
                         @RequestBody RequestMessage<String> body) {
         Flow flow = flowService.get(flowName);
         String yamlInB64 = body.getData();
-        ymlService.saveYml(flow, ymlName, yamlInB64);
+        ymlService.saveYmlFromB64(flow, ymlName, yamlInB64);
     }
 
     @GetMapping(value = "/{flowName}/yml/{ymlName}", produces = MediaType.APPLICATION_JSON_VALUE)
     @Action(FlowAction.GET_YML)
     public String getYml(@PathVariable String flowName, @PathVariable String ymlName) {
         Flow flow = flowService.get(flowName);
-        String yamlInB64 = ymlService.getYmlString(flow.getId(), ymlName);
-        return yamlInB64;
+        return ymlService.getYmlString(flow.getId(), ymlName);
     }
 }

core/src/main/java/com/flowci/core/flow/domain/ConfirmOption.java

@@ -16,6 +16,7 @@
 
 package com.flowci.core.flow.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.flowci.util.StringHelper;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -27,6 +28,8 @@
 @Accessors(chain = true)
 public class ConfirmOption {
 
+    private static final String DESC_BLANK = "blank";
+
     private String gitUrl;
 
     private String secret;
@@ -36,6 +39,12 @@ public class ConfirmOption {
      */
     private String yaml = StringHelper.EMPTY;
 
+    /**
+     * Template name (desc), yaml property will be ignored if it is defined
+     */
+    @JsonProperty("desc")
+    private String templateDesc;
+
     public boolean hasGitUrl() {
         return StringHelper.hasValue(gitUrl);
     }
@@ -47,4 +56,12 @@ public boolean hasSecret() {
     public boolean hasYml() {
         return StringHelper.hasValue(yaml);
     }
+
+    public boolean hasTemplateDesc() {
+        return StringHelper.hasValue(templateDesc);
+    }
+
+    public boolean hasBlankTemplate() {
+        return DESC_BLANK.equalsIgnoreCase(templateDesc);
+    }
 }

core/src/main/java/com/flowci/core/flow/domain/Template.java

@@ -1,13 +1,12 @@
 package com.flowci.core.flow.domain;
 
+import com.flowci.core.common.domain.SourceWithDomain;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public final class Template {
-
-    private String url;
+public final class Template extends SourceWithDomain {
 
     private String desc;
 

core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java

@@ -16,16 +16,15 @@
 
 package com.flowci.core.flow.service;
 
+import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.domain.Variables;
+import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.flow.dao.FlowDao;
 import com.flowci.core.flow.dao.FlowUserDao;
-import com.flowci.core.flow.domain.ConfirmOption;
-import com.flowci.core.flow.domain.Flow;
+import com.flowci.core.flow.domain.*;
 import com.flowci.core.flow.domain.Flow.Status;
-import com.flowci.core.flow.domain.WebhookStatus;
-import com.flowci.core.flow.domain.Yml;
 import com.flowci.core.flow.event.FlowCreatedEvent;
 import com.flowci.core.flow.event.FlowDeletedEvent;
 import com.flowci.core.flow.event.FlowInitEvent;
@@ -79,22 +78,27 @@ public class FlowServiceImpl implements FlowService {
     @Autowired
     private FileManager fileManager;
 
+    @Autowired
+    private HttpRequestManager httpRequestManager;
+
     @Autowired
     private YmlService ymlService;
 
     @Autowired
     private CronService cronService;
 
+    @Autowired
+    private List<Template> templates;
+
+    @Autowired
+    private AppProperties appProperties;
+
     // ====================================================================
     // %% Public function
     // ====================================================================
 
     @Override
     public List<Flow> list(Status status) {
-        if (sessionManager.get().isAdmin()) {
-            return flowDao.findAll();
-        }
-
         String email = sessionManager.getUserEmail();
         List<String> flowIds = flowUserDao.findAllFlowsByUserEmail(email);
 
@@ -197,9 +201,24 @@ public Flow confirm(String name, ConfirmOption option) {
 
         flow.setStatus(Status.CONFIRMED);
 
+        if (option.hasBlankTemplate()) {
+            return flowDao.save(flow);
+        }
+
+        // load YAML from template
+        if (option.hasTemplateDesc()) {
+            try {
+                String template = loadYmlFromTemplate(option.getTemplateDesc());
+                ymlService.saveYml(flow, Yml.DEFAULT_NAME, template);
+                return flow;
+            } catch (IOException e) {
+                throw new NotFoundException("Unable to load template {0} content", option.getTemplateDesc());
+            }
+        }
+
         // flow instance will be saved in saveYml
         if (option.hasYml()) {
-            ymlService.saveYml(flow, Yml.DEFAULT_NAME, option.getYaml());
+            ymlService.saveYmlFromB64(flow, Yml.DEFAULT_NAME, option.getYaml());
             return flow;
         }
 
@@ -340,4 +359,15 @@ private void setupDefaultVars(Flow flow) {
         Vars<VarValue> localVars = flow.getLocally();
         localVars.put(Variables.Flow.Name, VarValue.of(flow.getName(), VarType.STRING, false));
     }
+
+    private String loadYmlFromTemplate(String desc) throws IOException {
+        for (Template t : templates) {
+            if (t.getDesc().equals(desc)) {
+                String source = t.getSourceWithDomain(appProperties.getResourceDomain());
+                return httpRequestManager.get(source);
+            }
+        }
+
+        throw new NotFoundException("Unable to load template {0} content", desc);
+    }
 }