get tags from configmanager if node discovery strategy is configuration (#250)

* get tags from configmanager if node discovery strategy is configuration

* get tags from configmanager if node discovery strategy is configuration

Author: dmarkhas

src/peer/codeine/servlets/CommandNodeServlet.java

@@ -10,6 +10,7 @@
 import codeine.jsons.command.CommandParameterInfo;
 import codeine.jsons.global.ExperimentalConfJsonStore;
 import codeine.jsons.global.GlobalConfigurationJsonStore;
+import codeine.jsons.nodes.NodeDiscoveryStrategy;
 import codeine.jsons.peer_status.PeerStatus;
 import codeine.jsons.project.ProjectJson;
 import codeine.model.Constants;
@@ -26,6 +27,7 @@
 import com.google.common.collect.Maps;
 import java.io.File;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -151,9 +153,8 @@ private void executeInternal(HttpServletRequest request, HttpServletResponse res
             env.put(Constants.EXECUTION_ENV_PROJECT_NAME, commandInfo.project_name());
             env.put(Constants.EXECUTION_ENV_NODE_NAME, commandInfo2.node_name());
             env.put(Constants.EXECUTION_ENV_NODE_ALIAS, commandInfo2.node_alias());
-            env.put(Constants.EXECUTION_ENV_NODE_TAGS, StringUtils.collectionToString(
-                projectStatusUpdater.getTags(commandInfo.project_name(), commandInfo2.node_name()),
-                ";"));
+            env.put(Constants.EXECUTION_ENV_NODE_TAGS,
+                StringUtils.collectionToString(getTags(commandInfo.project_name(), commandInfo2.node_name()),";"));
             env.put(Constants.EXECUTION_ENV_CODEINE_SERVER,
                 globalConfigurationJsonStore.get().web_server_host());
             env.put(Constants.EXECUTION_ENV_CODEINE_SERVER_PORT,
@@ -211,6 +212,21 @@ private Map<String, String> getEnvParams(CommandInfo commandJson) {
         return $;
     }
 
+    private List<String> getTags(String projectName, String nodeName) {
+        List<String> tags = new ArrayList<>();
+        ProjectJson projectJson = configurationManager.getProjectForName(projectName);
+        if (projectJson.node_discovery_startegy().equals(NodeDiscoveryStrategy.Configuration)) {
+            projectJson.nodes_info().stream()
+                .filter(n -> n.name().equals(nodeName))
+                .findFirst()
+                .ifPresent(n -> tags.addAll(n.tags()));
+        }
+        else {
+            tags.addAll(projectStatusUpdater.getTags(projectName, nodeName));
+        }
+        return tags;
+    }
+
     private String encodeIfNeeded(String text, String cred) {
         return null == cred ? text : CredHelper.encode(text);
     }