Fix scripts to run from any directory and simplify CDC pipeline config

Co-authored by Claude Code

Author: cer

.gitignore

@@ -1,3 +1,4 @@
+**/.hitl
 .gradle
 build/
 *.idea/
@@ -15,5 +16,3 @@ bin
 node_modules
 dist
 ftgo-api-gateway-graphql/jest_0
-.claude/issues
-.claude/sessions

ftgo-end-to-end-tests/src/endToEndTest/java/net/chrisrichardson/ftgo/endtoendtests/ApplicationUnderTestUsingTestContainers.java

@@ -90,26 +90,19 @@ public ApplicationUnderTestUsingTestContainers() {
         apiGateway = createApiGatewayContainer();
 
         // CDC service
-        // Note: Accounting service needs BOTH pipelines:
-        // - Tram pipeline (message table) for sending saga replies
-        // - EventuateLocal pipeline (events table) for publishing domain events
-        // Both pipelines share the same reader (reader5)
         cdc = new EventuateCdcContainer()
                 .withKafka(kafka)
                 .withKafkaLeadership()
-                .withTramPipeline(consumerDatabase)   // reader1, pipeline1
-                .withTramPipeline(orderDatabase)      // reader2, pipeline2
-                .withTramPipeline(kitchenDatabase)    // reader3, pipeline3
-                .withTramPipeline(restaurantDatabase) // reader4, pipeline4
-                .withTramPipeline(accountingDatabase) // reader5, pipeline5 (Tram for saga replies)
-                .withTramPipeline(deliveryDatabase)   // reader6, pipeline6
+                .withTramPipeline(consumerDatabase)
+                .withTramPipeline(orderDatabase)
+                .withTramPipeline(kitchenDatabase)
+                .withTramPipeline(restaurantDatabase)
+                .withTramAndLocalPipeline(accountingDatabase)
+                .withTramPipeline(deliveryDatabase)
                 .withReuse(false)
                 .withExposedPorts(8080)
                 .dependsOn(consumerService, orderService, kitchenService, restaurantService, accountingService, deliveryService)
                 .withLogConsumer(new Slf4jLogConsumer(logger).withPrefix("cdc:"));
-
-        // Add EventuateLocal pipeline for accounting service (reuses reader5, new pipeline7)
-        addEventuateLocalPipelineUsingExistingReader(cdc, 5, 7);
     }
 
     private EventuateDatabaseContainer<?> createDatabase(String alias) {
@@ -171,20 +164,6 @@ private GenericContainer<?> createApiGatewayContainer() {
                 .withLogConsumer(new Slf4jLogConsumer(logger).withPrefix("api-gateway:"));
     }
 
-    /**
-     * Adds an EventuateLocal pipeline that reuses an existing reader.
-     * This allows the same database to have both Tram and EventuateLocal pipelines.
-     */
-    private void addEventuateLocalPipelineUsingExistingReader(EventuateCdcContainer cdc, int readerIdx, int pipelineIdx) {
-        String pipelinePrefix = "EVENTUATE_CDC_PIPELINE_PIPELINE" + pipelineIdx + "_";
-
-        // Pipeline configuration - uses eventuate-local type and existing reader
-        // Note: accounting-service uses schema=public (per its application.properties)
-        cdc.withEnv(pipelinePrefix + "TYPE", "eventuate-local");
-        cdc.withEnv(pipelinePrefix + "READER", "reader" + readerIdx);
-        cdc.withEnv(pipelinePrefix + "EVENTUATEDATABASESCHEMA", "public");
-    }
-
     @Override
     public void start() {
         kafka.withLogConsumer(new Slf4jLogConsumer(logger).withPrefix("kafka:"));

run-end-to-end-tests-using-test-containers.sh

@@ -2,11 +2,11 @@
 
 set -e
 
+cd "$(dirname "$0")/ftgo-end-to-end-tests"
+
 echo "Running end-to-end tests using TestContainers..."
 echo ""
 
-cd ftgo-end-to-end-tests
-
 ./gradlew cleanEndToEndTest
 ./gradlew endToEndTest -PendToEndTestMode=TestContainers "$@"
 

run-end-to-end-tests.sh

@@ -1,3 +1,5 @@
 #! /bin/bash -e
 
-./gradlew :ftgo-end-to-end-tests:cleanTest :ftgo-end-to-end-tests:test
+cd "$(dirname "$0")/ftgo-end-to-end-tests"
+
+./gradlew cleanTest test