Refactor docker-compose configuration: streamline healthcheck commands and remove unused postgres proxy service

Author: Artuomka

docker-compose.tst.yml

@@ -7,6 +7,7 @@ services:
       - "DATABASE_URL=postgres://postgres:abc123@postgres:5432/postgres"
       - "EXTRA_ARGS=$EXTRA_ARGS"
       - LOG_LEVEL=warn
+      - MICROSERVICE_HOST=
     volumes:
       - ./backend/src/migrations:/app/src/migrations
     depends_on:
@@ -32,9 +33,7 @@ services:
         condition: service_healthy
       test-clickhouse-e2e-testing:
         condition: service_healthy
-      postgres-proxy:
-        condition: service_healthy
-    command: ["/bin/sh", "-c", "yarn test-all $EXTRA_ARGS"]
+    command: [ "/bin/sh", "-c", "yarn test $EXTRA_ARGS" ]
     develop:
       watch:
         - action: rebuild
@@ -50,8 +49,7 @@ services:
       MYSQL_ROOT_PASSWORD: 123
       MYSQL_DATABASE: testDB
     healthcheck:
-      test:
-        ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p123"]
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p123" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -65,7 +63,7 @@ services:
       POSTGRES_PASSWORD: 123
     command: postgres -c 'max_connections=300'
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -80,7 +78,7 @@ services:
     ports:
       - 27017:27017
     healthcheck:
-      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')"]
+      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -96,7 +94,7 @@ services:
     tmpfs:
       - /var/lib/postgresql
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -113,7 +111,10 @@ services:
       test:
         [
           "CMD-SHELL",
-          "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'yNuXf@6T#BgoQ%U6knMp' -C -Q 'SELECT 1' || /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'yNuXf@6T#BgoQ%U6knMp' -Q 'SELECT 1'",
+          "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P
+            'yNuXf@6T#BgoQ%U6knMp' -C -Q 'SELECT 1' ||
+            /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P
+            'yNuXf@6T#BgoQ%U6knMp' -Q 'SELECT 1'",
         ]
       interval: 10s
       timeout: 5s
@@ -127,7 +128,7 @@ services:
     environment:
       ORACLE_PASSWORD: 12345
     healthcheck:
-      test: ["CMD-SHELL", "healthcheck.sh"]
+      test: [ "CMD-SHELL", "healthcheck.sh" ]
       interval: 10s
       timeout: 5s
       retries: 30
@@ -172,9 +173,9 @@ services:
 
   test-redis-e2e-testing:
     image: redis:7.0.11
-    command: ["redis-server", "--requirepass", "SuperSecretRedisPassword"]
+    command: [ "redis-server", "--requirepass", "SuperSecretRedisPassword" ]
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: [ "CMD", "redis-cli", "ping" ]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -202,7 +203,7 @@ services:
     ports:
       - 50000:50000
     healthcheck:
-      test: ["CMD-SHELL", "su - db2inst1 -c 'db2 connect to testdb'"]
+      test: [ "CMD-SHELL", "su - db2inst1 -c 'db2 connect to testdb'" ]
       interval: 30s
       timeout: 30s
       retries: 20
@@ -214,7 +215,7 @@ services:
       - AWS_ACCESS_KEY_ID=SuperSecretAwsAccessKey
       - AWS_SECRET=SuperSecretAwsSecret
     healthcheck:
-      test: ["CMD-SHELL", "curl -s http://localhost:8000 || exit 1"]
+      test: [ "CMD-SHELL", "curl -s http://localhost:8000 || exit 1" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -235,68 +236,7 @@ services:
         soft: 262144
         hard: 262144
     healthcheck:
-      test: ["CMD", "wget", "--spider", "-q", "http://localhost:8123/ping"]
+      test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8123/ping" ]
       interval: 30s
       timeout: 10s
       retries: 3
-
-  # === Postgres Proxy E2E Testing ===
-
-  testPg-proxy-e2e:
-    image: postgres:16
-    environment:
-      POSTGRES_PASSWORD: proxy_test_123
-      POSTGRES_HOST_AUTH_METHOD: md5
-      POSTGRES_INITDB_ARGS: "--auth-host=md5"
-    command: postgres -c 'max_connections=300' -c 'password_encryption=md5'
-    tmpfs:
-      - /var/lib/postgresql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 10s
-
-  proxy-mock-api:
-    build:
-      context: ./test/proxy-mock-api
-    environment:
-      MOCK_API_PORT: 3333
-      PROXY_API_KEY: test-proxy-api-key
-      UPSTREAM_PG_HOST: testPg-proxy-e2e
-      UPSTREAM_PG_PORT: 5432
-      UPSTREAM_PG_DATABASE: postgres
-      UPSTREAM_PG_USERNAME: postgres
-      UPSTREAM_PG_PASSWORD: proxy_test_123
-    depends_on:
-      testPg-proxy-e2e:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider http://localhost:3333/healthz || exit 1"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-      start_period: 5s
-
-  postgres-proxy:
-    build:
-      context: ../postgres-proxy
-    environment:
-      PROXY_LISTEN_ADDR: ":5432"
-      PROXY_HEALTH_ADDR: ":8080"
-      PROXY_BACKEND_API_URL: "http://proxy-mock-api:3333"
-      PROXY_API_KEY: "test-proxy-api-key"
-      PROXY_USAGE_REPORT_INTERVAL: "10s"
-      PROXY_LOG_LEVEL: "debug"
-    depends_on:
-      proxy-mock-api:
-        condition: service_healthy
-      testPg-proxy-e2e:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider http://localhost:8080/healthz || exit 1"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-      start_period: 5s