accept and store json endpoint cert metadata on deploy

also refactor from tlsSecretKeys -> several "endpoint certificate" classes

3 files changed, 31 insertions, 5 deletions

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
new file mode 100644
index 00000000000..9ed6056f184
--- /dev/null
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java
@@ -0,0 +1,26 @@
+package com.yahoo.config.model.api;
+
+public class EndpointCertificateMetadata {
+
+    private final String keyName;
+    private final String certName;
+    private final int version;
+
+    public EndpointCertificateMetadata(String keyName, String certName, int version) {
+        this.keyName = keyName;
+        this.certName = certName;
+        this.version = version;
+    }
+
+    public String keyName() {
+        return keyName;
+    }
+
+    public String certName() {
+        return certName;
+    }
+
+    public int version() {
+        return version;
+    }
+}
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecrets.java
index 6a8b5a237ab..6fcbac4f422 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecrets.java
@@ -1,17 +1,17 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
-public class TlsSecrets {
-    public static final TlsSecrets MISSING = new TlsSecrets();
+public class EndpointCertificateSecrets {
+    public static final EndpointCertificateSecrets MISSING = new EndpointCertificateSecrets();
 
     private final String certificate;
     private final String key;
 
-    private TlsSecrets() {
+    private EndpointCertificateSecrets() {
         this(null, null);
     }
 
-    public TlsSecrets(String certificate, String key) {
+    public EndpointCertificateSecrets(String certificate, String key) {
         this.certificate = certificate;
         this.key = key;
     }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index a53b0931cc6..b82092c28ee 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -55,7 +55,7 @@ public interface ModelContext {
         default boolean useDedicatedNodeForLogserver() { return true; }
         boolean useAdaptiveDispatch();
         // TODO: Remove temporary default implementation
-        default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); }
+        default Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return Optional.empty(); }
         double defaultTermwiseLimit();
     }