DHFPROD-1645 Added fix for which databases should have their indexes … (#1690)

* DHFPROD-1645 Added fix for which databases should have their indexes updated

* DHFPROD-1645 Using SimpleAppDeployer so that filename pattern is applied

Author: rjrudin

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/DataHubImpl.java

@@ -506,20 +506,33 @@ public void install(HubDeployStatusListener listener) {
      */
     @Override
     public void updateIndexes() {
-        HubAppDeployer deployer = new HubAppDeployer(getManageClient(), getAdminManager(), null, hubConfig.newStagingClient());
+        SimpleAppDeployer deployer = new SimpleAppDeployer(getManageClient(), getAdminManager());
         deployer.setCommands(buildCommandMap().get("mlDatabaseCommands"));
-        DeployOtherDatabasesCommand c = null;
 
         AppConfig appConfig = hubConfig.getAppConfig();
         final boolean originalCreateForests = appConfig.isCreateForests();
+        final Pattern originalIncludePattern = appConfig.getResourceFilenamesIncludePattern();
         try {
             appConfig.setCreateForests(false);
+            if (hubConfig.getIsProvisionedEnvironment()) {
+                appConfig.setResourceFilenamesIncludePattern(buildPatternForDatabasesToUpdateIndexesFor());
+            }
             deployer.deploy(hubConfig.getAppConfig());
         } finally {
             appConfig.setCreateForests(originalCreateForests);
+            appConfig.setResourceFilenamesIncludePattern(originalIncludePattern);
         }
     }
 
+    /**
+     * In a provisioned environment, only the databases defined by this pattern can be updated.
+     *
+     * @return
+     */
+    protected Pattern buildPatternForDatabasesToUpdateIndexesFor() {
+        return Pattern.compile("(staging|final|job)-database.json");
+    }
+
     /**
      * Uninstalls the data hub configuration and server-side config files from MarkLogic
      */

marklogic-data-hub/src/test/java/com/marklogic/hub/impl/BuildPatternForDatabasesToUpdateIndexesForTest.java

@@ -0,0 +1,28 @@
+package com.marklogic.hub.impl;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class BuildPatternForDatabasesToUpdateIndexesForTest {
+
+    DataHubImpl dataHub = new DataHubImpl();
+
+    @Test
+    public void test() {
+        assertTrue(matches("staging-database.json"));
+        assertTrue(matches("final-database.json"));
+        assertTrue(matches("job-database.json"));
+
+        assertFalse(matches("schema-database.json"));
+        assertFalse(matches("triggers-database.json"));
+        assertFalse(matches("final-schemas-database.json"));
+        assertFalse(matches("final-triggers-database.json"));
+        assertFalse(matches("modules-database.json"));
+        assertFalse(matches("staging-schemas-database.json"));
+        assertFalse(matches("staging-triggers-database.json"));
+    }
+
+    private boolean matches(String filename) {
+        return dataHub.buildPatternForDatabasesToUpdateIndexesFor().matcher(filename).matches();
+    }
+}