aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@yahooinc.com>2023-02-09 15:08:17 +0100
committerAndreas Eriksen <andreer@yahooinc.com>2023-02-09 15:08:17 +0100
commit212c818f00d3248b372111f63e582cf23ac49b0b (patch)
tree22cc2dcb99aaa95af9b79b15e7cefbdc44b67d1f
parent78140894d89392f2ccac84b3fd4d23c83b1d1104 (diff)
put wireguardPubkey in node api response
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
index e1c8704b957..945e0730fe6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
@@ -520,7 +520,7 @@ public class NodeRepositoryNode {
", exclusiveToClusterType='" + exclusiveToClusterType + '\'' +
", switchHostname='" + switchHostname + '\'' +
", cloudAccount='" + cloudAccount + '\'' +
- ", wireguardPubKey='" + wireguardPubKey + '\'' +
+ ", wireguardPubKey='" + wireguardPubKey + '\'' +
'}';
}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index d09ff1b84fc..b8a54ef36b2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -190,6 +190,7 @@ class NodesResponse extends SlimeJsonResponse {
if (!node.cloudAccount().isUnspecified()) {
object.setString("cloudAccount", node.cloudAccount().value());
}
+ node.wireguardPubKey().ifPresent(key -> object.setString("wireguardPubkey", key.value()));
}
private Version resolveVersionFlag(StringFlag flag, Node node, Allocation allocation) {