diff options
4 files changed, 4 insertions, 7 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/WireguardKey.java b/config-provisioning/src/main/java/com/yahoo/config/provision/WireguardKey.java index fc452e8b63f..37218a42c70 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/WireguardKey.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/WireguardKey.java @@ -12,7 +12,7 @@ import java.util.regex.Pattern; */ public class WireguardKey extends PatternedStringWrapper<WireguardKey> { - // See https://lists.zx2c4.com/pipermail/wireguard/2020-December/006222.html + // See https://stackoverflow.com/questions/74438436/how-to-validate-a-wireguard-public-key private static final Pattern pattern = Pattern.compile("^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw480]=$"); public WireguardKey(String value) { diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java index 83d3a98d85d..073e4263492 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/ContainerWireguardTask.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; /** - * Ensures that wireguard-go is running on the host. + * Wireguard task for containers. * * @author gjoranv */ diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java index 81bb0064547..e06ffacdf3b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java @@ -10,14 +10,13 @@ import com.yahoo.slime.SlimeUtils; * * @author gjoranv */ -public record TenantParameters(String hostname, String ip, WireguardKey publicKey) { +public record TenantParameters(String hostname, WireguardKey publicKey) { public static TenantParameters fromJson(String json) { Slime slime = SlimeUtils.jsonToSlime(json); Cursor root = slime.get(); return new TenantParameters( root.field("hostname").asString(), - root.field("ip").asString(), WireguardKey.from(root.field("publicKey").asString()) ); } @@ -26,7 +25,6 @@ public record TenantParameters(String hostname, String ip, WireguardKey publicKe Slime slime = new Slime(); Cursor cursor = slime.setObject(); cursor.setString("hostname", hostname); - cursor.setString("ip", ip); cursor.setString("publicKey", publicKey.value()); return SlimeUtils.toJson(slime); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java index c1adce84264..b1109ea351c 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java @@ -14,8 +14,7 @@ public class TenantParametersTest { @Test public void parameters_can_be_converted_to_json_and_back() { - TenantParameters params = new TenantParameters("host", "ip", - WireguardKey.from(dummyKey)); + TenantParameters params = new TenantParameters("host", WireguardKey.from(dummyKey)); TenantParameters params2 = TenantParameters.fromJson(params.toJson()); assertEquals(params, params2); } |