summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorandreer <andreer@verizonmedia.com>2019-08-26 15:34:23 +0200
committerandreer <andreer@verizonmedia.com>2019-08-26 15:34:23 +0200
commit4964218589e531ae4c1681a97d7b096fd0ff18d4 (patch)
tree12500c5620e3481d4f79e5217944240dec695400 /configserver
parent1baf860bedd3b2193799ddd3a4a5b9dc50cb5c6a (diff)
provision certificates for directly routed zones
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
index eaa4916d8fc..78d39ef996b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
@@ -59,17 +59,15 @@ public class TlsSecretsKeys {
}
private Optional<TlsSecrets> readFromSecretStore(Optional<String> secretKeyname) {
- if(secretKeyname.isEmpty()) return Optional.empty();
- TlsSecrets tlsSecretParameters = TlsSecrets.MISSING;
+ if (secretKeyname.isEmpty()) return Optional.empty();
try {
String cert = secretStore.getSecret(secretKeyname.get() + "-cert");
String key = secretStore.getSecret(secretKeyname.get() + "-key");
- tlsSecretParameters = new TlsSecrets(cert, key);
+ return Optional.of(new TlsSecrets(cert, key));
} catch (RuntimeException e) {
// Assume not ready yet
-// log.log(LogLevel.DEBUG, "Could not fetch certificate/key with prefix: " + secretKeyname.get(), e);
+ return Optional.of(TlsSecrets.MISSING);
}
- return Optional.of(tlsSecretParameters);
}
/** Returns a transaction which deletes these tls secrets key if they exist */