Merge pull request #403 from FlowCI/feature/1554

Feature/1554

Author: gy2006

core/src/main/java/com/flowci/core/agent/domain/ShellIn.java

@@ -52,6 +52,8 @@ public enum ShellType {
 
     private Set<String> secrets;
 
+    private Set<String> configs;
+
     public ShellIn() {
         super(Type.SHELL);
     }

core/src/main/java/com/flowci/core/api/OpenRestController.java

@@ -73,7 +73,7 @@ public Secret getSecret(@PathVariable String name) {
 
         if (secret instanceof RSASecret) {
             RSASecret rsa = (RSASecret) secret;
-            rsa.setPublicKey(null);
+            rsa.setPrivateKey(null);
         }
 
         return secret;

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

@@ -18,6 +18,7 @@
 
 import com.flowci.core.common.manager.ConditionManager;
 import com.flowci.core.common.manager.SpringEventManager;
+import com.flowci.core.config.event.GetConfigEvent;
 import com.flowci.core.flow.dao.FlowDao;
 import com.flowci.core.flow.dao.YmlDao;
 import com.flowci.core.flow.domain.Flow;
@@ -51,6 +52,7 @@ public class YmlServiceImpl implements YmlService {
 
     private final List<NodeElementChecker> elementCheckers = ImmutableList.of(
             new ConditionChecker(),
+            new ConfigChecker(),
             new PluginChecker(),
             new SecretChecker()
     );
@@ -206,4 +208,18 @@ public Optional<RuntimeException> apply(NodeTree tree) {
             return Optional.empty();
         }
     }
+
+    private class ConfigChecker implements NodeElementChecker {
+
+        @Override
+        public Optional<RuntimeException> apply(NodeTree tree) {
+            for (String c : tree.getConfigs()) {
+                GetConfigEvent event = eventManager.publish(new GetConfigEvent(this, c));
+                if (event.hasError()) {
+                    return Optional.of(event.getError());
+                }
+            }
+            return Optional.empty();
+        }
+    }
 }

core/src/main/java/com/flowci/core/job/manager/CmdManagerImpl.java

@@ -65,6 +65,7 @@ public ShellIn createShellCmd(Job job, Step step, Node node) {
                 .setTimeout(r.fetchTimeout(job.getTimeout()))
                 .setRetry(r.fetchRetry(0))
                 .setSecrets(r.getSecrets())
+                .setConfigs(r.getConfigs())
                 .setCache(r.getCache());
 
         if (r.hasPlugin()) {

core/src/main/resources/default/smtp-demo-config.yml

@@ -1,5 +1,5 @@
 kind: smtp
-name: sendgrid-demo
+name: sendgrid_demo
 smtp:
   server: smtp.sendgrid.net
   port: 587

tree/src/main/java/com/flowci/tree/NodeTree.java

@@ -29,7 +29,7 @@
 @Getter
 public final class NodeTree {
 
-    private static final int DefaultSize = 20;
+    private static final int DefaultSize = 10;
 
     private static final int DefaultSizeForPrev = 5;
 
@@ -57,6 +57,8 @@ public static NodeTree create(FlowNode root) {
 
     private final Set<String> secrets = new HashSet<>(DefaultSize);
 
+    private final Set<String> configs = new HashSet<>(DefaultSize);
+
     private int maxHeight = 1;
 
     public NodeTree(FlowNode root) {
@@ -207,6 +209,10 @@ private void buildMetaData() {
                 if (r.hasSecrets()) {
                     secrets.addAll(r.getSecrets());
                 }
+
+                if (r.hasConfigs()) {
+                    configs.addAll(r.getConfigs());
+                }
             }
 
             if (node instanceof FlowNode) {

tree/src/main/java/com/flowci/tree/RegularStepNode.java

@@ -57,6 +57,11 @@ public final class RegularStepNode extends Node {
      */
     private Set<String> secrets = new HashSet<>(0);
 
+    /**
+     * Included config name in the step
+     */
+    private Set<String> configs = new HashSet<>(0);
+
     /**
      * Is allow failure
      */
@@ -91,6 +96,11 @@ public boolean hasSecrets() {
         return !secrets.isEmpty();
     }
 
+    @JsonIgnore
+    public boolean hasConfigs() {
+        return !configs.isEmpty();
+    }
+
     @JsonIgnore
     public boolean hasTimeout() {
         return timeout != null;

tree/src/main/java/com/flowci/tree/yml/StepYml.java

@@ -66,6 +66,8 @@ public class StepYml extends YmlBase<RegularStepNode> {
 
     private List<String> secrets = new LinkedList<>();
 
+    private List<String> configs = new LinkedList<>();
+
     /**
      * Only for parallel step, other fields will not valid
      */
@@ -114,6 +116,7 @@ public Node toNode(Node parent, int index) {
         step.setAllowFailure(allow_failure != null && allow_failure);
         step.setEnvironments(getVariableMap());
         step.setSecrets(Sets.newHashSet(secrets));
+        step.setConfigs(Sets.newHashSet(configs));
 
         setCacheToNode(step);
         setDockerToNode(step);