read request_id from cameo response and store in ZK (store SANs too)

1 files changed, 34 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 56a50faa4fa..0aa0df8ae2b 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
@@ -1,11 +1,13 @@
 package com.yahoo.vespa.hosted.controller.api.integration.certificates;
 
+import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * This class is used for metadata about an application's endpoint certificate on the controller.
  * <p>
- * It is a copy of com.yahoo.config.model.api.EndpointCertificateMetadata, but will soon be extended.
+ * It has more properties than com.yahoo.config.model.api.EndpointCertificateMetadata.
  *
  * @author andreer
  */
@@ -14,11 +16,27 @@ public class EndpointCertificateMetadata {
     private final String keyName;
     private final String certName;
     private final int version;
+    private final Optional<String> request_id;
+    private final Optional<List<String>> requestedDnsSans;
 
     public EndpointCertificateMetadata(String keyName, String certName, int version) {
         this.keyName = keyName;
         this.certName = certName;
         this.version = version;
+        this.request_id = Optional.empty();
+        this.requestedDnsSans = Optional.empty();
+    }
+
+    public EndpointCertificateMetadata(String keyName, String certName, int version, Optional<String> request_id, Optional<List<String>> requestedDnsSans) {
+        this.keyName = keyName;
+        this.certName = certName;
+        this.version = version;
+        this.request_id = request_id;
+        this.requestedDnsSans = requestedDnsSans;
+    }
+
+    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));
     }
 
     public String keyName() {
@@ -33,12 +51,22 @@ public class EndpointCertificateMetadata {
         return version;
     }
 
+    public Optional<String> request_id() {
+        return request_id;
+    }
+
+    public Optional<List<String>> requestedDnsSans() {
+        return requestedDnsSans;
+    }
+
     @Override
     public String toString() {
         return "EndpointCertificateMetadata{" +
                 "keyName='" + keyName + '\'' +
                 ", certName='" + certName + '\'' +
                 ", version=" + version +
+                ", request_id=" + request_id +
+                ", requestedDnsSans=" + requestedDnsSans +
                 '}';
     }
 
@@ -48,12 +76,14 @@ public class EndpointCertificateMetadata {
         if (o == null || getClass() != o.getClass()) return false;
         EndpointCertificateMetadata that = (EndpointCertificateMetadata) o;
         return version == that.version &&
-                Objects.equals(keyName, that.keyName) &&
-                Objects.equals(certName, that.certName);
+                keyName.equals(that.keyName) &&
+                certName.equals(that.certName) &&
+                request_id.equals(that.request_id) &&
+                requestedDnsSans.equals(that.requestedDnsSans);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(keyName, certName, version);
+        return Objects.hash(keyName, certName, version, request_id, requestedDnsSans);
     }
 }