enable to load resource from diff source

Author: gy2006

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

@@ -52,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;

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/flow/domain/Template.java

@@ -1,6 +1,6 @@
 package com.flowci.core.flow.domain;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,7 +10,7 @@ public final class Template {
 
     private String url;
 
-    @JsonAlias("url_cn")
+    @JsonProperty("url_cn")
     private String urlCn;
 
     private String desc;

core/src/main/java/com/flowci/core/plugin/domain/PluginRepoInfo.java

@@ -16,7 +16,7 @@
 
 package com.flowci.core.plugin.domain;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.flowci.domain.Version;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -34,15 +34,15 @@
 @Getter
 @Setter
 @EqualsAndHashCode(of = {"name"})
-@ToString(of = {"name", "version", "source", "branch"})
+@ToString(of = {"name", "version", "branch"})
 public class PluginRepoInfo implements Serializable {
 
     @Indexed(name = "index_plugins_name", unique = true)
     private String name;
 
     private String source; // git repo url
 
-    @JsonAlias("source_cn")
+    @JsonProperty("source_cn")
     private String sourceCn; // git repo url for cn
 
     private String branch = "master";

core/src/main/java/com/flowci/core/plugin/service/PluginServiceImpl.java

@@ -74,6 +74,9 @@ public class PluginServiceImpl implements PluginService {
     @Autowired
     private Path pluginDir;
 
+    @Autowired
+    private AppProperties appProperties;
+
     @Autowired
     private AppProperties.Plugin pluginProperties;
 
@@ -247,7 +250,17 @@ private Plugin clone(PluginRepoInfo repo) throws Exception {
         log.info("Start to load plugin: {}", repo);
         Path dir = getPluginRepoDir(repo.getName(), repo.getVersion().toString());
 
-        GitClient client = new GitClient(repo.getSource(), null, null);
+        String rd = appProperties.getResourceDomain().toLowerCase();
+        String resource = repo.getSource();
+        if (rd.equals("cn")) {
+            resource = repo.getSourceCn();
+        }
+
+        if (!StringHelper.hasValue(resource)) {
+            throw new NotFoundException("Plugin {0} source is missing for domain {1}", repo.getName(), rd);
+        }
+
+        GitClient client = new GitClient(resource, null, null);
         client.klone(dir, repo.getBranch());
 
         return load(dir.toFile(), repo);

core/src/main/resources/flow.properties

@@ -3,6 +3,7 @@ app.flow-dir=${app.workspace}/flows
 app.site-dir=${app.workspace}/sites-static-resources
 app.secret=${FLOWCI_SECRET:qazWSXedcRFV12#$}
 app.auto-local-agent-host=${FLOWCI_AUTO_AGENT:true}
+app.resource-domain=${FLOWCI_RESOURCE_DOMAIN}
 app.default-smtp-config=true
 app.socket-container=true
 app.core-pool-size=100