Send certificate issuer on deploy

2 files changed, 48 insertions, 4 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 8ebe0069a29..d0173de4f9e 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -1135,6 +1135,24 @@
     ],
     "fields" : [ ]
   },
+  "com.yahoo.config.model.api.EndpointCertificateMetadata$Provider" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods" : [
+      "public static com.yahoo.config.model.api.EndpointCertificateMetadata$Provider[] values()",
+      "public static com.yahoo.config.model.api.EndpointCertificateMetadata$Provider valueOf(java.lang.String)"
+    ],
+    "fields" : [
+      "public static final enum com.yahoo.config.model.api.EndpointCertificateMetadata$Provider digicert",
+      "public static final enum com.yahoo.config.model.api.EndpointCertificateMetadata$Provider globalsign",
+      "public static final enum com.yahoo.config.model.api.EndpointCertificateMetadata$Provider zerossl"
+    ]
+  },
   "com.yahoo.config.model.api.EndpointCertificateMetadata" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
@@ -1142,16 +1160,33 @@
       "public"
     ],
     "methods" : [
-      "public void <init>(java.lang.String, java.lang.String, int)",
+      "public void <init>(java.lang.String, java.lang.String, int, com.yahoo.config.model.api.EndpointCertificateMetadata$Provider)",
       "public java.lang.String keyName()",
       "public java.lang.String certName()",
       "public int version()",
+      "public com.yahoo.config.model.api.EndpointCertificateMetadata$Provider issuer()",
       "public java.lang.String toString()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
     "fields" : [ ]
   },
+  "com.yahoo.config.model.api.EndpointCertificateSecretStore" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
+      "public",
+      "abstract"
+    ],
+    "methods" : [
+      "public void <init>()",
+      "public final com.yahoo.config.model.api.EndpointCertificateSecrets getSecret(com.yahoo.config.model.api.EndpointCertificateMetadata)",
+      "public abstract java.util.Optional getPrivateKey(com.yahoo.config.model.api.EndpointCertificateMetadata)",
+      "public abstract java.util.Optional getCertificate(com.yahoo.config.model.api.EndpointCertificateMetadata)",
+      "public abstract boolean supports(com.yahoo.config.model.api.EndpointCertificateMetadata$Provider)"
+    ],
+    "fields" : [ ]
+  },
   "com.yahoo.config.model.api.EndpointCertificateSecrets" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java
index a4b0159ed4a..591677f6677 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java
@@ -5,14 +5,17 @@ import java.util.Objects;
 
 public class EndpointCertificateMetadata {
 
+    public enum Provider { digicert, globalsign, zerossl }
     private final String keyName;
     private final String certName;
     private final int version;
+    private final Provider issuer;
 
-    public EndpointCertificateMetadata(String keyName, String certName, int version) {
+    public EndpointCertificateMetadata(String keyName, String certName, int version, Provider issuer) {
         this.keyName = keyName;
         this.certName = certName;
         this.version = version;
+        this.issuer = issuer;
     }
 
     public String keyName() {
@@ -27,25 +30,31 @@ public class EndpointCertificateMetadata {
         return version;
     }
 
+    public Provider issuer() {
+        return issuer;
+    }
+
     @Override
     public String toString() {
         return "EndpointCertificateMetadata{" +
                 "keyName='" + keyName + '\'' +
                 ", certName='" + certName + '\'' +
                 ", version=" + version +
+                ", issuer='" + issuer + '\'' +
                 '}';
     }
 
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         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);
+        return version == that.version && Objects.equals(keyName, that.keyName) && Objects.equals(certName, that.certName) && Objects.equals(issuer, that.issuer);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(keyName, certName, version);
+        return Objects.hash(keyName, certName, version, issuer);
     }
 }