#143 Added tasks for add/remove host, and changed up properties for InitTask and InstallAdminTask to be more consistent

Author: Rob Rudin

src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy

@@ -3,7 +3,9 @@ package com.marklogic.gradle
 import com.marklogic.appdeployer.command.clusters.ModifyLocalClusterCommand
 import com.marklogic.appdeployer.command.databases.DeployOtherDatabasesCommand
 import com.marklogic.appdeployer.command.forests.DeployCustomForestsCommand
+import com.marklogic.gradle.task.cluster.AddHostTask
 import com.marklogic.gradle.task.cluster.ModifyClusterTask
+import com.marklogic.gradle.task.cluster.RemoveHostTask
 import com.marklogic.gradle.task.databases.DeleteCollectionTask
 import com.marklogic.gradle.task.es.GenerateModelArtifactsTask
 import com.marklogic.gradle.task.forests.DeployCustomForestsTask
@@ -153,8 +155,8 @@ class MarkLogicPlugin implements Plugin<Project> {
 		project.task("mlRedeploy", group: deployGroup, dependsOn: ["mlClearModulesDatabase", "mlDeploy"], description: "Clears the modules database and then deploys the application")
 
 		String adminGroup = "ml-gradle Admin"
-		project.task("mlInit", type: InitTask, group: adminGroup, description: "Perform a one-time initialization of a MarkLogic server")
-		project.task("mlInstallAdmin", type: InstallAdminTask, group: adminGroup, description: "Perform a one-time installation of an admin user")
+		project.task("mlInit", type: InitTask, group: adminGroup, description: "Perform a one-time initialization of a MarkLogic server; uses the properties 'mlLicenseKey' and 'mlLicensee'")
+		project.task("mlInstallAdmin", type: InstallAdminTask, group: adminGroup, description: "Perform a one-time installation of an admin user; uses the properties 'mlAdminUsername'/'mlUsername' and 'mlAdminPassword'/'mlPassword'")
 
 		String alertGroup = "ml-gradle Alert"
 		project.task("mlDeleteAllAlertConfigs", type: DeleteAllAlertConfigsTask, group: alertGroup, description: "Delete all alert configs, which also deletes all of the actions rules associated with them")
@@ -166,9 +168,11 @@ class MarkLogicPlugin implements Plugin<Project> {
 		project.task("mlLoadDefaultPipelines", type: LoadDefaultPipelinesTask, group: cpfGroup, description: "Load default pipelines into a triggers database")
 
 		String clusterGroup = "ml-gradle Cluster"
+		project.task("mlAddHost", type: AddHostTask, group: clusterGroup, description: "Add host to the cluster; must define 'host', 'hostGroup' (optional), and 'hostZone' (optional) properties")
 		project.task("mlModifyCluster", type: ModifyClusterTask, group: clusterGroup, description: "Modify the properties of the local cluster based on the ml-config/clusters/local-cluster.json file")
 		project.task("mlDisableSslFips", type: DisableSslFipsTask, group: clusterGroup, description: "Disable SSL FIPS across the cluster")
 		project.task("mlEnableSslFips", type: EnableSslFipsTask, group: clusterGroup, description: "Enable SSL FIPS across the cluster")
+		project.task("mlRemoveHost", type: RemoveHostTask, group: clusterGroup, description: "Remove a host from the cluster; must define 'host' property")
 		project.task("mlRestartCluster", type: RestartClusterTask, group: clusterGroup, description: "Restart the local cluster")
 
 		String dbGroup = "ml-gradle Database"

src/main/groovy/com/marklogic/gradle/task/MarkLogicTask.groovy

@@ -36,6 +36,14 @@ class MarkLogicTask extends DefaultTask {
         getProject().property("mlAdminManager")
     }
 
+    String getAdminUsername() {
+        project.hasProperty("mlAdminUsername") ? project.property("mlAdminUsername") : project.property("mlUsername")
+    }
+
+	String getAdminPassword() {
+		project.hasProperty("mlAdminPassword") ? project.property("mlAdminPassword") : project.property("mlPassword")
+	}
+
     DatabaseClient newClient() {
         getAppConfig().newDatabaseClient()
     }

src/main/groovy/com/marklogic/gradle/task/admin/InitTask.groovy

@@ -11,11 +11,11 @@ class InitTask extends MarkLogicTask {
 
     @TaskAction
     void initializeMarkLogic() {
-		if (project.hasProperty("licenseKey")) {
-			licenseKey = project.property("licenseKey")
+		if (project.hasProperty("mlLicenseKey")) {
+			licenseKey = project.property("mlLicenseKey")
 		}
-		if (project.hasProperty("licensee")) {
-			licensee = project.property("licensee")
+		if (project.hasProperty("mlLicensee")) {
+			licensee = project.property("mlLicensee")
 		}
         getAdminManager().init(licenseKey, licensee)
     }

src/main/groovy/com/marklogic/gradle/task/admin/InstallAdminTask.groovy

@@ -6,17 +6,8 @@ import com.marklogic.gradle.task.MarkLogicTask
 
 class InstallAdminTask extends MarkLogicTask {
 
-    String adminUsername
-    String adminPassword
-
     @TaskAction
     void installAdmin() {
-		if (project.hasProperty("adminUsername")) {
-			adminUsername = project.property("adminUsername")
-		}
-		if (project.hasProperty("adminPassword")) {
-			adminPassword = project.property("adminPassword")
-		}
-        getAdminManager().installAdmin(adminUsername, adminPassword)
+        getAdminManager().installAdmin(getAdminUsername(), getAdminPassword())
     }
 }

src/main/groovy/com/marklogic/gradle/task/cluster/AddHostTask.groovy

@@ -0,0 +1,20 @@
+package com.marklogic.gradle.task.cluster
+
+import com.marklogic.appdeployer.AppConfig
+import com.marklogic.gradle.task.MarkLogicTask
+import com.marklogic.mgmt.clusters.ClusterManager
+import com.marklogic.mgmt.hosts.HostManager
+import org.gradle.api.tasks.TaskAction
+
+class AddHostTask extends MarkLogicTask {
+
+	@TaskAction
+	void addHost() {
+		String host = project.property("host")
+		String group = project.hasProperty("hostGroup") ? project.property("hostGroup") : "Default"
+		String zone = project.hasProperty("hostZone") ? project.property("hostZone") : null
+
+		ClusterManager mgr = new ClusterManager(getManageClient())
+		mgr.addHost(getAdminManager(), host, group, zone)
+	}
+}

src/main/groovy/com/marklogic/gradle/task/cluster/RemoveHostTask.groovy

@@ -0,0 +1,15 @@
+package com.marklogic.gradle.task.cluster
+
+import com.marklogic.gradle.task.MarkLogicTask
+import com.marklogic.mgmt.clusters.ClusterManager
+import org.gradle.api.tasks.TaskAction
+
+class RemoveHostTask extends MarkLogicTask {
+
+	@TaskAction
+	void removeHost() {
+		String host = project.property("host")
+		ClusterManager mgr = new ClusterManager(getManageClient())
+		mgr.removeHost(host)
+	}
+}