re-add tlsSecrets to configmodel for compatability

3 files changed, 70 insertions, 1 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 3c1c6d87ea4..0f5a5e6271d 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -758,6 +758,37 @@
     ],
     "fields": []
   },
+  "com.yahoo.config.model.api.EndpointCertificateMetadata": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.lang.String, int)",
+      "public java.lang.String keyName()",
+      "public java.lang.String certName()",
+      "public int version()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.config.model.api.EndpointCertificateSecrets": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.lang.String)",
+      "public java.lang.String certificate()",
+      "public java.lang.String key()",
+      "public boolean isMissing()"
+    ],
+    "fields": [
+      "public static final com.yahoo.config.model.api.EndpointCertificateSecrets MISSING"
+    ]
+  },
   "com.yahoo.config.model.api.FileDistribution": {
     "superClass": "java.lang.Object",
     "interfaces": [],
@@ -846,6 +877,7 @@
       "public boolean useDedicatedNodeForLogserver()",
       "public abstract boolean useAdaptiveDispatch()",
       "public java.util.Optional tlsSecrets()",
+      "public java.util.Optional endpointCertificateSecrets()",
       "public abstract double defaultTermwiseLimit()",
       "public abstract boolean useBucketSpaceMetric()"
     ],
@@ -1003,6 +1035,7 @@
     ],
     "methods": [
       "public void <init>(java.lang.String, java.lang.String)",
+      "public void <init>(com.yahoo.config.model.api.EndpointCertificateSecrets)",
       "public java.lang.String certificate()",
       "public java.lang.String key()",
       "public boolean isMissing()"
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 d45c7ce4137..81ac02a5400 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
@@ -54,7 +54,8 @@ public interface ModelContext {
         // TODO: Remove when Vespa 7.112 is the oldest config model in use
         default boolean useDedicatedNodeForLogserver() { return true; }
         boolean useAdaptiveDispatch();
-        // TODO: Remove temporary default implementation
+        // TODO: Remove temporary default implementations
+        default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); }
         default Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return Optional.empty(); }
         double defaultTermwiseLimit();
         boolean useBucketSpaceMetric();
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/TlsSecrets.java
new file mode 100644
index 00000000000..0937b8b77ec
--- /dev/null
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java
@@ -0,0 +1,35 @@
+// 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();
+
+    private final String certificate;
+    private final String key;
+
+    private TlsSecrets() {
+        this(null, null);
+    }
+
+    public TlsSecrets(String certificate, String key) {
+        this.certificate = certificate;
+        this.key = key;
+    }
+
+    public TlsSecrets(EndpointCertificateSecrets endpointCertificateSecrets) {
+        this.certificate = endpointCertificateSecrets.certificate();
+        this.key = endpointCertificateSecrets.key();
+    }
+
+    public String certificate() {
+        return certificate;
+    }
+
+    public String key() {
+        return key;
+    }
+
+    public boolean isMissing() {
+        return this == MISSING;
+    }
+}