From f013ba6cfa97acf824d24c37d57710ce48c19953 Mon Sep 17 00:00:00 2001
From: bentsileviav <bentsi.leviav@clickhouse.com>
Date: Thu, 26 Mar 2026 17:58:16 +0200
Subject: [PATCH 1/2] algin the RM with the test containers upgrade

---
 .../clickhouse/ClickHouseResourceManager.java | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/it/clickhouse/src/main/java/org/apache/beam/it/clickhouse/ClickHouseResourceManager.java b/it/clickhouse/src/main/java/org/apache/beam/it/clickhouse/ClickHouseResourceManager.java
index 093ed918fb17..f3250877c9b3 100644
--- a/it/clickhouse/src/main/java/org/apache/beam/it/clickhouse/ClickHouseResourceManager.java
+++ b/it/clickhouse/src/main/java/org/apache/beam/it/clickhouse/ClickHouseResourceManager.java
@@ -23,7 +23,6 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -38,7 +37,6 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -61,6 +59,8 @@ public class ClickHouseResourceManager extends TestContainerResourceManager<Gene
   private static final String DEFAULT_CLICKHOUSE_CONTAINER_TAG = "23.8";
 
   private final String jdbcConnectionString;
+  private final String username;
+  private final String password;
 
   final List<String> managedTableNames = new ArrayList<>();
 
@@ -69,16 +69,9 @@ public class ClickHouseResourceManager extends TestContainerResourceManager<Gene
   }
 
   private static ClickHouseContainer buildContainer(Builder builder) {
-    ClickHouseContainer container =
-        new ClickHouseContainer(
-                DockerImageName.parse(builder.containerImageName)
-                    .withTag(builder.containerImageTag))
-            .withStartupAttempts(10);
-
-    Duration startupTimeout = Duration.ofMinutes(2);
-    container.setWaitStrategy(new LogMessageWaitStrategy().withStartupTimeout(startupTimeout));
-
-    return container;
+    return new ClickHouseContainer(
+            DockerImageName.parse(builder.containerImageName).withTag(builder.containerImageTag))
+        .withStartupAttempts(10);
   }
 
   //    @VisibleForTesting
@@ -88,12 +81,18 @@ private static ClickHouseContainer buildContainer(Builder builder) {
       throws SQLException {
     super(container, builder);
 
+    this.username = container.getUsername();
+    this.password = container.getPassword();
     this.jdbcConnectionString =
         "jdbc:clickhouse://"
             + this.getHost()
             + ":"
             + this.getPort(CLICKHOUSE_INTERNAL_PORT)
-            + "/default";
+            + "/default"
+            + "?user="
+            + this.username
+            + "&password="
+            + this.password;
 
     this.connection =
         clickHosueConnection != null ? clickHosueConnection : container.createConnection("");
@@ -126,6 +125,16 @@ public synchronized String getJdbcConnectionString() {
     return jdbcConnectionString;
   }
 
+  /** Returns the username for the ClickHouse service. */
+  public synchronized String getUsername() {
+    return username;
+  }
+
+  /** Returns the password for the ClickHouse service. */
+  public synchronized String getPassword() {
+    return password;
+  }
+
   synchronized boolean tableExists(String tableName) throws SQLException {
 
     ClickHouseUtils.checkValidTableName(tableName);

From c1607f2f14cb8dacc4d23aa1c1d18bccc8b9aa16 Mon Sep 17 00:00:00 2001
From: bentsileviav <bentsi.leviav@clickhouse.com>
Date: Thu, 26 Mar 2026 18:24:30 +0200
Subject: [PATCH 2/2] stub mock values for username password

---
 .../beam/it/clickhouse/ClickHouseResourceManagerTest.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/it/clickhouse/src/test/java/org/apache/beam/it/clickhouse/ClickHouseResourceManagerTest.java b/it/clickhouse/src/test/java/org/apache/beam/it/clickhouse/ClickHouseResourceManagerTest.java
index f0f4dee5761a..75000dd24f66 100644
--- a/it/clickhouse/src/test/java/org/apache/beam/it/clickhouse/ClickHouseResourceManagerTest.java
+++ b/it/clickhouse/src/test/java/org/apache/beam/it/clickhouse/ClickHouseResourceManagerTest.java
@@ -194,11 +194,14 @@ public void testInsertRowsWithInvalidData() {
   public void testGetUriShouldReturnCorrectValue() throws SQLException {
     when(mockContainer.getHost()).thenReturn(HOST);
     when(mockContainer.getMappedPort(CLICKHOUSE_PORT)).thenReturn(MAPPED_PORT);
+    when(mockContainer.getUsername()).thenReturn("test");
+    when(mockContainer.getPassword()).thenReturn("test");
 
     assertThat(
             new ClickHouseResourceManager(
                     mockConnection, mockContainer, ClickHouseResourceManager.builder(TEST_ID))
                 .getJdbcConnectionString())
-        .matches("jdbc:clickhouse://" + HOST + ":" + MAPPED_PORT + "/default");
+        .matches(
+            "jdbc:clickhouse://" + HOST + ":" + MAPPED_PORT + "/default\\?user=test&password=test");
   }
 }