fix var from ui not have top priority

Author: Yang Guo

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

@@ -46,14 +46,8 @@ public CmdId createId(Job job, StepNode node) {
 
     @Override
     public CmdIn createShellCmd(Job job, StepNode node) {
-        // node envs has top priority;
-        Vars<String> inputs = new StringVars()
-                .merge(job.getContext())
-                .merge(node.getEnvironments());
-
-        // create cmd based on plugin
         CmdIn cmd = new CmdIn(createId(job, node).toString(), CmdType.SHELL);
-        cmd.setInputs(inputs);
+        cmd.setInputs(job.getContext()); // yml env was in the job context
         cmd.setFlowId(job.getFlowId()); // default work dir is {agent dir}/{flow id}
         cmd.setDocker(node.getDocker());
 
@@ -69,7 +63,7 @@ public CmdIn createShellCmd(Job job, StepNode node) {
             cmd.setAllowFailure(node.isAllowFailure());
         }
 
-        if (!isDockerEnabled(inputs)) {
+        if (!isDockerEnabled(job.getContext())) {
             cmd.setDocker(null);
         }
 

core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java

@@ -353,7 +353,7 @@ private void setupYaml(Flow flow, String yml, Job job) {
 
         job.setCurrentPath(root.getPathAsString());
         job.setAgentSelector(root.getSelector());
-        job.getContext().merge(root.getEnvironments());
+        job.getContext().merge(root.getEnvironments(), false);
 
         ymlManager.create(flow, job, yml);
         jobDao.save(job);

domain/src/main/java/com/flowci/domain/Vars.java

@@ -61,13 +61,24 @@ public V get(String key, V defaultValue) {
     }
 
     public Vars<V> merge(Vars<V> other) {
+        return merge(other, true);
+    }
+
+    public Vars<V> merge(Vars<V> other, boolean overwrite) {
         if (Objects.isNull(other)) {
             return this;
         }
 
         for (Map.Entry<String, V> entry : other.entrySet()) {
-            put(entry.getKey(), entry.getValue());
+            String key = entry.getKey();
+
+            if (this.containsKey(key) && !overwrite) {
+                continue;
+            }
+
+            put(key, entry.getValue());
         }
+
         return this;
     }