From ee27e565485cc98329b163553e15352bf386912f Mon Sep 17 00:00:00 2001
From: Denis Glushkov <amkarovec@gmail.com>
Date: Thu, 27 Feb 2025 20:24:33 +0500
Subject: [PATCH] Tests: updated ClickHouse server versions

---
 docker-compose.test.yaml                           |  4 ++--
 tests/docker/clickhouse01/config.xml               |  5 +++++
 tests/docker/clickhouse01/users.d/default-user.xml | 12 ++++++++++++
 tests/docker/clickhouse01/users.xml                | 10 +---------
 tests/docker/clickhouse02/config.xml               |  5 +++++
 tests/docker/clickhouse02/users.d/default-user.xml | 12 ++++++++++++
 tests/docker/clickhouse02/users.xml                | 10 +---------
 7 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 tests/docker/clickhouse01/users.d/default-user.xml
 create mode 100644 tests/docker/clickhouse02/users.d/default-user.xml

diff --git a/docker-compose.test.yaml b/docker-compose.test.yaml
index c64f185..eaaf33f 100644
--- a/docker-compose.test.yaml
+++ b/docker-compose.test.yaml
@@ -10,7 +10,7 @@ services:
       - ./:/src
 
   clickhouse01:
-    image: yandex/clickhouse-server
+    image: clickhouse/clickhouse-server:24.8
     ports:
       - "18123:8123"
     depends_on:
@@ -19,7 +19,7 @@ services:
       - ./tests/docker/clickhouse01:/etc/clickhouse-server
 
   clickhouse02:
-    image: yandex/clickhouse-server
+    image: clickhouse/clickhouse-server:24.8
     ports:
       - "18124:8123"
     depends_on:
diff --git a/tests/docker/clickhouse01/config.xml b/tests/docker/clickhouse01/config.xml
index b3b0657..95125b8 100644
--- a/tests/docker/clickhouse01/config.xml
+++ b/tests/docker/clickhouse01/config.xml
@@ -67,4 +67,9 @@
     </distributed_ddl>
 
     <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+    </user_directories>
 </company>
\ No newline at end of file
diff --git a/tests/docker/clickhouse01/users.d/default-user.xml b/tests/docker/clickhouse01/users.d/default-user.xml
new file mode 100644
index 0000000..dddc8b8
--- /dev/null
+++ b/tests/docker/clickhouse01/users.d/default-user.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+  <!-- Docs: <https://clickhouse.com/docs/en/operations/settings/settings_users/> -->
+  <users>
+    <default>
+      <!-- User default is available only locally -->
+      <networks>
+        <ip>::1</ip>
+        <ip>127.0.0.1</ip>
+      </networks>
+    </default>
+  </users>
+</clickhouse>
diff --git a/tests/docker/clickhouse01/users.xml b/tests/docker/clickhouse01/users.xml
index 6d5ad46..84f5cfd 100644
--- a/tests/docker/clickhouse01/users.xml
+++ b/tests/docker/clickhouse01/users.xml
@@ -11,21 +11,13 @@
 
     <users>
         <default>
-            <password></password>
+            <password/>
             <profile>default</profile>
             <networks>
                 <ip>::/0</ip>
             </networks>
             <quota>default</quota>
         </default>
-        <admin>
-            <password>123</password>
-            <profile>default</profile>
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-            <quota>default</quota>
-        </admin>
     </users>
 
     <quotas>
diff --git a/tests/docker/clickhouse02/config.xml b/tests/docker/clickhouse02/config.xml
index bd9aeff..773e934 100644
--- a/tests/docker/clickhouse02/config.xml
+++ b/tests/docker/clickhouse02/config.xml
@@ -67,4 +67,9 @@
     </distributed_ddl>
 
     <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+    </user_directories>
 </company>
\ No newline at end of file
diff --git a/tests/docker/clickhouse02/users.d/default-user.xml b/tests/docker/clickhouse02/users.d/default-user.xml
new file mode 100644
index 0000000..dddc8b8
--- /dev/null
+++ b/tests/docker/clickhouse02/users.d/default-user.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+  <!-- Docs: <https://clickhouse.com/docs/en/operations/settings/settings_users/> -->
+  <users>
+    <default>
+      <!-- User default is available only locally -->
+      <networks>
+        <ip>::1</ip>
+        <ip>127.0.0.1</ip>
+      </networks>
+    </default>
+  </users>
+</clickhouse>
diff --git a/tests/docker/clickhouse02/users.xml b/tests/docker/clickhouse02/users.xml
index 6d5ad46..84f5cfd 100644
--- a/tests/docker/clickhouse02/users.xml
+++ b/tests/docker/clickhouse02/users.xml
@@ -11,21 +11,13 @@
 
     <users>
         <default>
-            <password></password>
+            <password/>
             <profile>default</profile>
             <networks>
                 <ip>::/0</ip>
             </networks>
             <quota>default</quota>
         </default>
-        <admin>
-            <password>123</password>
-            <profile>default</profile>
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-            <quota>default</quota>
-        </admin>
     </users>
 
     <quotas>