changing order of operations

Author: timveil

README.md

@@ -48,7 +48,7 @@ The following `environment` variables are supported.  See https://www.cockroachl
 * `COCKROACH_CERTS_DIR` - The path to the certificate directory containing the CA and client certificates and client key.
 * `DATABASE_NAME` - Name of database to create.
 * `DATABASE_USER` - Name of new database user to create.  __Important__, this user will be created as a CockroachDB `admin`.
-* `DATABASE_PASSWORD` - Password for `DATABASE_USER`.
+* `DATABASE_PASSWORD` - Password for `DATABASE_USER`.  If not provided the password will be set to `NULL` preventing the user from using [password based authentication](https://www.cockroachlabs.com/docs/v20.2/create-user.html#prevent-a-user-from-using-password-authentication).
 * `COCKROACH_ORG` - The value of the `cluster.organization` setting.
 * `COCKROACH_LICENSE_KEY` - The value of the `enterprise.license` setting.
 * `COCKROACH_INIT` - Initializes the CockroachDB cluster with the `cockroach init` command.

src/main/java/io/crdb/docker/RemoteClientApplication.java

@@ -83,6 +83,19 @@ public void run(ApplicationArguments args) throws Exception {
 
         handleProcess(new ProcessBuilder("/cockroach", "sql", "--execute", "SET CLUSTER SETTING server.remote_debugging.mode = 'any'"));
 
+        if (StringUtils.hasText(licenseOrg) && StringUtils.hasText(licenseKey)) {
+            List<String> commands = new ArrayList<>();
+            commands.add("/cockroach");
+            commands.add("sql");
+            commands.add("--execute");
+            commands.add(String.format("SET CLUSTER SETTING cluster.organization = '%s'", licenseOrg));
+            commands.add("--execute");
+            commands.add(String.format("SET CLUSTER SETTING enterprise.license = '%s'", licenseKey));
+
+            ProcessBuilder builder = new ProcessBuilder(commands);
+            handleProcess(builder);
+        }
+
         if (StringUtils.hasText(databaseName)) {
             List<String> commands = new ArrayList<>();
             commands.add("/cockroach");
@@ -94,7 +107,6 @@ public void run(ApplicationArguments args) throws Exception {
             handleProcess(builder);
         }
 
-
         if (StringUtils.hasText(databaseName) && StringUtils.hasText(databaseUser)) {
             List<String> commands = new ArrayList<>();
             commands.add("/cockroach");
@@ -116,20 +128,6 @@ public void run(ApplicationArguments args) throws Exception {
             handleProcess(builder);
         }
 
-
-        if (StringUtils.hasText(licenseOrg) && StringUtils.hasText(licenseKey)) {
-            List<String> commands = new ArrayList<>();
-            commands.add("/cockroach");
-            commands.add("sql");
-            commands.add("--execute");
-            commands.add(String.format("SET CLUSTER SETTING cluster.organization = '%s'", licenseOrg));
-            commands.add("--execute");
-            commands.add(String.format("SET CLUSTER SETTING enterprise.license = '%s'", licenseKey));
-
-            ProcessBuilder builder = new ProcessBuilder(commands);
-            handleProcess(builder);
-        }
-
     }
 
     private void handleProcess(ProcessBuilder builder) throws IOException, InterruptedException {