[CockroachDB] Support setting username/password/database (#6448)

Author: vcvitaly

modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java

@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -29,12 +30,16 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
 
     private static final int DB_PORT = 26257;
 
+    private static final String FIRST_VERSION_WITH_ENV_VARS_SUPPORT = "22.1.0";
+
     private String databaseName = "postgres";
 
     private String username = "root";
 
     private String password = "";
 
+    private boolean isVersionGreaterThanOrEqualTo221;
+
     /**
      * @deprecated use {@link CockroachContainer(DockerImageName)} instead
      */
@@ -50,6 +55,7 @@ public CockroachContainer(final String dockerImageName) {
     public CockroachContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        isVersionGreaterThanOrEqualTo221 = isVersionGreaterThanOrEqualTo221(dockerImageName);
 
         withExposedPorts(REST_API_PORT, DB_PORT);
         waitingFor(
@@ -104,22 +110,35 @@ public String getTestQueryString() {
 
     @Override
     public CockroachContainer withUsername(String username) {
-        throw new UnsupportedOperationException(
-            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
-        );
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("username");
+        this.username = username;
+        return withEnv("COCKROACH_USER", username);
     }
 
     @Override
     public CockroachContainer withPassword(String password) {
-        throw new UnsupportedOperationException(
-            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
-        );
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("password");
+        this.password = password;
+        return withEnv("COCKROACH_PASSWORD", password).withCommand("start-single-node");
     }
 
     @Override
     public CockroachContainer withDatabaseName(final String databaseName) {
-        throw new UnsupportedOperationException(
-            "The CockroachDB docker image does not currently support this - please see https://github.com/cockroachdb/cockroach/issues/19826"
-        );
+        validateIfVersionSupportsUsernameOrPasswordOrDatabase("databaseName");
+        this.databaseName = databaseName;
+        return withEnv("COCKROACH_DATABASE", databaseName);
+    }
+
+    private boolean isVersionGreaterThanOrEqualTo221(DockerImageName dockerImageName) {
+        ComparableVersion version = new ComparableVersion(dockerImageName.getVersionPart().replaceFirst("v", ""));
+        return version.isGreaterThanOrEqualTo(FIRST_VERSION_WITH_ENV_VARS_SUPPORT);
+    }
+
+    private void validateIfVersionSupportsUsernameOrPasswordOrDatabase(String parameter) {
+        if (!isVersionGreaterThanOrEqualTo221) {
+            throw new UnsupportedOperationException(
+                String.format("Setting a %s in not supported in the versions below 22.1.0", parameter)
+            );
+        }
     }
 }

modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java

@@ -3,5 +3,12 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface CockroachDBTestImages {
-    DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v19.2.11");
+    DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v22.2.3");
+    DockerImageName FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT = DockerImageName.parse(
+        "cockroachdb/cockroach:v22.1.0"
+    );
+
+    DockerImageName COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED = DockerImageName.parse(
+        "cockroachdb/cockroach:v21.2.17"
+    );
 }

modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java

@@ -11,6 +11,7 @@
 import java.util.logging.LogManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
     static {
@@ -54,12 +55,54 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
         try {
             cockroach.start();
             String jdbcUrl = cockroach.getJdbcUrl();
-            assertThat(jdbcUrl).contains("?");
-            assertThat(jdbcUrl).contains("&");
-            assertThat(jdbcUrl).contains("sslmode=disable");
-            assertThat(jdbcUrl).contains("application_name=cockroach");
+            assertThat(jdbcUrl)
+                .contains("?")
+                .contains("&")
+                .contains("sslmode=disable")
+                .contains("application_name=cockroach");
         } finally {
             cockroach.stop();
         }
     }
+
+    @Test
+    public void testWithUsernamePasswordDatabase() throws SQLException {
+        try (
+            CockroachContainer cockroach = new CockroachContainer(
+                CockroachDBTestImages.FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT
+            )
+                .withUsername("test_user")
+                .withPassword("test_password")
+                .withDatabaseName("test_database")
+        ) {
+            cockroach.start();
+
+            ResultSet resultSet = performQuery(cockroach, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+
+            String jdbcUrl = cockroach.getJdbcUrl();
+            assertThat(jdbcUrl).contains("/" + "test_database");
+        }
+    }
+
+    @Test
+    public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
+        CockroachContainer cockroachContainer = new CockroachContainer(
+            CockroachDBTestImages.COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED
+        );
+
+        assertThatThrownBy(() -> cockroachContainer.withUsername("test_user"))
+            .isInstanceOf(UnsupportedOperationException.class)
+            .withFailMessage("Setting a username in not supported in the versions below 22.1.0");
+
+        assertThatThrownBy(() -> cockroachContainer.withPassword("test_password"))
+            .isInstanceOf(UnsupportedOperationException.class)
+            .withFailMessage("Setting a password in not supported in the versions below 22.1.0");
+
+        assertThatThrownBy(() -> cockroachContainer.withDatabaseName("test_database"))
+            .isInstanceOf(UnsupportedOperationException.class)
+            .withFailMessage("Setting a databaseName in not supported in the versions below 22.1.0");
+    }
 }