#220 New mlModulesRegex property

Author: rjrudin

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -185,7 +185,9 @@ public class AppConfig {
     // Additional PropertiesSources instance to use for replacing module tokens
     private List<PropertiesSource> moduleTokensPropertiesSources = new ArrayList<>();
 
-    private Map<String, Integer> forestCounts = new HashMap<>();
+	private Pattern moduleFilenamesIncludePattern;
+
+	private Map<String, Integer> forestCounts = new HashMap<>();
 
     // Entity Services properties
     private String modelsPath = "data/entity-services";
@@ -1149,4 +1151,12 @@ public List<ConfigDir> getConfigDirs() {
 	public void setConfigDirs(List<ConfigDir> configDirs) {
 		this.configDirs = configDirs;
 	}
+
+	public Pattern getModuleFilenamesIncludePattern() {
+		return moduleFilenamesIncludePattern;
+	}
+
+	public void setModuleFilenamesIncludePattern(Pattern moduleFilenamesIncludePattern) {
+		this.moduleFilenamesIncludePattern = moduleFilenamesIncludePattern;
+	}
 }

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -518,6 +518,12 @@ public AppConfig newAppConfig() {
 			c.setModuleTimestampsPath(prop);
 		}
 
+		prop = getProperty("mlModulesRegex");
+		if (prop != null) {
+			logger.info("Including module filenames matching regex: " + prop);
+			c.setModuleFilenamesIncludePattern(Pattern.compile(prop));
+		}
+
 		/**
 		 * Whether or not to load asset modules in bulk - i.e. in one transaction. Defaults to true.
 		 */

src/main/java/com/marklogic/appdeployer/command/modules/DefaultModulesLoaderFactory.java

@@ -15,6 +15,7 @@
 
 import java.util.Map;
 import java.util.Properties;
+import java.util.regex.Pattern;
 
 public class DefaultModulesLoaderFactory extends LoggingObject implements ModulesLoaderFactory {
 
@@ -60,6 +61,12 @@ public ModulesLoader newModulesLoader(AppConfig appConfig) {
 		if (appConfig.isStaticCheckAssets()) {
 			modulesLoader.setStaticChecker(newStaticChecker(appConfig));
 		}
+
+		Pattern modulesPattern = appConfig.getModuleFilenamesIncludePattern();
+		if (modulesPattern != null) {
+			modulesLoader.setIncludeFilenamePattern(modulesPattern);
+		}
+
 		return modulesLoader;
 	}
 

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -108,6 +108,7 @@ public void allProperties() {
 	    p.setProperty("mlCreateForests", "false");
 	    p.setProperty("mlForestsPerHost", "some-db,2,other-db,3");
         p.setProperty("mlModulePermissions", "some-perm,read,some-perm,update");
+        p.setProperty("mlModulesRegex", "some-pattern");
         p.setProperty("mlAdditionalBinaryExtensions", ".gradle,.properties");
         p.setProperty("mlConfigPaths", "src/test/resources/sample-app/custom-forests,src/test/resources/sample-app/alert-config");
         p.setProperty("mlSimpleSsl", "true");
@@ -201,6 +202,7 @@ public void allProperties() {
 	    assertEquals(2, (int)forestCounts.get("some-db"));
 	    assertEquals(3, (int)forestCounts.get("other-db"));
         assertEquals("some-perm,read,some-perm,update", config.getModulePermissions());
+        assertEquals("some-pattern", config.getModuleFilenamesIncludePattern().pattern());
         String[] extensions = config.getAdditionalBinaryExtensions();
         assertEquals(".gradle", extensions[0]);
         assertEquals(".properties", extensions[1]);

src/test/java/com/marklogic/appdeployer/command/modules/LoadModulesTest.java

@@ -11,6 +11,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.util.regex.Pattern;
 
 public class LoadModulesTest extends AbstractAppDeployerTest {
 
@@ -160,6 +161,18 @@ public void deleteTestModules() {
 		assertEquals(1, Integer.parseInt(xccTemplate.executeAdhocQuery(xquery)));
 	}
 
+	@Test
+	public void includeModulesPattern() {
+		appConfig.setModuleFilenamesIncludePattern(Pattern.compile(".*/ext.*"));
+
+		initializeAppDeployer(new DeployRestApiServersCommand(true), buildLoadModulesCommand());
+		appDeployer.deploy(appConfig);
+
+		String xquery = "fn:count(cts:uris((), (), cts:true-query()))";
+		assertEquals("Should have the 3 /ext modules plus the REST API properties file, which was loaded when the REST server was created",
+			4, Integer.parseInt(xccTemplate.executeAdhocQuery(xquery)));
+	}
+
 	private void assertModuleExistsWithDefaultPermissions(String message, String uri) {
 		assertEquals(message, "true", xccTemplate.executeAdhocQuery(format("fn:doc-available('%s')", uri)));
 		assertDefaultPermissionsExists(uri);