Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ezraroi merged 2 commits into from
Mar 20, 2019
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9fe1f2
get tags from configmanager if node discovery strategy is configuration
Mar 20, 2019
baeac98
get tags from configmanager if node discovery strategy is configuration
Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/peer/codeine/servlets/CommandNodeServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down