Merge pull request #26096 from vespa-engine/use-node-repo-for-wg

Use node repo for wg

5 files changed, 18 insertions, 20 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java
index 0bac6f09029..11be80de990 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/WireguardResponse.java
@@ -1,13 +1,18 @@
 package com.yahoo.vespa.hosted.provision.restapi;
 
 import com.yahoo.config.provision.NodeType;
+import com.yahoo.config.provision.WireguardKey;
 import com.yahoo.restapi.SlimeJsonResponse;
 import com.yahoo.slime.Cursor;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 
+import java.util.Set;
+
 /**
+ * A response containing the wireguard peer config for each configserver that has a public key.
+ *
  * @author gjoranv
  */
 public class WireguardResponse extends SlimeJsonResponse {
@@ -20,17 +25,18 @@ public class WireguardResponse extends SlimeJsonResponse {
                 .list(Node.State.active)
                 .nodeType(NodeType.config);
 
-        configservers.forEach(
-                configserver -> addConfigserver(cfgArray.addObject(), configserver));
+        configservers.stream()
+                .filter(node -> node.wireguardPubKey().isPresent())
+                .forEach(configserver -> addConfigserver(cfgArray.addObject(),
+                                                         configserver.hostname(),
+                                                         configserver.wireguardPubKey().get(),
+                                                         configserver.ipConfig().primary()));
     }
 
-    private void addConfigserver(Cursor cfgEntry, Node configserver) {
-        cfgEntry.setString("hostname", configserver.hostname());
-
-        configserver.wireguardPubKey().ifPresent(
-                key -> cfgEntry.setString("wireguardPubkey", key.value()));
-
-        NodesResponse.ipAddressesToSlime(configserver.ipConfig().primary(), cfgEntry.setArray("ipAddresses"));
+    private void addConfigserver(Cursor cfgEntry, String hostname, WireguardKey key, Set<String> ipAddresses) {
+        cfgEntry.setString("hostname", hostname);
+        cfgEntry.setString("wireguardPubkey", key.value());
+        NodesResponse.ipAddressesToSlime(ipAddresses, cfgEntry.setArray("ipAddresses"));
     }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
index 3caefcdc69e..66d1568262b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
@@ -110,7 +110,6 @@ public class MockNodeRepository extends NodeRepository {
                           .cloudAccount(defaultCloudAccount).build());
         // Emulate node in tenant account
         nodes.add(Node.create("node3", ipConfig(3), "host3.yahoo.com", resources(0.5, 48, 500, 1, fast, local), NodeType.tenant)
-                          .wireguardPubKey(WireguardKey.from("333344445555666677778888999900001111222211c="))
                           .cloudAccount(tenantAccount).build());
         Node node4 = Node.create("node4", ipConfig(4), "host4.yahoo.com", resources(1, 4, 100, 1, fast, local), NodeType.tenant)
                 .parentHostname("dockerhost1.yahoo.com")
@@ -173,7 +172,7 @@ public class MockNodeRepository extends NodeRepository {
         nodes.add(Node.create("cfg1", ipConfig(201), "cfg1.yahoo.com", flavors.getFlavorOrThrow("default"), NodeType.config)
                           .wireguardPubKey(WireguardKey.from("lololololololololololololololololololololoo=")).build());
         nodes.add(Node.create("cfg2", ipConfig(202), "cfg2.yahoo.com", flavors.getFlavorOrThrow("default"), NodeType.config)
-                          .wireguardPubKey(WireguardKey.from("olololololololololololololololololololololo=")).build());
+                          .build());
 
         // Ready all nodes, except 7 and 55
         nodes = nodes().addNodes(nodes, Agent.system);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json
index c970725d015..3bd45acb856 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json
@@ -116,6 +116,5 @@
     "127.0.202.1",
     "::202:1"
   ],
-  "additionalIpAddresses": [],
-  "wireguardPubkey":"olololololololololololololololololololololo="
+  "additionalIpAddresses": []
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json
index aa45de1f3dd..1c560c2f95b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json
@@ -50,6 +50,5 @@
     "::3:1"
   ],
   "additionalIpAddresses": [],
-  "cloudAccount": "777888999000",
-  "wireguardPubkey":"333344445555666677778888999900001111222211c="
+  "cloudAccount": "777888999000"
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/wireguard.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/wireguard.json
index c2853536c5d..660b92d92ba 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/wireguard.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/wireguard.json
@@ -5,11 +5,6 @@
       "hostname":"cfg1.yahoo.com",
       "wireguardPubkey":"lololololololololololololololololololololoo=",
       "ipAddresses":["127.0.201.1","::201:1"]
-    },
-    {
-      "hostname":"cfg2.yahoo.com",
-      "wireguardPubkey":"olololololololololololololololololololololo=",
-      "ipAddresses":["127.0.202.1","::202:1"]
     }
   ]
 }