remove ports, change container name

ydb-platform · Jan 16, 2024 · 8b941bf · 8b941bf
1 parent f01e0c0
commit 8b941bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/ydb/tests/fq/generic/docker-compose.yml b/ydb/tests/fq/generic/docker-compose.yml
@@ -2,31 +2,26 @@ version: '3.4'
 services:
   postgresql:
     image: "postgres:15-bullseye@sha256:3411b9f2e5239cd7867f34fcf22fe964230f7d447a71d63c283e3593d3f84085"
-    container_name: ydb_tests_fq_generic_postgresql
+    container_name: ${USER}_ydb_tests_fq_generic_postgresql
     environment:
       POSTGRES_DB: db
       POSTGRES_USER: user
       POSTGRES_PASSWORD: password
     volumes:
       - ./postgresql:/docker-entrypoint-initdb.d
-    ports:
-      - '6432'
     command: -p 6432
   clickhouse:
     image: "clickhouse/clickhouse-server:23-alpine@sha256:b078c1cd294632afa2aeba3530e7ba2e568513da23304354f455a25fab575c06"
-    container_name: ydb_tests_fq_generic_clickhouse
+    container_name: ${USER}_ydb_tests_fq_generic_clickhouse
     environment:
       CLICKHOUSE_DB: db
       CLICKHOUSE_USER: user
       CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
       CLICKHOUSE_PASSWORD: password
     volumes:
       - ./clickhouse:/docker-entrypoint-initdb.d
-    ports:
-      - '8123'
-      - '9000'
   connector:
     image: "ghcr.io/ydb-platform/fq-connector-go:v0.1.1-rc.2@sha256:e5c2d86bce9cb43420eed0ed534afe760fb90ad41229dbbf34af28023b219af3"
-    container_name: ydb_tests_fq_generic_fq-connector-go
+    container_name: ${USER}_ydb_tests_fq_generic_connector
     ports:
       - '50051'
diff --git a/ydb/tests/fq/generic/utils/settings.py b/ydb/tests/fq/generic/utils/settings.py
@@ -31,25 +31,18 @@ class TokenAccessorMock:
 
     @dataclass
     class ClickHouse:
-        cluster_name: str
         dbname: str
         username: str
         password: str
-        host: str
-        http_port: int
-        native_port: int
         protocol: str
 
     clickhouse: ClickHouse
 
     @dataclass
     class PostgreSQL:
-        cluster_name: str
         dbname: str
         username: str
         password: Optional[str]
-        host: str
-        port: int
 
     postgresql: PostgreSQL
 
@@ -71,20 +64,13 @@ def from_env(cls) -> 'Settings':
                 hmac_secret_file=environ['TOKEN_ACCESSOR_HMAC_SECRET_FILE'],
             ),
             clickhouse=cls.ClickHouse(
-                cluster_name='clickhouse_integration_test',
                 dbname='db',
-                host='localhost',
-                http_port=endpoint_determiner.get_port('clickhouse', 8123),
-                native_port=endpoint_determiner.get_port('clickhouse', 9000),
                 username='user',
                 password='password',
                 protocol='native',
             ),
             postgresql=cls.PostgreSQL(
-                cluster_name='postgresql_integration_test',
                 dbname='db',
-                host='localhost',
-                port=endpoint_determiner.get_port('postgresql', 6432),
                 username='user',
                 password='password',
             ),

diff --git a/ydb/tests/tools/mdb_mock/__main__.py b/ydb/tests/tools/mdb_mock/__main__.py
@@ -22,7 +22,7 @@ async def clickhouse_handler(request):
             {
                 'hosts': [
                     {
-                        'name': 'ydb_tests_fq_generic_clickhouse',
+                        'name': 'clickhouse',
                         'cluster_id': cluster_id,
                         'health': 'ALIVE',
                         'type': 'CLICKHOUSE'
@@ -41,7 +41,7 @@ async def postgresql_handler(request):
             {
                 'hosts': [
                     {
-                        'name': 'ydb_tests_fq_generic_postgresql',
+                        'name': 'postgresql',
                         'services': [
                             {
                                 'health': 'ALIVE',