#277 Can now deploy roles via CMA

Author: rjrudin

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

@@ -69,6 +69,7 @@ public class AppConfig {
 
     private boolean deployAmpsWithCma = false;
     private boolean deployForestsWithCma = false;
+    private boolean deployRolesWithCma = false;
 
     // Used to construct DatabaseClient instances based on inputs defined in this class
     private ConfiguredDatabaseClientFactory configuredDatabaseClientFactory = new DefaultConfiguredDatabaseClientFactory();
@@ -1260,4 +1261,12 @@ public boolean isCreateTriggersDatabase() {
 	public void setCreateTriggersDatabase(boolean createTriggerDatabase) {
 		this.createTriggersDatabase = createTriggerDatabase;
 	}
+
+	public boolean isDeployRolesWithCma() {
+		return deployRolesWithCma;
+	}
+
+	public void setDeployRolesWithCma(boolean deployRolesWithCma) {
+		this.deployRolesWithCma = deployRolesWithCma;
+	}
 }

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

@@ -58,6 +58,11 @@ public void initialize() {
 			config.setDeployForestsWithCma(Boolean.parseBoolean(prop));
 		});
 
+		propertyConsumerMap.put("mlDeployRolesWithCma", (config, prop) -> {
+			logger.info("Deploy roles" + cmaMessage + prop);
+			config.setDeployRolesWithCma(Boolean.parseBoolean(prop));
+		});
+
 		/**
 		 * The application name is used as a prefix for default names for a variety of resources, such as REST API servers
 		 * and databases.

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

@@ -132,7 +132,9 @@ protected void deployResourcesViaCma(CommandContext context, File resourceDir) {
 				logger.info("Processing file: " + f.getAbsolutePath());
 			}
 			String payload = readResourceFromFile(null, context, f);
-			((SupportsCmaCommand) this).addResourceToConfiguration(payload, resourceMapper, config);
+			if (payload != null && payload.trim().length() > 0) {
+				((SupportsCmaCommand) this).addResourceToConfiguration(payload, resourceMapper, config);
+			}
 		}
 		new Configurations(config).submit(context.getManageClient());
 	}

src/main/java/com/marklogic/appdeployer/command/security/DeployRolesCommand.java

@@ -3,19 +3,22 @@
 import com.marklogic.appdeployer.command.AbstractResourceCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.appdeployer.command.SupportsCmaCommand;
 import com.marklogic.mgmt.SaveReceipt;
 import com.marklogic.mgmt.api.API;
+import com.marklogic.mgmt.api.configuration.Configuration;
 import com.marklogic.mgmt.api.security.Role;
 import com.marklogic.mgmt.mapper.DefaultResourceMapper;
 import com.marklogic.mgmt.mapper.ResourceMapper;
 import com.marklogic.mgmt.resource.ResourceManager;
 import com.marklogic.mgmt.resource.security.RoleManager;
+import org.springframework.http.ResponseEntity;
 
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 
-public class DeployRolesCommand extends AbstractResourceCommand {
+public class DeployRolesCommand extends AbstractResourceCommand implements SupportsCmaCommand {
 
 	// Used internally
 	private boolean removeRolesAndPermissionsDuringDeployment = false;
@@ -29,6 +32,16 @@ public DeployRolesCommand() {
 		setUndoSortOrder(SortOrderConstants.DELETE_ROLES);
 	}
 
+	@Override
+	public boolean cmaShouldBeUsed(CommandContext context) {
+		return context.getAppConfig().isDeployRolesWithCma();
+	}
+
+	@Override
+	public void addResourceToConfiguration(String payload, ResourceMapper resourceMapper, Configuration configuration) {
+		configuration.addRole(resourceMapper.readResource(payload, Role.class));
+	}
+
 	/**
 	 * The set of roles is processed twice. The first time, the roles are saved without any default permissions or references to other roles.
 	 * This is to avoid issues where the roles refer to each other or to themselves (via default permissions). The second time, the roles are

src/main/java/com/marklogic/mgmt/api/security/Role.java

@@ -50,9 +50,11 @@ public boolean hasPermissionsOrRoles() {
 	public void clearPermissionsAndRoles() {
 		if (role != null) {
 			role.clear();
+			role = null;
 		}
 		if (permission != null) {
 			permission.clear();
+			permission = null;
 		}
 	}
 

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

@@ -110,6 +110,7 @@ public void allProperties() {
 
 	    p.setProperty("mlDeployAmpsWithCma", "true");
 	    p.setProperty("mlDeployForestsWithCma", "true");
+	    p.setProperty("mlDeployRolesWithCma", "true");
 
 	    p.setProperty("mlHost", "prophost");
         p.setProperty("mlAppName", "propname");
@@ -210,6 +211,7 @@ public void allProperties() {
 
         assertTrue(config.isDeployAmpsWithCma());
 	    assertTrue(config.isDeployForestsWithCma());
+	    assertTrue(config.isDeployRolesWithCma());
 
         assertEquals("prophost", config.getHost());
         assertEquals("propname", config.getName());

src/test/java/com/marklogic/appdeployer/command/security/DeployRolesWithDependenciesTest.java

@@ -1,6 +1,8 @@
 package com.marklogic.appdeployer.command.security;
 
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.mgmt.resource.ResourceManager;
 import com.marklogic.mgmt.resource.security.RoleManager;
 import org.junit.Test;
 
@@ -55,6 +57,20 @@ public void testEvenMoreRoles() {
 		}
 	}
 
+	@Test
+	public void testEvenMoreRolesWithCma() {
+		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/even-more-roles-with-dependencies"));
+		appConfig.setDeployRolesWithCma(true);
+
+		initializeAppDeployer(new TestDeployRolesCommand());
+		try {
+			deploySampleApp();
+		} finally {
+			initializeAppDeployer(new DeployRolesCommand());
+			undeploySampleApp();
+		}
+	}
+
 	/**
 	 * This scenario tests that when two roles are next to each other with different dependencies - role1 and role2 -
 	 * that we figure out that role1 has a dependency on a role closest to the end of the current list of files.
@@ -108,3 +124,11 @@ public void twoPhasesDisabled() {
 		}
 	}
 }
+
+class TestDeployRolesCommand extends DeployRolesCommand {
+
+	@Override
+	protected ResourceManager getResourceManager(CommandContext context) {
+		throw new RuntimeException("This should not be called when deploying with CMA");
+	}
+}