diff options
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java index 07e93111b6f..2d2feccc114 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java @@ -31,7 +31,7 @@ public class NodeAclResponse extends HttpResponse { super(200); this.nodeRepository = nodeRepository; this.slime = new Slime(); - this.aclsForChildren = request.getBooleanProperty(CHILDREN_REQUEST_PROPERTY); + this.aclsForChildren = request.getBooleanProperty(CHILDREN_REQUEST_PROPERTY); // This is always true? Cursor root = slime.setObject(); String hostname = baseName(request.getUri().getPath()); @@ -42,7 +42,8 @@ public class NodeAclResponse extends HttpResponse { Node node = nodeRepository.getNode(hostname) .orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'")); - List<NodeAcl> acls = nodeRepository.getNodeAcls(node, aclsForChildren); + List<NodeAcl> acls = aclsForChildren ? nodeRepository.getChildAcls(node) : + List.of(node.acl(nodeRepository.list(), nodeRepository.loadBalancers())); Cursor trustedNodesArray = object.setArray("trustedNodes"); acls.forEach(nodeAcl -> toSlime(nodeAcl, trustedNodesArray)); |