#277 Removing role deployment via CMA for now

Author: rjrudin

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

@@ -69,7 +69,6 @@ public class AppConfig {
 
     private boolean deployAmpsWithCma = false;
     private boolean deployForestsWithCma = false;
-    private boolean deployRolesWithCma = false;
     private boolean deployPrivilegesWithCma = false;
 
     // Used to construct DatabaseClient instances based on inputs defined in this class
@@ -1263,14 +1262,6 @@ public void setCreateTriggersDatabase(boolean createTriggerDatabase) {
 		this.createTriggersDatabase = createTriggerDatabase;
 	}
 
-	public boolean isDeployRolesWithCma() {
-		return deployRolesWithCma;
-	}
-
-	public void setDeployRolesWithCma(boolean deployRolesWithCma) {
-		this.deployRolesWithCma = deployRolesWithCma;
-	}
-
 	public boolean isDeployPrivilegesWithCma() {
 		return deployPrivilegesWithCma;
 	}

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

@@ -63,11 +63,6 @@ public void initialize() {
 			config.setDeployPrivilegesWithCma(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/security/DeployRolesCommand.java

@@ -3,22 +3,19 @@
 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 implements SupportsCmaCommand {
+public class DeployRolesCommand extends AbstractResourceCommand {
 
 	// Used internally
 	private boolean removeRolesAndPermissionsDuringDeployment = false;
@@ -32,16 +29,6 @@ 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/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -213,7 +213,6 @@ public void allProperties() {
         assertTrue(config.isDeployAmpsWithCma());
 	    assertTrue(config.isDeployForestsWithCma());
 	    assertTrue(config.isDeployPrivilegesWithCma());
-	    assertTrue(config.isDeployRolesWithCma());
 
         assertEquals("prophost", config.getHost());
         assertEquals("propname", config.getName());

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

@@ -57,20 +57,6 @@ 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.