summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorandreer <andreer@verizonmedia.com>2020-01-30 15:07:59 +0100
committerandreer <andreer@verizonmedia.com>2020-01-30 15:07:59 +0100
commite544725b3de5044ca0b2e8af3c60479ba3216718 (patch)
tree965cc01b70df8b0de463ea299ba7e3229e14de47 /controller-server
parent7b7925115a7177ff5220787d0e1f92fb288a81e3 (diff)
bind flag in constructor
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java
index d715b26a481..8b6c2e3b5b1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java
@@ -9,6 +9,7 @@ import com.yahoo.container.jdisc.secretstore.SecretStore;
import com.yahoo.log.LogLevel;
import com.yahoo.security.SubjectAlternativeName;
import com.yahoo.security.X509CertificateUtils;
+import com.yahoo.vespa.flags.BooleanFlag;
import com.yahoo.vespa.flags.FetchVector;
import com.yahoo.vespa.flags.FlagSource;
import com.yahoo.vespa.flags.Flags;
@@ -51,7 +52,7 @@ public class EndpointCertificateManager {
private final SecretStore secretStore;
private final ApplicationCertificateProvider applicationCertificateProvider;
private final Clock clock;
- private final FlagSource flagSource;
+ private final BooleanFlag useRefreshedEndpointCertificate;
public EndpointCertificateManager(ZoneRegistry zoneRegistry,
CuratorDb curator,
@@ -63,7 +64,7 @@ public class EndpointCertificateManager {
this.secretStore = secretStore;
this.applicationCertificateProvider = applicationCertificateProvider;
this.clock = clock;
- this.flagSource = flagSource;
+ this.useRefreshedEndpointCertificate = Flags.USE_REFRESHED_ENDPOINT_CERTIFICATE.bindTo(flagSource);
}
public Optional<EndpointCertificateMetadata> getEndpointCertificateMetadata(Instance instance, ZoneId zone) {
@@ -76,7 +77,6 @@ public class EndpointCertificateManager {
.orElse(provisionEndpointCertificate(instance));
// If feature flag set for application, look for and use refreshed certificate
- var useRefreshedEndpointCertificate = Flags.USE_REFRESHED_ENDPOINT_CERTIFICATE.bindTo(flagSource);
if (useRefreshedEndpointCertificate.with(FetchVector.Dimension.APPLICATION_ID, instance.id().serializedForm()).value()) {
var latestAvailableVersion = latestVersionInSecretStore(endpointCertificateMetadata);