Merge pull request #289 from miguelrgonzalez/dev

Support flexrep pull configurations #120

Author: rjrudin

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

@@ -164,6 +164,10 @@ public File getFlexrepConfigsDir() {
 		return new File(getFlexrepDir(), "configs");
 	}
 
+	public File getFlexrepPullsDir() {
+		return new File(getFlexrepDir(), "pulls");
+	}
+
 	public File getGroupsDir() {
 		return new File(baseDir, "groups");
 	}

src/main/java/com/marklogic/appdeployer/command/SortOrderConstants.java

@@ -66,6 +66,7 @@ public abstract class SortOrderConstants {
 
     public static Integer DEPLOY_FLEXREP_CONFIGS = 1000;
     public static Integer DEPLOY_FLEXREP_TARGETS = 1010;
+	public static Integer DEPLOY_FLEXREP_PULLS = 1020;
 
     public static Integer DEPLOY_SQL_VIEWS = 1100;
 

src/main/java/com/marklogic/appdeployer/command/flexrep/DeployConfigsCommand.java

@@ -5,6 +5,7 @@
 import com.marklogic.appdeployer.command.AbstractResourceCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.mgmt.SaveReceipt;
 import com.marklogic.mgmt.resource.ResourceManager;
 import com.marklogic.mgmt.resource.flexrep.ConfigManager;
 
@@ -23,6 +24,8 @@ public DeployConfigsCommand() {
 		setExecuteSortOrder(SortOrderConstants.DEPLOY_FLEXREP_CONFIGS);
 		// Flexrep config is stored in a database, so we don't need to delete it as the database will be deleted
 		setDeleteResourcesOnUndo(false);
+		// We need to refer domains by id at the FlexRep Pulls payload
+		setStoreResourceIdsAsCustomTokens(true);
 	}
 
 	@Override
@@ -41,6 +44,17 @@ protected void deployConfigs(CommandContext context, ConfigDir configDir, String
 		processExecuteOnResourceDir(context, configDir.getFlexrepConfigsDir());
 	}
 
+	@Override
+	protected void storeTokenForResourceId(SaveReceipt receipt, CommandContext context) {
+		String targetId = currentConfigManager.getDomainID(receipt.getResourceId());
+		String key = "%%flexrep-domains-id-" + receipt.getResourceId() + "%%";
+		if (logger.isInfoEnabled()) {
+			logger.info(format("Storing token with key '%s' and value '%s'", key, targetId));
+		}
+
+		context.getAppConfig().getCustomTokens().put(key, targetId);
+	}
+
 	/**
 	 * Not used as we override execute in this command.
 	 *

src/main/java/com/marklogic/appdeployer/command/flexrep/DeployPullsCommand.java

@@ -0,0 +1,48 @@
+package com.marklogic.appdeployer.command.flexrep;
+
+import com.marklogic.appdeployer.AppConfig;
+import com.marklogic.appdeployer.ConfigDir;
+import com.marklogic.appdeployer.command.AbstractResourceCommand;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.mgmt.resource.ResourceManager;
+import com.marklogic.mgmt.resource.flexrep.PullsManager;
+
+import java.io.File;
+
+public class DeployPullsCommand extends AbstractResourceCommand {
+
+	ResourceManager pullsManager;
+
+	public DeployPullsCommand() {
+		setExecuteSortOrder(SortOrderConstants.DEPLOY_FLEXREP_PULLS);
+	}
+
+	@Override
+	protected File[] getResourceDirs(CommandContext context) {
+		return findResourceDirs(context, configDir -> configDir.getFlexrepPullsDir());
+	}
+
+	@Override
+	protected ResourceManager getResourceManager(CommandContext context) {
+		return pullsManager;
+	}
+
+	@Override
+	public void execute(CommandContext context) {
+		AppConfig appConfig = context.getAppConfig();
+		for (ConfigDir configDir : appConfig.getConfigDirs()) {
+			deployFlexRepPulls(context, configDir, appConfig.getContentDatabaseName());
+			for (File dir : configDir.getDatabaseResourceDirectories()) {
+				deployFlexRepPulls(context, new ConfigDir(dir), dir.getName());
+			}
+		}
+	}
+
+	protected void deployFlexRepPulls(CommandContext context, ConfigDir configDir, String databaseIdOrName) {
+		pullsManager = new PullsManager(context.getManageClient(), databaseIdOrName);
+		processExecuteOnResourceDir(context, configDir.getFlexrepPullsDir());
+	}
+
+
+}

src/main/java/com/marklogic/appdeployer/command/flexrep/DeployTargetsCommand.java

@@ -7,9 +7,12 @@
 import com.marklogic.appdeployer.command.AbstractCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.mgmt.ManageClient;
+import com.marklogic.mgmt.SaveReceipt;
 import com.marklogic.mgmt.resource.flexrep.TargetManager;
 
 import java.io.File;
+import java.net.URI;
 
 /**
  * The directory structure for this is a bit different from most command. Since targets belong to a certain flexrep
@@ -20,9 +23,11 @@
 public class DeployTargetsCommand extends AbstractCommand {
 
 	private String targetDirectorySuffix = "-targets";
+	private TargetManager mgr;
 
 	public DeployTargetsCommand() {
 		setExecuteSortOrder(SortOrderConstants.DEPLOY_FLEXREP_TARGETS);
+		setStoreResourceIdsAsCustomTokens(true);
 	}
 
 	@Override
@@ -57,12 +62,23 @@ protected void deployTargetsInDirectory(File dir, CommandContext context, String
 				dir.getAbsolutePath()));
 		}
 
-		TargetManager mgr = new TargetManager(context.getManageClient(), databaseIdOrName, configName);
+		this.mgr = new TargetManager(context.getManageClient(), databaseIdOrName, configName);
 		for (File f : listFilesInDirectory(dir)) {
-			saveResource(mgr, context, f);
+			SaveReceipt receipt = saveResource(mgr, context, f);
 		}
 	}
 
+	@Override
+	protected void storeTokenForResourceId(SaveReceipt receipt, CommandContext context) {
+		String targetId = mgr.getTargetId(receipt.getResourceId());
+		String key = "%%flexrep-targets-id-" + receipt.getResourceId() + "%%";
+		if (logger.isInfoEnabled()) {
+			logger.info(format("Storing token with key '%s' and value '%s'", key, targetId));
+		}
+
+		context.getAppConfig().getCustomTokens().put(key, targetId);
+	}
+
 	protected String extractConfigNameFromDirectory(File dir) {
 		String name = dir.getName();
 		return name.substring(0, name.length() - targetDirectorySuffix.length());

src/main/java/com/marklogic/mgmt/resource/flexrep/ConfigManager.java

@@ -2,6 +2,7 @@
 
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 import com.marklogic.mgmt.ManageClient;
+import com.marklogic.rest.util.Fragment;
 
 public class ConfigManager extends AbstractResourceManager {
 
@@ -47,4 +48,9 @@ public void enableAllFlexrepTargets() {
         }
     }
 
+    public String getDomainID(String configName) {
+	    Fragment f =  getManageClient().getXml(getResourcesPath() +"/" + configName);
+	    return f.getElementValue("/node()/db:id");
+    }
+
 }

src/main/java/com/marklogic/mgmt/resource/flexrep/PullsManager.java

@@ -0,0 +1,23 @@
+package com.marklogic.mgmt.resource.flexrep;
+
+import com.marklogic.mgmt.ManageClient;
+import com.marklogic.mgmt.resource.AbstractResourceManager;
+
+public class PullsManager  extends AbstractResourceManager {
+	private String databaseIdOrName;
+
+	public PullsManager(ManageClient client, String databaseIdOrName) {
+		super(client);
+		this.databaseIdOrName = databaseIdOrName;
+	}
+
+	@Override
+	protected String getIdFieldName() {
+		return "pull-name";
+	}
+
+	@Override
+	public String getResourcesPath() {
+		return format("/manage/v2/databases/%s/flexrep/pulls", databaseIdOrName);
+	}
+}

src/main/java/com/marklogic/mgmt/resource/flexrep/TargetManager.java

@@ -2,6 +2,7 @@
 
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 import com.marklogic.mgmt.ManageClient;
+import com.marklogic.rest.util.Fragment;
 
 public class TargetManager extends AbstractResourceManager {
 
@@ -38,4 +39,9 @@ public void disableTarget(String targetIdOrName) {
     public void enableTarget(String targetIdOrName) {
         getManageClient().putJson(getPropertiesPath(targetIdOrName), "{\"enabled\":true}");
     }
+
+    public String getTargetId(String targetName) {
+		Fragment f =  getManageClient().getXml(getResourcesPath() +"/" + targetName);
+	    return f.getElementValue("/node()/db:id");
+    }
 }

src/test/java/com/marklogic/appdeployer/command/flexrep/DeployFlexrepTest.java

@@ -7,6 +7,7 @@
 import com.marklogic.mgmt.resource.cpf.CpfConfigManager;
 import com.marklogic.mgmt.resource.cpf.DomainManager;
 import com.marklogic.mgmt.resource.cpf.PipelineManager;
+import com.marklogic.mgmt.resource.flexrep.PullsManager;
 import org.junit.After;
 import org.junit.Test;
 
@@ -105,6 +106,34 @@ public void replicaFlexrep() {
         assertFalse(new ServerManager(manageClient).exists("master-flexrep-server"));
     }
 
+	@Test
+	public void flexPull() {
+
+		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/flexrep-config"));
+
+		initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(),
+			new DeployCpfConfigsCommand(), new DeployDomainsCommand(), new DeployPipelinesCommand(),
+			new DeployConfigsCommand(), new DeployTargetsCommand(), new DeployOtherDatabasesCommand(), new DeployPullsCommand());
+
+		appDeployer.deploy(appConfig);
+		assertConfigAndTargetAreDeployed();
+
+		final String pullName = "docs2go";
+		PullsManager pullsMangager = new PullsManager(manageClient, "other-sample-app-content");
+		assertTrue(pullsMangager.exists(pullName));
+
+		// Run deploy again to make sure nothing blows up
+		appDeployer.deploy(appConfig);
+
+		ConfigManager mgr = new ConfigManager(manageClient, appConfig.getContentDatabaseName());
+		mgr.deleteAllConfigs();
+		assertTrue("All of the configs should have been deleted, including their targets", mgr.getAsXml()
+			.getListItemIdRefs().isEmpty());
+
+		undeploySampleApp();
+		assertFalse(new ServerManager(manageClient).exists("master-flexrep-server"));
+	}
+
     private void assertConfigAndTargetAreDeployed() {
         final String domainName = "sample-app-domain-1";
         ConfigManager configMgr = new ConfigManager(manageClient, appConfig.getContentDatabaseName());

src/test/resources/sample-app/flexrep-config/databases/other-sample-app-content/flexrep/pulls/test-pull.json

@@ -0,0 +1,9 @@
+{
+	"pull-name": "docs2go",
+	"domain-id": "%%flexrep-domains-id-sample-app-domain-1%%",
+	"target-id": "%%flexrep-targets-id-sample-app-domain-1-target%%",
+	"enabled": true,
+	"url": [
+		"http://localhost:8076"
+	]
+}