diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-11-06 13:23:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-06 13:23:42 +0100 |
commit | 70a18df2765b149600b58a738c73182ed56ac361 (patch) | |
tree | 96882efc13f9beb40a54f886ec9ebf0ba34157d7 | |
parent | 036ec7b3f7a4ff3ff8b4ef7cbeabdfbfc1f72e27 (diff) | |
parent | 71962eec3b86bbb5692326afae25d0c157f2cb3c (diff) |
Merge pull request #29237 from vespa-engine/freva/wg-simplify
Stop using wireguardPubkey
8 files changed, 6 insertions, 29 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java index 19b9fc26fd3..93160bf7689 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java @@ -109,7 +109,6 @@ public class NodePatcher { "reports", "trustStore", "vespaVersion", - "wireguardPubkey", // TODO wg: remove when all nodes use new key+timestamp format "wireguard")); if (!disallowedFields.isEmpty()) { throw new IllegalArgumentException("Patching fields not supported: " + disallowedFields); @@ -279,9 +278,6 @@ public class NodePatcher { // This is where we set the key timestamp. var key = SlimeUtils.optionalString(value.field("key")).map(WireguardKey::new).orElse(null); return node.withWireguardPubkey(new WireguardKeyWithTimestamp(key, clock.instant())); - case "wireguardPubkey": // TODO wg: remove when all nodes use new key+timestamp format - var oldKey = SlimeUtils.optionalString(value).map(WireguardKey::new).orElse(null); - return node.withWireguardPubkey(new WireguardKeyWithTimestamp(oldKey, clock.instant())); default: throw new IllegalArgumentException("Could not apply field '" + name + "' on a node: No such modifiable field"); } 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 73e48d6df55..dd6b0b5a6df 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 @@ -195,12 +195,6 @@ class NodesResponse extends SlimeJsonResponse { object.setString("cloudAccount", node.cloudAccount().value()); } node.wireguardPubKey().ifPresent(key -> toSlime(key, object.setObject("wireguard"))); - - // TODO wg: remove when all nodes have upgraded to new key+timestamp format - node.wireguardPubKey().ifPresent(key -> { - object.setString("wireguardPubkey", key.key().value()); - object.setLong("wireguardKeyTimestamp", key.timestamp().toEpochMilli()); - }); } private Version resolveVersionFlag(StringFlag flag, Node node, Allocation allocation) { 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 3ffcb2f90c0..237d001d23c 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 @@ -44,11 +44,6 @@ public class WireguardResponse extends SlimeJsonResponse { private void addConfigserver(Cursor cfgEntry, String hostname, WireguardKeyWithTimestamp keyWithTimestamp, List<String> ipAddresses) { cfgEntry.setString("hostname", hostname); - - // TODO wg: remove when all nodes are using new key+timestamp format - cfgEntry.setString("wireguardPubkey", keyWithTimestamp.key().value()); - cfgEntry.setLong("wireguardKeyTimestamp", keyWithTimestamp.timestamp().toEpochMilli()); - NodesResponse.ipAddressesToSlime(ipAddresses, cfgEntry.setArray("ipAddresses")); toSlime(keyWithTimestamp, cfgEntry.setObject("wireguard")); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java index 9a7d2252b0e..b18223cceaf 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java @@ -395,11 +395,11 @@ public class NodesV2ApiTest { assertFile(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com"), "node4.json"); tester.assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", - Utf8.toBytes("{\"wireguardPubkey\": \"not a wg key\"}"), Request.Method.PATCH), 400, - "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not set field 'wireguardPubkey': Wireguard key must match '^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw480]=$', but got: 'not a wg key'\"}"); + Utf8.toBytes("{\"wireguard\":{\"key\": \"not a wg key\"}}"), Request.Method.PATCH), 400, + "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not set field 'wireguard': Wireguard key must match '^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw480]=$', but got: 'not a wg key'\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com", - Utf8.toBytes("{\"wireguardPubkey\": \"lololololololololololololololololololololoo=\"}"), Request.Method.PATCH), + Utf8.toBytes("{\"wireguard\":{\"key\": \"lololololololololololololololololololololoo=\"}}"), Request.Method.PATCH), "{\"message\":\"Updated host4.yahoo.com\"}"); assertFile(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com"), "node4-wg.json"); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json index 4a55128e831..6a075a9d34c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json @@ -122,7 +122,5 @@ "wireguard": { "key": "lololololololololololololololololololololoo=", "timestamp": 456 - }, - "wireguardPubkey": "lololololololololololololololololololololoo=", - "wireguardKeyTimestamp": 456 + } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json index 0ddacb1e381..1f2feac748b 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json @@ -120,7 +120,5 @@ "wireguard": { "key": "000011112222333344445555666677778888999900c=", "timestamp": 123 - }, - "wireguardPubkey": "000011112222333344445555666677778888999900c=", - "wireguardKeyTimestamp": 123 + } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json index 20ed276a1c8..f62d2dc34f7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json @@ -121,7 +121,5 @@ "wireguard": { "key": "lololololololololololololololololololololoo=", "timestamp": 123 - }, - "wireguardPubkey": "lololololololololololololololololololololoo=", - "wireguardKeyTimestamp": 123 + } } 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 8e9af7f680f..7477ef01909 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 @@ -2,8 +2,6 @@ "configservers": [ { "hostname": "cfg1.yahoo.com", - "wireguardPubkey": "lololololololololololololololololololololoo=", - "wireguardKeyTimestamp":456, "ipAddresses": ["::201:1"], "wireguard": { "key": "lololololololololololololololololololololoo=", |