Merge pull request #5007 from poikilotherm/5006-enhance-secretdir

FISH-788 Support sub-directories for MPCONFIG SecretDirConfigSource. #5006
payara · Jan 28, 2021 · ef826d7 · ef826d7
2 parents 63d9d4f + 45d7a33
commit ef826d7
Show file tree

Hide file tree

Showing 7 changed files with 948 additions and 353 deletions.
diff --git a/...service/src/main/java/fish/payara/nucleus/microprofile/config/source/DirConfigSource.java b/...service/src/main/java/fish/payara/nucleus/microprofile/config/source/DirConfigSource.java
diff --git a/...vice/src/main/java/fish/payara/nucleus/microprofile/config/source/PayaraConfigSource.java b/...vice/src/main/java/fish/payara/nucleus/microprofile/config/source/PayaraConfigSource.java
@@ -67,4 +67,12 @@ public PayaraConfigSource() {
         configService = null;
     }
 
+    /**
+     * Should only be used for test purposes
+     * @param configService Usually a mocked implementation
+     */
+    PayaraConfigSource(ConfigProviderResolverImpl configService) {
+        this.domainConfiguration = null;
+        this.configService = configService;
+    }
 }
diff --git a/.../src/main/java/fish/payara/nucleus/microprofile/config/source/SecretsDirConfigSource.java b/.../src/main/java/fish/payara/nucleus/microprofile/config/source/SecretsDirConfigSource.java
diff --git a/...src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigProviderResolverImpl.java b/...src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigProviderResolverImpl.java
@@ -63,6 +63,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import fish.payara.nucleus.executorservice.PayaraExecutorService;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.spi.ConfigBuilder;
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
@@ -104,7 +105,7 @@
 import fish.payara.nucleus.microprofile.config.source.PayaraExpressionConfigSource;
 import fish.payara.nucleus.microprofile.config.source.PayaraServerProperties;
 import fish.payara.nucleus.microprofile.config.source.PropertiesConfigSource;
-import fish.payara.nucleus.microprofile.config.source.SecretsDirConfigSource;
+import fish.payara.nucleus.microprofile.config.source.DirConfigSource;
 import fish.payara.nucleus.microprofile.config.source.ServerConfigSource;
 import fish.payara.nucleus.microprofile.config.source.SystemPropertyConfigSource;
 import fish.payara.nucleus.microprofile.config.source.extension.ExtensionConfigSourceService;
@@ -135,6 +136,10 @@ public class ConfigProviderResolverImpl extends ConfigProviderResolver implement
 
     @Inject
     private ServerContext context;
+
+    // Some sources might want to execute background tasks in a controlled fashion
+    @Inject
+    private PayaraExecutorService executorService;
 
     // Gives access to deployed applications
     @Inject
@@ -297,6 +302,10 @@ public ConfigBuilder getBuilder() {
         return new PayaraConfigBuilder(this);
     }
 
+    public PayaraExecutorService getExecutor() {
+        return this.executorService;
+    }
+
     Config getNamedConfig(String applicationName) {
         Config result = null;
         ApplicationInfo info = applicationRegistry.get(applicationName);
@@ -322,7 +331,7 @@ private List<ConfigSource> getDefaultSources(String appName, String moduleName)
         sources.add(new SystemPropertyConfigSource());
         sources.add(new JNDIConfigSource());
         sources.add(new PayaraServerProperties());
-        sources.add(new SecretsDirConfigSource());
+        sources.add(new DirConfigSource());
         sources.add(new PasswordAliasConfigSource());
         sources.add(new JDBCConfigSource());
         if (appName != null) {