#323 Can now deploy servers via CMA

rjrudin · rjrudin · commit 6460f4991bd1 · 2019-05-30T16:23:14.000-04:00
diff --git a/src/main/java/com/marklogic/appdeployer/AppConfig.java b/src/main/java/com/marklogic/appdeployer/AppConfig.java
@@ -73,10 +73,7 @@ public class AppConfig {
     private boolean catchDeployExceptions = false;
     private boolean catchUndeployExceptions = false;
 
-    private boolean deployAmpsWithCma = false;
-    private boolean deployDatabasesWithCma = false;
-    private boolean deployForestsWithCma = false;
-    private boolean deployPrivilegesWithCma = false;
+    private CmaConfig cmaConfig = new CmaConfig();
     private boolean mergeResources = true;
 
     private boolean addHostNameTokens = false;
@@ -1260,22 +1257,6 @@ public void setAppServicesTrustManager(X509TrustManager appServicesTrustManager)
 		this.appServicesTrustManager = appServicesTrustManager;
 	}
 
-	public boolean isDeployAmpsWithCma() {
-		return deployAmpsWithCma;
-	}
-
-	public void setDeployAmpsWithCma(boolean deployAmpsWithCma) {
-		this.deployAmpsWithCma = deployAmpsWithCma;
-	}
-
-	public boolean isDeployForestsWithCma() {
-		return deployForestsWithCma;
-	}
-
-	public void setDeployForestsWithCma(boolean deployForestsWithCma) {
-		this.deployForestsWithCma = deployForestsWithCma;
-	}
-
 	@Deprecated
 	public boolean isCreateTriggersDatabase() {
 		return createTriggersDatabase;
@@ -1286,14 +1267,6 @@ public void setCreateTriggersDatabase(boolean createTriggerDatabase) {
 		this.createTriggersDatabase = createTriggerDatabase;
 	}
 
-	public boolean isDeployPrivilegesWithCma() {
-		return deployPrivilegesWithCma;
-	}
-
-	public void setDeployPrivilegesWithCma(boolean deployPrivilegesWithCma) {
-		this.deployPrivilegesWithCma = deployPrivilegesWithCma;
-	}
-
 	public ReplicaBuilderStrategy getReplicaBuilderStrategy() {
 		return replicaBuilderStrategy;
 	}
@@ -1398,11 +1371,11 @@ public void setAppServicesConnectionType(DatabaseClient.ConnectionType appServic
 		this.appServicesConnectionType = appServicesConnectionType;
 	}
 
-	public boolean isDeployDatabasesWithCma() {
-		return deployDatabasesWithCma;
+	public CmaConfig getCmaConfig() {
+		return cmaConfig;
 	}
 
-	public void setDeployDatabasesWithCma(boolean deployDatabasesWithCma) {
-		this.deployDatabasesWithCma = deployDatabasesWithCma;
+	public void setCmaConfig(CmaConfig cmaConfig) {
+		this.cmaConfig = cmaConfig;
 	}
 }
diff --git a/src/main/java/com/marklogic/appdeployer/CmaConfig.java b/src/main/java/com/marklogic/appdeployer/CmaConfig.java
@@ -0,0 +1,50 @@
+package com.marklogic.appdeployer;
+
+public class CmaConfig {
+
+	private boolean deployAmps = false;
+	private boolean deployDatabases = false;
+	private boolean deployForests = false;
+	private boolean deployPrivileges = false;
+	private boolean deployServers = false;
+
+	public boolean isDeployAmps() {
+		return deployAmps;
+	}
+
+	public void setDeployAmps(boolean deployAmps) {
+		this.deployAmps = deployAmps;
+	}
+
+	public boolean isDeployDatabases() {
+		return deployDatabases;
+	}
+
+	public void setDeployDatabases(boolean deployDatabases) {
+		this.deployDatabases = deployDatabases;
+	}
+
+	public boolean isDeployForests() {
+		return deployForests;
+	}
+
+	public void setDeployForests(boolean deployForests) {
+		this.deployForests = deployForests;
+	}
+
+	public boolean isDeployPrivileges() {
+		return deployPrivileges;
+	}
+
+	public void setDeployPrivileges(boolean deployPrivileges) {
+		this.deployPrivileges = deployPrivileges;
+	}
+
+	public boolean isDeployServers() {
+		return deployServers;
+	}
+
+	public void setDeployServers(boolean deployServers) {
+		this.deployServers = deployServers;
+	}
+}
diff --git a/src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java b/src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java
@@ -67,28 +67,34 @@ public void initialize() {
 			logger.info("mlOptimizeWithCma is DEPRECATED; please use a property specific to the resource that you want to deploy with CMA");
 			// mlOptimizeWithCma was deprecated in 3.11; it was only used for deploying forests, so if the
 			// property is still used, the client in theory expects forests to still be deployed with CMA
-			config.setDeployForestsWithCma(true);
+			config.getCmaConfig().setDeployForests(true);
 		});
 
 		final String cmaMessage = " with the Configuration Management API (CMA): ";
+
 		propertyConsumerMap.put("mlDeployAmpsWithCma", (config, prop) -> {
 			logger.info("Deploy amps" + cmaMessage + prop);
-			config.setDeployAmpsWithCma(Boolean.parseBoolean(prop));
+			config.getCmaConfig().setDeployAmps(Boolean.parseBoolean(prop));
 		});
 
 		propertyConsumerMap.put("mlDeployDatabasesWithCma", (config, prop) -> {
 			logger.info("Deploy databases and forests" + cmaMessage + prop);
-			config.setDeployDatabasesWithCma(Boolean.parseBoolean(prop));
+			config.getCmaConfig().setDeployDatabases(Boolean.parseBoolean(prop));
 		});
 
 		propertyConsumerMap.put("mlDeployForestsWithCma", (config, prop) -> {
 			logger.info("Deploy forests" + cmaMessage + prop);
-			config.setDeployForestsWithCma(Boolean.parseBoolean(prop));
+			config.getCmaConfig().setDeployForests(Boolean.parseBoolean(prop));
 		});
 
 		propertyConsumerMap.put("mlDeployPrivilegesWithCma", (config, prop) -> {
 			logger.info("Deploy privileges" + cmaMessage + prop);
-			config.setDeployPrivilegesWithCma(Boolean.parseBoolean(prop));
+			config.getCmaConfig().setDeployPrivileges(Boolean.parseBoolean(prop));
+		});
+
+		propertyConsumerMap.put("mlDeployServersWithCma", (config, prop) -> {
+			logger.info("Deploy servers" + cmaMessage + prop);
+			config.getCmaConfig().setDeployServers(Boolean.parseBoolean(prop));
 		});
 
 		propertyConsumerMap.put("mlAddHostNameTokens", (config, prop) -> {
diff --git a/src/main/java/com/marklogic/appdeployer/command/appservers/DeployOtherServersCommand.java b/src/main/java/com/marklogic/appdeployer/command/appservers/DeployOtherServersCommand.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.marklogic.appdeployer.command.*;
 import com.marklogic.mgmt.PayloadParser;
+import com.marklogic.mgmt.api.configuration.Configuration;
 import com.marklogic.mgmt.api.server.Server;
 import com.marklogic.mgmt.resource.ResourceManager;
 import com.marklogic.mgmt.resource.appservers.ServerManager;
@@ -17,7 +18,7 @@
  * "Other" = non-REST-API servers. This will process every JSON/XML file that's not named "rest-api-server.*" in the
  * servers directory.
  */
-public class DeployOtherServersCommand extends AbstractResourceCommand {
+public class DeployOtherServersCommand extends AbstractResourceCommand implements SupportsCmaCommand {
 
 	/**
 	 * Defines the server names that, by default, this command will never undeploy.
@@ -37,6 +38,16 @@ public DeployOtherServersCommand() {
 		setResourceClassType(Server.class);
 	}
 
+	@Override
+	public boolean cmaShouldBeUsed(CommandContext context) {
+		return context.getAppConfig().getCmaConfig().isDeployServers();
+	}
+
+	@Override
+	public void addResourceToConfiguration(ObjectNode resource, Configuration configuration) {
+		configuration.addServer(resource);
+	}
+
 	protected void initializeDefaultServersToNotUndeploy() {
 		defaultServersToNotUndeploy = new HashSet<>();
 		defaultServersToNotUndeploy.add("Admin");
diff --git a/src/main/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesCommand.java b/src/main/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesCommand.java
@@ -88,7 +88,7 @@ public void execute(CommandContext context) {
 			logger.info("Not sorting databases by dependencies, will sort them by their filenames instead");
 		}
 
-		if (context.getAppConfig().isDeployDatabasesWithCma()) {
+		if (context.getAppConfig().getCmaConfig().isDeployDatabases()) {
 			deployDatabasesAndForestsViaCma(context, databasePlans);
 		}
 
@@ -99,7 +99,7 @@ public void execute(CommandContext context) {
 			});
 
 			// Either create forests in one bulk CMA request, or via a command per database
-			if (context.getAppConfig().isDeployForestsWithCma()) {
+			if (context.getAppConfig().getCmaConfig().isDeployForests()) {
 				deployAllForestsInSingleCmaRequest(context, databasePlans);
 			} else {
 				databasePlans.forEach(databasePlan -> {
@@ -343,7 +343,7 @@ protected void buildDeployDatabaseCommands(CommandContext context, List<Database
 			// Set the payload so the command doesn't try to generate it
 			command.setPayload(databasePlan.getPayload());
 
-			command.setPostponeForestCreation(context.getAppConfig().isDeployForestsWithCma());
+			command.setPostponeForestCreation(context.getAppConfig().getCmaConfig().isDeployForests());
 			databasePlan.setDeployDatabaseCommand(command);
 		});
 	}
diff --git a/src/main/java/com/marklogic/appdeployer/command/forests/DeployForestsCommand.java b/src/main/java/com/marklogic/appdeployer/command/forests/DeployForestsCommand.java
@@ -76,7 +76,7 @@ public void execute(CommandContext context) {
 		// Replicas are currently handled by ConfigureForestReplicasCommand
 		List<Forest> forests = buildForests(context, false);
 
-		if (context.getAppConfig().isDeployForestsWithCma() && !forests.isEmpty() && cmaEndpointExists(context)) {
+		if (context.getAppConfig().getCmaConfig().isDeployForests() && !forests.isEmpty() && cmaEndpointExists(context)) {
 			createForestsViaCma(context, forests);
 		} else {
 			createForestsViaForestEndpoint(context, forests);
diff --git a/src/main/java/com/marklogic/appdeployer/command/security/DeployAmpsCommand.java b/src/main/java/com/marklogic/appdeployer/command/security/DeployAmpsCommand.java
@@ -34,7 +34,7 @@ protected ResourceManager getResourceManager(CommandContext context) {
 
 	@Override
 	public boolean cmaShouldBeUsed(CommandContext context) {
-		return context.getAppConfig().isDeployAmpsWithCma();
+		return context.getAppConfig().getCmaConfig().isDeployAmps();
 	}
 
 	@Override
diff --git a/src/main/java/com/marklogic/appdeployer/command/security/DeployPrivilegesCommand.java b/src/main/java/com/marklogic/appdeployer/command/security/DeployPrivilegesCommand.java
@@ -33,7 +33,7 @@ protected ResourceManager getResourceManager(CommandContext context) {
 
 	@Override
 	public boolean cmaShouldBeUsed(CommandContext context) {
-		return context.getAppConfig().isDeployPrivilegesWithCma();
+		return context.getAppConfig().getCmaConfig().isDeployPrivileges();
 	}
 
 	@Override
diff --git a/src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java b/src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java
@@ -221,7 +221,7 @@ public void mostProperties() {
 		p.setProperty("mlDeployDatabasesWithCma", "true");
 		p.setProperty("mlDeployForestsWithCma", "true");
 		p.setProperty("mlDeployPrivilegesWithCma", "true");
-		p.setProperty("mlDeployRolesWithCma", "true");
+		p.setProperty("mlDeployServersWithCma", "true");
 
 		p.setProperty("mlHost", "prophost");
 		p.setProperty("mlAppName", "propname");
@@ -326,10 +326,11 @@ public void mostProperties() {
 		assertTrue(config.isCatchDeployExceptions());
 		assertTrue(config.isCatchUndeployExceptions());
 
-		assertTrue(config.isDeployAmpsWithCma());
-		assertTrue(config.isDeployDatabasesWithCma());
-		assertTrue(config.isDeployForestsWithCma());
-		assertTrue(config.isDeployPrivilegesWithCma());
+		assertTrue(config.getCmaConfig().isDeployAmps());
+		assertTrue(config.getCmaConfig().isDeployDatabases());
+		assertTrue(config.getCmaConfig().isDeployForests());
+		assertTrue(config.getCmaConfig().isDeployPrivileges());
+		assertTrue(config.getCmaConfig().isDeployServers());
 
 		assertEquals("prophost", config.getHost());
 		assertEquals("propname", config.getName());
diff --git a/src/test/java/com/marklogic/appdeployer/MergeResourcesWhileDeployingTest.java b/src/test/java/com/marklogic/appdeployer/MergeResourcesWhileDeployingTest.java
@@ -108,13 +108,13 @@ public void servers() {
 
 	@Test
 	public void databasesWithoutCma() {
-		appConfig.setDeployDatabasesWithCma(false);
+		appConfig.getCmaConfig().setDeployDatabases(false);
 		deployMultipleDatabasesNeededMergingAndVerify();
 	}
 
 	@Test
 	public void databasesWithCma() {
-		appConfig.setDeployDatabasesWithCma(true);
+		appConfig.getCmaConfig().setDeployDatabases(true);
 		deployMultipleDatabasesNeededMergingAndVerify();
 	}
 
@@ -124,7 +124,7 @@ public void databasesWithCma() {
 	private void deployMultipleDatabasesNeededMergingAndVerify() {
 		appConfig.setContentForestsPerHost(2);
 		appConfig.setTestRestPort(appConfig.getRestPort() + 1);
-		appConfig.setDeployForestsWithCma(true);
+		appConfig.getCmaConfig().setDeployForests(true);
 
 		initializeAppDeployer(new DeployOtherDatabasesCommand());
 		deploySampleApp();
diff --git a/src/test/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesTest.java b/src/test/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesTest.java
@@ -45,7 +45,7 @@ public void test() {
         appConfig.setResourceFilenamesToIgnore("ignored-database.json");
 
         // Speed up this test and ensure that all the forests still get created correctly
-        appConfig.setDeployForestsWithCma(true);
+        appConfig.getCmaConfig().setDeployForests(true);
 
         initializeAppDeployer(new DeployOtherDatabasesCommand());
 
diff --git a/src/test/java/com/marklogic/appdeployer/command/forests/DeployForestsWithCmaTest.java b/src/test/java/com/marklogic/appdeployer/command/forests/DeployForestsWithCmaTest.java
@@ -16,7 +16,7 @@ public class DeployForestsWithCmaTest extends AbstractAppDeployerTest {
 	 */
 	@Test
 	public void test() {
-		appConfig.setDeployForestsWithCma(true);
+		appConfig.getCmaConfig().setDeployForests(true);
 		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/db-only-config"));
 
 		initializeAppDeployer(new DeployOtherDatabasesCommand(6));
diff --git a/src/test/java/com/marklogic/appdeployer/command/security/DeployAmpsWithCmaTest.java b/src/test/java/com/marklogic/appdeployer/command/security/DeployAmpsWithCmaTest.java
@@ -23,7 +23,7 @@ public void test() throws Exception {
 
 		AmpManager mgr = new AmpManager(manageClient);
 
-		appConfig.setDeployAmpsWithCma(true);
+		appConfig.getCmaConfig().setDeployAmps(true);
 		deploySampleApp();
 
 		try {
diff --git a/src/test/java/com/marklogic/appdeployer/command/security/DeployPrivilegesWithCmaTest.java b/src/test/java/com/marklogic/appdeployer/command/security/DeployPrivilegesWithCmaTest.java
@@ -13,7 +13,7 @@ public void test() {
 		initializeAppDeployer(new TestDeployPrivilegesCommand());
 
 		PrivilegeManager mgr = new PrivilegeManager(manageClient);
-		appConfig.setDeployPrivilegesWithCma(true);
+		appConfig.getCmaConfig().setDeployPrivileges(true);
 
 		try {
 			deploySampleApp();
diff --git a/src/test/java/com/marklogic/appdeployer/command/servers/DeployServersWithCmaTest.java b/src/test/java/com/marklogic/appdeployer/command/servers/DeployServersWithCmaTest.java
@@ -0,0 +1,48 @@
+package com.marklogic.appdeployer.command.servers;
+
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.appdeployer.ConfigDir;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.appservers.DeployOtherServersCommand;
+import com.marklogic.mgmt.resource.ResourceManager;
+import com.marklogic.mgmt.resource.appservers.ServerManager;
+import org.junit.After;
+import org.junit.Test;
+
+import java.io.File;
+
+public class DeployServersWithCmaTest extends AbstractAppDeployerTest {
+
+	@After
+	public void teardown() {
+		undeploySampleApp();
+	}
+
+	@Test
+	public void withCma() {
+		appConfig.getCmaConfig().setDeployServers(true);
+		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/other-servers")));
+
+		ServerManager mgr = new ServerManager(manageClient);
+
+		initializeAppDeployer(new TestDeployOtherServersCommand());
+
+		deploySampleApp();
+		assertTrue(mgr.exists("sample-app-odbc"));
+		assertTrue(mgr.exists("sample-app-xdbc"));
+
+		deploySampleApp();
+		assertTrue(mgr.exists("sample-app-odbc"));
+		assertTrue(mgr.exists("sample-app-xdbc"));
+	}
+
+}
+
+class TestDeployOtherServersCommand extends DeployOtherServersCommand {
+
+	@Override
+	protected ResourceManager getResourceManager(CommandContext context) {
+		// This should force an error if CMA isn't used
+		return null;
+	}
+}
diff --git a/src/test/java/com/marklogic/appdeployer/command/servers/ManageOtherServerTest.java b/src/test/java/com/marklogic/appdeployer/command/servers/ManageOtherServerTest.java
@@ -26,7 +26,7 @@ public void updateMainAndRestRestApiServers() {
         }
     }
 
-    @Test
+	@Test
     public void odbcAndXdbcServers() {
         appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/other-servers")));
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected ResourceManager getResourceManager(CommandContext context) {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public boolean cmaShouldBeUsed(CommandContext context) {`
`37`		`- return context.getAppConfig().isDeployAmpsWithCma();`
	`37`	`+ return context.getAppConfig().getCmaConfig().isDeployAmps();`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected ResourceManager getResourceManager(CommandContext context) {`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public boolean cmaShouldBeUsed(CommandContext context) {`
`36`		`- return context.getAppConfig().isDeployPrivilegesWithCma();`
	`36`	`+ return context.getAppConfig().getCmaConfig().isDeployPrivileges();`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`