diff options
| author | Valerij Fredriksen <valerijf@vespa.ai> | 2023-11-03 23:45:57 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@vespa.ai> | 2023-11-06 10:59:22 +0100 |
| commit | 71962eec3b86bbb5692326afae25d0c157f2cb3c (patch) | |
| tree | 6ddadae1a0f012a563182f71f7ac363e949ee342 /node-repository/src/test/java/com/yahoo | |
| parent | 40badc9abe05362eb94a163a8fed75627b0a4486 (diff) | |
Stop using wireguardPubkey
Diffstat (limited to 'node-repository/src/test/java/com/yahoo')
5 files changed, 6 insertions, 14 deletions
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=", |