diff options
author | gjoranv <gv@verizonmedia.com> | 2023-02-17 19:46:19 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2023-02-17 19:46:19 +0100 |
commit | 5ce35133fd739feb28872ca0382157f6d3f8eda6 (patch) | |
tree | f46d5e3df16ca840c1bd92250b7d69d4b7f691bc | |
parent | b92bb6366deb04b67a80937176e02b7fccce5096 (diff) |
Removed unused classes related to parameter store for wireguard.
5 files changed, 0 insertions, 141 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverParameters.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverParameters.java deleted file mode 100644 index c74ba2b7d6c..00000000000 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverParameters.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yahoo.vespa.hosted.node.admin.wireguard; - -import com.yahoo.config.provision.WireguardKey; -import com.yahoo.slime.Cursor; -import com.yahoo.slime.Slime; -import com.yahoo.slime.SlimeUtils; - -/** - * Wireguard parameters for a configserver. - * - * @author gjoranv - */ -public record ConfigserverParameters(String hostname, String endpoint, WireguardKey publicKey) { - - public static ConfigserverParameters fromJson(String json) { - Slime slime = SlimeUtils.jsonToSlime(json); - Cursor root = slime.get(); - return new ConfigserverParameters( - root.field("hostname").asString(), - root.field("endpoint").asString(), - WireguardKey.from(root.field("publicKey").asString()) - ); - } - - public String toJson() { - Slime slime = new Slime(); - Cursor cursor = slime.setObject(); - cursor.setString("hostname", hostname); - cursor.setString("endpoint", endpoint); - cursor.setString("publicKey", publicKey.value()); - return SlimeUtils.toJson(slime); - } - -} - - diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ParameterStore.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ParameterStore.java deleted file mode 100644 index 4c7ddb23ecc..00000000000 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/ParameterStore.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yahoo.vespa.hosted.node.admin.wireguard; - -import com.yahoo.config.provision.zone.ZoneApi; - -import java.util.List; - -/** - * A cloud-agnostic store of parameters for Wireguard. - * - * @author gjoranv - */ -public interface ParameterStore { - - /** Returns the configservers for the given zone. */ - List<ConfigserverParameters> getConfigservers(ZoneApi zoneApi); - - /** Returns the tenant nodes for the given zone. */ - List<TenantParameters> getTenantNodes(ZoneApi zoneApi); - - void addConfigserver(ConfigserverParameters configserver); - - void addTenantNode(TenantParameters tenant); - - void removeConfigserver(String hostname); - - void removeTenantNode(String hostname); - -} 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 deleted file mode 100644 index e06ffacdf3b..00000000000 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParameters.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yahoo.vespa.hosted.node.admin.wireguard; - -import com.yahoo.config.provision.WireguardKey; -import com.yahoo.slime.Cursor; -import com.yahoo.slime.Slime; -import com.yahoo.slime.SlimeUtils; - -/** - * Wireguard parameters for a tenant host/node. - * - * @author gjoranv - */ -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(), - WireguardKey.from(root.field("publicKey").asString()) - ); - } - - public String toJson() { - Slime slime = new Slime(); - Cursor cursor = slime.setObject(); - cursor.setString("hostname", hostname); - cursor.setString("publicKey", publicKey.value()); - return SlimeUtils.toJson(slime); - } - -} diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverParametersTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverParametersTest.java deleted file mode 100644 index 616590d4993..00000000000 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/ConfigserverParametersTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yahoo.vespa.hosted.node.admin.wireguard; - -import com.yahoo.config.provision.WireguardKey; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author gjoranv - */ -public class ConfigserverParametersTest { - - private static final String dummyKey = "qT+1Kdx7qZZpbqBxHupj7XgmVXSfcXol1RccaSd40XA="; - - @Test - public void parameters_can_be_converted_to_json_and_back() { - ConfigserverParameters params = new ConfigserverParameters("host", "endpoint", - WireguardKey.from(dummyKey)); - ConfigserverParameters params2 = ConfigserverParameters.fromJson(params.toJson()); - assertEquals(params, params2); - } - -} 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 deleted file mode 100644 index b1109ea351c..00000000000 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/wireguard/TenantParametersTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yahoo.vespa.hosted.node.admin.wireguard; - -import com.yahoo.config.provision.WireguardKey; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author gjoranv - */ -public class TenantParametersTest { - - private static final String dummyKey = "qT+1Kdx7qZZpbqBxHupj7XgmVXSfcXol1RccaSd40XA="; - - @Test - public void parameters_can_be_converted_to_json_and_back() { - TenantParameters params = new TenantParameters("host", WireguardKey.from(dummyKey)); - TenantParameters params2 = TenantParameters.fromJson(params.toJson()); - assertEquals(params, params2); - } - -} |