Merge branch 'master' into bjormel/aws-main-controller

1 files changed, 15 insertions, 25 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index 0300d7e92ff..d902fb7b3c4 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -9,6 +9,7 @@ import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.WireguardKey;
+import com.yahoo.config.provision.WireguardKeyWithTimestamp;
 import com.yahoo.vespa.hosted.node.admin.task.util.file.DiskSize;
 
 import java.net.URI;
@@ -73,9 +74,7 @@ public class NodeSpec {
 
     private final List<TrustStoreItem> trustStore;
 
-    private final Optional<WireguardKey> wireguardPubkey;
-
-    private final Optional<Instant> wireguardKeyTimestamp;
+    private final Optional<WireguardKeyWithTimestamp> wireguardKeyWithTimestamp;
 
     private final boolean wantToRebuild;
 
@@ -112,8 +111,7 @@ public class NodeSpec {
             Optional<URI> archiveUri,
             Optional<ApplicationId> exclusiveTo,
             List<TrustStoreItem> trustStore,
-            Optional<WireguardKey> wireguardPubkey,
-            Optional<Instant> wireguardKeyTimestamp,
+            Optional<WireguardKeyWithTimestamp> wireguardPubkey,
             boolean wantToRebuild) {
 
         if (state == NodeState.active) {
@@ -157,8 +155,7 @@ public class NodeSpec {
         this.archiveUri = Objects.requireNonNull(archiveUri);
         this.exclusiveTo = Objects.requireNonNull(exclusiveTo);
         this.trustStore = Objects.requireNonNull(trustStore);
-        this.wireguardPubkey = Objects.requireNonNull(wireguardPubkey);
-        this.wireguardKeyTimestamp = Objects.requireNonNull(wireguardKeyTimestamp);
+        this.wireguardKeyWithTimestamp = Objects.requireNonNull(wireguardPubkey);
         this.wantToRebuild = wantToRebuild;
     }
 
@@ -313,9 +310,7 @@ public class NodeSpec {
         return trustStore;
     }
 
-    public Optional<WireguardKey> wireguardPubkey() { return wireguardPubkey; }
-
-    public Optional<Instant> wireguardKeyTimestamp() { return wireguardKeyTimestamp; }
+    public Optional<WireguardKeyWithTimestamp> wireguardKeyWithTimestamp() { return wireguardKeyWithTimestamp; }
 
     public boolean wantToRebuild() {
         return wantToRebuild;
@@ -358,8 +353,7 @@ public class NodeSpec {
                 Objects.equals(archiveUri, that.archiveUri) &&
                 Objects.equals(exclusiveTo, that.exclusiveTo) &&
                 Objects.equals(trustStore, that.trustStore) &&
-                Objects.equals(wireguardPubkey, that.wireguardPubkey) &&
-                Objects.equals(wireguardKeyTimestamp, that.wireguardKeyTimestamp) &&
+                Objects.equals(wireguardKeyWithTimestamp, that.wireguardKeyWithTimestamp) &&
                 Objects.equals(wantToRebuild, that.wantToRebuild);
     }
 
@@ -398,8 +392,7 @@ public class NodeSpec {
                 archiveUri,
                 exclusiveTo,
                 trustStore,
-                wireguardPubkey,
-                wireguardKeyTimestamp,
+                wireguardKeyWithTimestamp,
                 wantToRebuild);
     }
 
@@ -438,8 +431,7 @@ public class NodeSpec {
                 + " archiveUri=" + archiveUri
                 + " exclusiveTo=" + exclusiveTo
                 + " trustStore=" + trustStore
-                + " wireguardPubkey=" + wireguardPubkey
-                + " wireguardKeyTimestamp=" + wireguardKeyTimestamp
+                + " wireguardPubkey=" + wireguardKeyWithTimestamp
                 + " wantToRebuild=" + wantToRebuild
                 + " }";
     }
@@ -477,8 +469,7 @@ public class NodeSpec {
         private Optional<URI> archiveUri = Optional.empty();
         private Optional<ApplicationId> exclusiveTo = Optional.empty();
         private List<TrustStoreItem> trustStore = List.of();
-        private Optional<WireguardKey> wireguardPubkey = Optional.empty();
-        private Optional<Instant> wireguardKeyTimestamp = Optional.empty();
+        private Optional<WireguardKeyWithTimestamp> wireguardPubkey = Optional.empty();
         private boolean wantToRebuild = false;
 
         public Builder() {}
@@ -514,8 +505,7 @@ public class NodeSpec {
             node.archiveUri.ifPresent(this::archiveUri);
             node.exclusiveTo.ifPresent(this::exclusiveTo);
             trustStore(node.trustStore);
-            node.wireguardPubkey.ifPresent(this::wireguardPubkey);
-            node.wireguardKeyTimestamp.ifPresent(this::wireguardKeyTimestamp);
+            node.wireguardKeyWithTimestamp.ifPresent(this::wireguardKeyWithTimestamp);
             wantToRebuild(node.wantToRebuild);
         }
 
@@ -704,13 +694,13 @@ public class NodeSpec {
             return this;
         }
 
-        public Builder wireguardPubkey(WireguardKey wireguardPubKey) {
-            this.wireguardPubkey = Optional.of(wireguardPubKey);
+        public Builder wireguardPubkey(WireguardKey wireguardPubkey) {
+            this.wireguardPubkey = Optional.of(new WireguardKeyWithTimestamp(wireguardPubkey, Instant.EPOCH));
             return this;
         }
 
-        public Builder wireguardKeyTimestamp(Instant wireguardKeyTimestamp) {
-            this.wireguardKeyTimestamp = Optional.of(wireguardKeyTimestamp);
+        public Builder wireguardKeyWithTimestamp(WireguardKeyWithTimestamp wireguardPubKey) {
+            this.wireguardPubkey = Optional.of(wireguardPubKey);
             return this;
         }
 
@@ -846,7 +836,7 @@ public class NodeSpec {
                                 wantedFirmwareCheck, currentFirmwareCheck, modelName,
                                 resources, realResources, ipAddresses, additionalIpAddresses,
                                 reports, events, parentHostname, archiveUri, exclusiveTo, trustStore,
-                                wireguardPubkey, wireguardKeyTimestamp, wantToRebuild);
+                                wireguardPubkey, wantToRebuild);
         }