summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authortoby <smorgrav@yahoo-inc.com>2018-04-11 09:20:02 +0200
committertoby <smorgrav@yahoo-inc.com>2018-04-11 09:20:02 +0200
commitcd2e83e88e86903d227f9022e5bb93f9f20c8f59 (patch)
tree579f133ead3f50a8e36bf5a98364a80fc1df7468 /node-repository
parent79ac96bddc0fdd4e39d9bef25af112941c3456d5 (diff)
tokenize arguments to docker exec, simplyfy ports for iptables
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java
index 740e731a2e3..e9b3ea5e726 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeAclResponse.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.hosted.provision.node.NodeAcl;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.List;
import java.util.Set;
/**
@@ -42,17 +43,16 @@ public class NodeAclResponse extends HttpResponse {
.orElseGet(() -> nodeRepository.getConfigNode(hostname)
.orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'")));
+ List<NodeAcl> acls = nodeRepository.getNodeAcls(node, aclsForChildren);
+
Cursor trustedNodesArray = object.setArray("trustedNodes");
- nodeRepository.getNodeAcls(node, aclsForChildren).forEach(nodeAcl -> toSlime(nodeAcl, trustedNodesArray));
+ acls.forEach(nodeAcl -> toSlime(nodeAcl, trustedNodesArray));
Cursor trustedNetworksArray = object.setArray("trustedNetworks");
- nodeRepository.getNodeAcls(node, aclsForChildren).forEach(nodeAcl -> toSlime(nodeAcl.trustedNetworks(),
- nodeAcl.node(),
- trustedNetworksArray));
+ acls.forEach(nodeAcl -> toSlime(nodeAcl.trustedNetworks(), nodeAcl.node(), trustedNetworksArray));
+
Cursor trustedPortsArray = object.setArray("trustedPorts");
- nodeRepository.getNodeAcls(node, aclsForChildren).forEach(nodeAcl -> toSlime(nodeAcl.trustedPorts(),
- nodeAcl,
- trustedPortsArray));
+ acls.forEach(nodeAcl -> toSlime(nodeAcl.trustedPorts(), nodeAcl, trustedPortsArray));
}
private void toSlime(NodeAcl nodeAcl, Cursor array) {