From ca1d52489f2a32237d266fe0d85dbdb5f99a27b9 Mon Sep 17 00:00:00 2001
From: Oleksii Sholik <oleksii@sholik.dev>
Date: Tue, 21 May 2024 09:32:04 +0300
Subject: [PATCH] wip

---
 e2e/common.mk                                 | 13 ++++++++++-
 e2e/services_templates.yaml                   |  1 +
 ...s_desriptive_errors_for_known_failures.lux | 23 +++++++++++++++++--
 e2e/tests/_shared.luxinc                      | 13 +++++++----
 e2e/tests/compose.yaml                        | 17 ++++++++++++++
 5 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/e2e/common.mk b/e2e/common.mk
index 23efaeedf7..4e444d0baa 100644
--- a/e2e/common.mk
+++ b/e2e/common.mk
@@ -66,11 +66,22 @@ log_dev_env:
 	docker compose -f ${DOCKER_COMPOSE_FILE} logs --no-color --follow pg_1
 
 start_electric_%:
-	${ENV} docker compose -f ${DOCKER_COMPOSE_FILE} up --no-color --no-log-prefix electric_$*
+	docker compose -f ${DOCKER_COMPOSE_FILE} up --no-color --no-log-prefix --abort-on-container-exit electric_$*
 
 stop_electric_%:
 	docker compose -f ${DOCKER_COMPOSE_FILE} stop electric_$*
 
+run_electric_%:
+	docker run --rm \
+	-e LOG_LEVEL=debug \
+	-e AUTH_JWT_ALG=HS256 \
+	-e AUTH_JWT_KEY=integration-tests-signing-key-example \
+	-e ELECTRIC_TELEMETRY=disabled \
+	-e PG_PROXY_PASSWORD \
+	-e LOGICAL_PUBLISHER_HOST=electric_$* \
+	--name electric_$* \
+	${ELECTRIC_IMAGE}
+
 stop_dev_env:
 	if [ -n "`docker ps --filter name=elixir_client --format '{{.Names}}'`" ]; then \
 		docker ps --filter name=elixir_client --format '{{.Names}}' | xargs docker kill; \
diff --git a/e2e/services_templates.yaml b/e2e/services_templates.yaml
index b0ad8faea9..5895e0ecd2 100644
--- a/e2e/services_templates.yaml
+++ b/e2e/services_templates.yaml
@@ -11,6 +11,7 @@ services:
       ELECTRIC_FEATURES:
     init: true
     stop_signal: SIGINT  # use SIGINT as the more speedy alternative to SIGTERM
+    restart: "no"
 
   sysbench:
     image: "${SYSBENCH_IMAGE}"
diff --git a/e2e/tests/01.08_electric_logs_desriptive_errors_for_known_failures.lux b/e2e/tests/01.08_electric_logs_desriptive_errors_for_known_failures.lux
index a55ea9211f..4411110702 100644
--- a/e2e/tests/01.08_electric_logs_desriptive_errors_for_known_failures.lux
+++ b/e2e/tests/01.08_electric_logs_desriptive_errors_for_known_failures.lux
@@ -2,14 +2,33 @@
 [include _shared.luxinc]
 
 [newshell electric]
-    [invoke start_electric_with_env "DATABASE_URL=http://"]
+    [invoke run_electric_with_env "DATABASE_URL=http://"]
     -
+
     ??CONFIGURATION ERROR
 
-    ??DATABASE_URL has invalid URL scheme: "http"
+    ??The following required configuration options have invalid or missing values:
+
+    ??* DATABASE_URL has invalid URL scheme: "http"
 
     ??Please review the official configuration reference at
     ??https://electric-sql.com/docs/api/service
 
+    ??••• Shutting down •••
+
+[newshell electric_2]
+    [invoke run_electric 2]
+    ??Successfully initialized Postgres connector "postgres_1"
+
+[shell electric]
+    [invoke run_electric 1]
+    -
+
+    ??Failed to establish replication connection to Postgres:
+    ??  #{msg}
+    ??
+    ??Another instance of Electric appears to be connected to this database.
+    ??Refer to https://github.com/electric-sql/electric/issues/971 for additional info.
+
 [cleanup]
    [invoke teardown]
diff --git a/e2e/tests/_shared.luxinc b/e2e/tests/_shared.luxinc
index 24fb0c2a07..0cf62cc8af 100644
--- a/e2e/tests/_shared.luxinc
+++ b/e2e/tests/_shared.luxinc
@@ -39,17 +39,20 @@
     -$fail_pattern
 [endmacro]
 
-[macro start_electric_with_env env_str]
-    !${env_str} make start_electric_1
-    -$fail_pattern
-[endmacro]
-
 [macro stop_electric n]
     !make stop_electric_${n}
     ??Stopped
     [invoke ok]
 [endmacro]
 
+[macro run_electric n]
+    !make run_electric_${n}
+[endmacro]
+
+[macro run_electric_with_env env_str]
+    !USER_ENV="${env_str}" make run_electric_1
+[endmacro]
+
 [macro teardown]
     [progress stop development environment]
     !make stop_dev_env
diff --git a/e2e/tests/compose.yaml b/e2e/tests/compose.yaml
index b1cc96a03c..c94cc45d70 100644
--- a/e2e/tests/compose.yaml
+++ b/e2e/tests/compose.yaml
@@ -26,6 +26,23 @@ services:
     depends_on:
       - pg_1
 
+  electric_2:
+    extends:
+      file: ../services_templates.yaml
+      service: electric
+    environment:
+      DATABASE_URL: "${DATABASE_URL:-postgresql://postgres:password@pg_1:5432/electric}"
+      DATABASE_REQUIRE_SSL: false
+      ELECTRIC_WRITE_TO_PG_MODE: "${ELECTRIC_WRITE_TO_PG_MODE:-logical_replication}"
+      LOGICAL_PUBLISHER_HOST: electric_1
+      PG_PROXY_LOG_LEVEL: info
+    ports:
+      - "5133:5133"
+      # proxy access
+      - "65432:65432"
+    depends_on:
+      - pg_1
+
   sysbench:
     extends:
       file: ../services_templates.yaml