diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-06-30 15:05:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-30 15:05:56 +0200 |
commit | aeed17dd90d0da3935c562d9485deb2a00cd4233 (patch) | |
tree | 8c5a92a10a53ffd03983b80c3db851441f9f1c4c /config-model/src/main/java/com/yahoo | |
parent | ce5a1c7de4b006a07c0ec73cab81c90e0eb1a5f0 (diff) | |
parent | 99ef071161f2417a8e7f8a57dc890a66388165b5 (diff) |
Merge pull request #23286 from vespa-engine/andreer/i-will-tell-you-this-only-once
log certificate version in each run
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidator.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidator.java index 338c3a71e44..21025c38c13 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidator.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.application.validation; -import com.yahoo.config.model.api.EndpointCertificateSecrets; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.provision.CertificateNotReadyException; import com.yahoo.vespa.model.VespaModel; @@ -11,9 +10,9 @@ public class EndpointCertificateSecretsValidator extends Validator { /** This check is delayed until validation to allow node provisioning to complete while we are waiting for cert */ @Override public void validate(VespaModel model, DeployState deployState) { - if (deployState.endpointCertificateSecrets().isPresent() && deployState.endpointCertificateSecrets().get() == EndpointCertificateSecrets.MISSING) { - throw new CertificateNotReadyException("TLS enabled, but could not yet retrieve certificate for application " + deployState.getProperties().applicationId().serializedForm()); + if (deployState.endpointCertificateSecrets().isPresent() && deployState.endpointCertificateSecrets().get().isMissing()) { + throw new CertificateNotReadyException("TLS enabled, but could not yet retrieve certificate version %s for application %s" + .formatted(deployState.endpointCertificateSecrets().get().version(), deployState.getProperties().applicationId().serializedForm())); } } - } |