diff options
author | Andreas Eriksen <andreer@verizonmedia.com> | 2020-01-20 13:58:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-20 13:58:24 +0100 |
commit | 5ee42fd430e45766def38d1c0d412781e393f2e2 (patch) | |
tree | 1baaa0ae959954b7963ea8475c193ee9e49659e7 /config-model-api/src | |
parent | 0c2ce7f4e7b50a9513a8239356e2eab381e5d987 (diff) | |
parent | 49c8929ab9523af3e702af0e04b2994e98ac88e7 (diff) |
Merge pull request #11842 from vespa-engine/andreer/endpoint-certificate-refactoring
accept and store json endpoint cert metadata on deploy
Diffstat (limited to 'config-model-api/src')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java | 35 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecrets.java (renamed from config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java) | 8 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 |
3 files changed, 40 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..a1fae9bb148 --- /dev/null +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java @@ -0,0 +1,35 @@ +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; + } + + @Override + public String toString() { + return "EndpointCertificateMetadata{" + + "keyName='" + keyName + '\'' + + ", certName='" + certName + '\'' + + ", version=" + 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 323aa473580..d45c7ce4137 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(); boolean useBucketSpaceMetric(); } |