#170 Allow customizing app services username and password

Author: rjrudin

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

@@ -73,6 +73,10 @@ public class AppConfig {
 
     private Integer restPort = DEFAULT_PORT;
     private Integer testRestPort;
+
+    // Username/password combo for using the App Services client REST API - e.g. to load non-REST API modules
+	private String appServicesUsername = DEFAULT_USERNAME;
+	private String appServicesPassword = DEFAULT_PASSWORD;
     private Integer appServicesPort = 8000;
 
     // These can all be set to override the default names that are generated off of the "name" attribute.
@@ -217,13 +221,15 @@ public StaticChecker newStaticChecker() {
 	}
 
 	/**
+	 * In versions 2.8.0 and prior, this used restAdminUsername/Password. instead of appServicesUsername/Password.
+	 *
      * @return an XccAssetLoader based on the configuration properties in this class
      */
     public XccAssetLoader newXccAssetLoader() {
         XccAssetLoader l = new XccAssetLoader();
         l.setHost(getHost());
-        l.setUsername(getRestAdminUsername());
-        l.setPassword(getRestAdminPassword());
+        l.setUsername(getAppServicesUsername());
+        l.setPassword(getAppServicesPassword());
         l.setDatabaseName(getModulesDatabaseName());
         if (getAppServicesPort() != null) {
             l.setPort(getAppServicesPort());
@@ -779,4 +785,20 @@ public Map<String, Object> getAdditionalProperties() {
 	public void setAdditionalProperties(Map<String, Object> additionalProperties) {
 		this.additionalProperties = additionalProperties;
 	}
+
+	public String getAppServicesUsername() {
+		return appServicesUsername;
+	}
+
+	public void setAppServicesUsername(String appServicesUsername) {
+		this.appServicesUsername = appServicesUsername;
+	}
+
+	public String getAppServicesPassword() {
+		return appServicesPassword;
+	}
+
+	public void setAppServicesPassword(String appServicesPassword) {
+		this.appServicesPassword = appServicesPassword;
+	}
 }

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

@@ -121,7 +121,7 @@ public AppConfig newAppConfig() {
 
 		/**
 		 * The username and password for a ML user with the rest-admin role. This user is used for operations against the
-		 * Client REST API - namely, loading modules.
+		 * Client REST API - namely, loading REST API modules such as options, services, and transforms.
 		 */
 		prop = getProperty("mlRestAdminUsername");
 		if (prop != null) {
@@ -138,6 +138,33 @@ public AppConfig newAppConfig() {
 			c.setRestAdminPassword(mlPassword);
 		}
 
+		/**
+		 * The username and password for a ML user with the rest-admin role that is used for e.g. loading
+		 * non-REST API modules via the App Services client REST API, which is defined by the appServicesPort.
+		 *
+		 * Note that this will first default to restAdminUsername and restAdminPassword if those have been set, and if
+		 * not, then username and password.
+		 */
+		prop = getProperty("mlAppServicesUsername");
+		if (prop != null) {
+			logger.info("App Services username: " + prop);
+			c.setAppServicesUsername(prop);
+		} else if (c.getRestAdminUsername() != null) {
+			logger.info("App Services username: " + c.getRestAdminUsername());
+			c.setAppServicesUsername(c.getRestAdminUsername());
+		} else if (mlUsername != null) {
+			logger.info("App Services username: " + mlUsername);
+			c.setAppServicesUsername(mlUsername);
+		}
+		prop = getProperty("mlAppServicesPassword");
+		if (prop != null) {
+			c.setAppServicesPassword(prop);
+		} else if (c.getRestAdminPassword() != null) {
+			c.setAppServicesPassword(c.getRestAdminPassword());
+		} else if (mlPassword != null) {
+			c.setAppServicesPassword(mlPassword);
+		}
+
 		/**
 		 * When a content database is created, this property can be used to control the number of forests per host for
 		 * that database.

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

@@ -38,7 +38,39 @@ public void unrecognizedProperties() {
         assertEquals("Should use default", "admin", config.getRestAdminUsername());
     }
 
-    /**
+    @Test
+    public void appServicesDefaultsToDefaultUsernamePassword() {
+	    sut = new DefaultAppConfigFactory(new SimplePropertySource("mlUsername", "someuser", "mlPassword", "somepassword"));
+	    AppConfig config = sut.newAppConfig();
+	    assertEquals("someuser", config.getRestAdminUsername());
+	    assertEquals("somepassword", config.getRestAdminPassword());
+	    assertEquals("someuser", config.getAppServicesUsername());
+	    assertEquals("somepassword", config.getAppServicesPassword());
+    }
+
+	@Test
+	public void appServicesDefaultsToRestAdminUsernamePassword() {
+		sut = new DefaultAppConfigFactory(new SimplePropertySource("mlRestAdminUsername", "someuser", "mlRestAdminPassword", "somepassword"));
+		AppConfig config = sut.newAppConfig();
+		assertEquals("someuser", config.getRestAdminUsername());
+		assertEquals("somepassword", config.getRestAdminPassword());
+		assertEquals("someuser", config.getAppServicesUsername());
+		assertEquals("somepassword", config.getAppServicesPassword());
+	}
+
+	@Test
+	public void appServicesDiffersFromRestAdmin() {
+		sut = new DefaultAppConfigFactory(new SimplePropertySource(
+			"mlRestAdminUsername", "someuser", "mlRestAdminPassword", "somepassword",
+			"mlAppServicesUsername", "appuser", "mlAppServicesPassword", "appword"));
+		AppConfig config = sut.newAppConfig();
+		assertEquals("someuser", config.getRestAdminUsername());
+		assertEquals("somepassword", config.getRestAdminPassword());
+		assertEquals("appuser", config.getAppServicesUsername());
+		assertEquals("appword", config.getAppServicesPassword());
+	}
+
+	/**
      * As of 2.2.0.
      */
     @Test
@@ -64,6 +96,8 @@ public void allProperties() {
 	    p.setProperty("mlDeleteForests", "false");
         p.setProperty("mlDeleteReplicas", "false");
         p.setProperty("mlGroupName", "other-group");
+        p.setProperty("mlAppServicesUsername", "appServicesUsername");
+        p.setProperty("mlAppServicesPassword", "appServicesPassword");
         p.setProperty("mlAppServicesPort", "8123");
         p.setProperty("mlReplaceTokensInModules", "false");
         p.setProperty("mlUseRoxyTokenPrefix", "false");
@@ -108,6 +142,8 @@ public void allProperties() {
 	    assertFalse(config.isDeleteForests());
         assertFalse(config.isDeleteReplicas());
         assertEquals("other-group", config.getGroupName());
+        assertEquals("appServicesUsername", config.getAppServicesUsername());
+        assertEquals("appServicesPassword", config.getAppServicesPassword());
         assertEquals((Integer) 8123, config.getAppServicesPort());
         assertFalse(config.isReplaceTokensInModules());
         assertFalse(config.isUseRoxyTokenPrefix());