fix: add config to disable keystore watcher

https://gravitee.atlassian.net/browse/APIM-305 gravitee-io/issues#8644
gravitee-io · May 25, 2023 · 2e94e9a · 2e94e9a
1 parent 8418ac3
commit 2e94e9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/AbstractVertxHttpServerFactory.java b/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/AbstractVertxHttpServerFactory.java
@@ -113,7 +113,7 @@ protected HttpServerOptions getHttpServerOptions() {
                 .withKeyStoreType(httpServerConfiguration.getKeyStoreType())
                 .withKeyStoreCertificates(httpServerConfiguration.getKeyStoreCertificates())
                 .withKubernetesLocations(httpServerConfiguration.getKeystoreKubernetes())
-                .withWatch(true) // TODO: allow to configure watch (globally, just for keystore, ...) ?
+                .withWatch(httpServerConfiguration.getKeyStoreWatch())
                 .withDefaultAlias(httpServerConfiguration.getKeyStoreDefaultAlias())
                 .build();
 

diff --git a/...ode-vertx/src/main/java/io/gravitee/node/vertx/configuration/HttpServerConfiguration.java b/...ode-vertx/src/main/java/io/gravitee/node/vertx/configuration/HttpServerConfiguration.java
@@ -56,6 +56,7 @@ public class HttpServerConfiguration {
     private final String tlsProtocols;
     private final String keyStorePath;
     private final List<String> keyStoreKubernetes;
+    private final boolean keyStoreWatch;
     private final String keyStoreDefaultAlias;
     private final String keyStorePassword;
     private final String keyStoreType;
@@ -95,6 +96,7 @@ private HttpServerConfiguration(HttpServerConfigurationBuilder builder) {
         this.tlsProtocols = builder.tlsProtocols;
         this.keyStorePath = builder.keyStorePath;
         this.keyStoreKubernetes = builder.keyStoreKubernetes;
+        this.keyStoreWatch = builder.keyStoreWatch;
         this.keyStoreDefaultAlias = builder.keyStoreDefaultAlias;
         this.keyStorePassword = builder.keyStorePassword;
         this.keyStoreType = builder.keyStoreType;
@@ -172,6 +174,10 @@ public List<String> getKeystoreKubernetes() {
         return keyStoreKubernetes;
     }
 
+    public boolean getKeyStoreWatch() {
+        return keyStoreWatch;
+    }
+
     public String getKeyStoreDefaultAlias() {
         return this.keyStoreDefaultAlias;
     }
@@ -291,6 +297,7 @@ public static class HttpServerConfigurationBuilder {
         private String tlsProtocols;
         private String keyStorePath;
         private List<String> keyStoreKubernetes;
+        private boolean keyStoreWatch = true;
         private String keyStoreDefaultAlias;
         private String keyStorePassword;
         private String keyStoreType = CERTIFICATE_FORMAT_JKS;
@@ -403,6 +410,11 @@ public HttpServerConfigurationBuilder withDefaultKeyStoreKubernetes(List<String>
             return this;
         }
 
+        public HttpServerConfigurationBuilder withDefaultKeyStoreWatch(boolean keyStoreWatch) {
+            this.keyStoreWatch = keyStoreWatch;
+            return this;
+        }
+
         public HttpServerConfigurationBuilder withDefaultKeyStorePassword(String keyStorePassword) {
             this.keyStorePassword = keyStorePassword;
             return this;
@@ -623,6 +635,7 @@ public HttpServerConfiguration build() {
             this.keyStorePath = environment.getProperty(prefix + "ssl.keystore.path", keyStorePath);
             this.keyStoreCertificates = getCertificateValues(prefix + "ssl.keystore.certificates");
             this.keyStoreKubernetes = getArrayValues(prefix + "ssl.keystore.kubernetes", this.keyStoreKubernetes);
+            this.keyStoreWatch = environment.getProperty(prefix + "ssl.keystore.watch", Boolean.class, this.keyStoreWatch);
             this.keyStoreDefaultAlias = environment.getProperty(prefix + "ssl.keystore.defaultAlias");
             this.keyStorePassword = environment.getProperty(prefix + "ssl.keystore.password", keyStorePassword);