diff options
author | Andreas Eriksen <andreer@pvv.ntnu.no> | 2019-08-27 09:37:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-27 09:37:31 +0200 |
commit | ca5436591223efba44473340f66a937a703fcc87 (patch) | |
tree | dceb7fd1c53887baf290a52ffdc969fa50db01b1 /configserver | |
parent | 6d6431e7544f31e4aa30e5268894b7e89e309ce2 (diff) |
Revert "Revert "provision certificates for directly routed zones""
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java | 8 |
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 */ |