Merge pull request #12377 from vespa-engine/andreer/endpoint-certificate-refresh-bugfix

andreer/endpoint certificate refresh bugfix

1 files changed, 12 insertions, 4 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java
index 171c5caa756..53366c9b922 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java
@@ -16,6 +16,7 @@ public class EndpointCertificateMetadata {
     private final String keyName;
     private final String certName;
     private final int version;
+    // TODO: make these fields required once all certs have them stored
     private final Optional<String> request_id;
     private final Optional<List<String>> requestedDnsSans;
     private final Optional<String> issuer;
@@ -24,10 +25,6 @@ public class EndpointCertificateMetadata {
         this(keyName, certName, version, Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    public EndpointCertificateMetadata(String keyName, String certName, int version, String request_id, List<String> requestedDnsSans) {
-        this(keyName, certName, version, Optional.of(request_id), Optional.of(requestedDnsSans), Optional.empty());
-    }
-
     public EndpointCertificateMetadata(String keyName, String certName, int version, Optional<String> request_id, Optional<List<String>> requestedDnsSans, Optional<String> issuer) {
         this.keyName = keyName;
         this.certName = certName;
@@ -61,6 +58,17 @@ public class EndpointCertificateMetadata {
         return issuer;
     }
 
+    public EndpointCertificateMetadata withVersion(int version) {
+        return new EndpointCertificateMetadata(
+                this.keyName,
+                this.certName,
+                version,
+                this.request_id,
+                this.requestedDnsSans,
+                this.issuer
+        );
+    }
+
     @Override
     public String toString() {
         return "EndpointCertificateMetadata{" +