Refactor testing

Author: cvandesande

Makefile

@@ -68,18 +68,20 @@ start-local: setup-local build
 	@echo "Starting mock external processor..."
 	@-kill $$(cat /tmp/extproc_mock.pid 2>/dev/null) 2>/dev/null || true
 	@rm -f /tmp/extproc_mock.pid
-	@(EPP_UPSTREAM=localhost:8080 MOCK_ROLE=EPP ./target/debug/extproc_mock 0.0.0.0:9001 >/dev/null 2>&1 & echo $$! > /tmp/extproc_mock.pid) || true
+	@(EPP_UPSTREAM=127.0.0.1:8000 MOCK_ROLE=EPP ./target/debug/extproc_mock 0.0.0.0:9001 >/dev/null 2>&1 & echo $$! > /tmp/extproc_mock.pid) || true
 	@sleep 1
 	@echo "Starting echo server..."
 	@-kill $$(cat /tmp/echo-server.pid 2>/dev/null) 2>/dev/null || true
 	@rm -f /tmp/echo-server.pid
 	@cd docker/echo-server && [ ! -f package.json ] && npm init -y >/dev/null 2>&1 || true
 	@cd docker/echo-server && [ ! -d node_modules ] && npm install express >/dev/null 2>&1 || true
-	@(cd docker/echo-server && PORT=8080 node custom-echo-server.js >/dev/null 2>&1 & echo $$! > /tmp/echo-server.pid) || true
+	@(cd docker/echo-server && PORT=8000 node custom-echo-server.js >/dev/null 2>&1 & echo $$! > /tmp/echo-server.pid) || true
 	@sleep 1
 	@echo "✅ Local services started. Run 'make test-local' to run tests."
 
 start-docker: setup-docker
+	@echo "==> Generating nginx configuration for Docker..."
+	./tests/generate-config.sh -e docker -o /tmp/nginx-docker.conf -s bbr_on_epp_on
 	@echo "==> Starting Docker services..."
 	docker compose -f $(DOCKER_COMPOSE_MAIN) up --build -d
 	@echo "✅ Docker services started. Run 'make test-docker' to run tests."
@@ -93,19 +95,19 @@ start-kind: setup-kind
 # TEST TARGETS - Run automated tests
 # ============================================================================
 
-test-local:
+test-local: start-local
 	@echo "==> Running local tests..."
 	@echo "Building module for NGINX version: $$(nginx -v 2>&1 | sed 's|nginx version: nginx/||')"
 	./tests/test-config.sh
 	@echo "✅ Local tests complete."
 
-test-docker:
+test-docker: start-docker
 	@echo "==> Running Docker tests..."
 	@echo "Building module for NGINX version: $$(grep 'FROM nginx:' docker/nginx/Dockerfile | head -1 | sed 's/.*nginx://' | sed 's/-.*//')"
 	DOCKER_ENVIRONMENT=main ./tests/test-config.sh
 	@echo "✅ Docker tests complete."
 
-test-kind:
+test-kind: start-kind
 	@echo "==> Running tests against reference EPP in kind cluster..."
 	./tests/kind-ngf/scripts/test-kind.sh
 	@echo "✅ Kind tests complete."
@@ -137,7 +139,7 @@ clean: stop
 	@# Clean build artifacts
 	cargo clean
 	@# Clean temp files
-	rm -f /tmp/nginx-ngx-inference-*.log /tmp/nginx-ngx-inference-test.conf
+	rm -f /tmp/nginx-ngx-inference-*.log /tmp/nginx-ngx-inference-*.conf
 	@# Remove nginx temp directories
 	rm -rf /tmp/nginx_client_body_temp /tmp/nginx_proxy_temp /tmp/nginx_fastcgi_temp /tmp/nginx_scgi_temp /tmp/nginx_uwsgi_temp
 	@# Clean echo server node_modules

bin/extproc_mock.rs

@@ -216,6 +216,34 @@ impl ExternalProcessor for ExtProcMock {
     }
 }
 
+async fn shutdown_signal() {
+    let ctrl_c = async {
+        tokio::signal::ctrl_c()
+            .await
+            .expect("failed to install Ctrl+C handler");
+    };
+
+    #[cfg(unix)]
+    let terminate = async {
+        tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
+            .expect("failed to install signal handler")
+            .recv()
+            .await;
+    };
+
+    #[cfg(not(unix))]
+    let terminate = std::future::pending::<()>();
+
+    tokio::select! {
+        _ = ctrl_c => {
+            eprintln!("extproc_mock: received SIGINT, shutting down gracefully...");
+        },
+        _ = terminate => {
+            eprintln!("extproc_mock: received SIGTERM, shutting down gracefully...");
+        },
+    }
+}
+
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let addr: SocketAddr = std::env::args()
@@ -246,9 +274,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     println!("extproc_mock listening on {}", addr);
+
     tonic::transport::Server::builder()
         .add_service(ExternalProcessorServer::new(svc))
-        .serve(addr)
+        .serve_with_shutdown(addr, shutdown_signal())
         .await?;
+
+    eprintln!("extproc_mock: shutdown complete");
     Ok(())
 }

docker/echo-server/custom-echo-server.js

@@ -36,6 +36,30 @@ app.use('/', (req, res) => {
   res.json(response);
 });
 
-app.listen(port, '0.0.0.0', () => {
+const server = app.listen(port, '0.0.0.0', () => {
   console.log(`Custom echo server listening on port ${port} with 50MB body limit`);
-});
+});
+
+// Graceful shutdown handler
+const gracefulShutdown = (signal) => {
+  console.log(`\n${signal} received. Starting graceful shutdown...`);
+
+  server.close((err) => {
+    if (err) {
+      console.error('Error during shutdown:', err);
+      process.exit(1);
+    }
+    console.log('Echo server closed successfully');
+    process.exit(0);
+  });
+
+  // Force shutdown after 5 seconds if graceful shutdown takes too long
+  setTimeout(() => {
+    console.error('Forcing shutdown after timeout');
+    process.exit(1);
+  }, 5000);
+};
+
+// Listen for termination signals
+process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
+process.on('SIGINT', () => gracefulShutdown('SIGINT'));

docker/nginx/Dockerfile

@@ -10,7 +10,7 @@ FROM rust:1.91-alpine3.22 AS builder
 WORKDIR /work
 
 # Install build dependencies for Alpine (NGINX requirements)
-RUN apk add --no-cache \
+RUN apk add \
     clang-dev \
     pcre2-dev \
     openssl-dev \

docker/nginx/nginx-test.conf

@@ -6,12 +6,12 @@ services:
       context: ..
     container_name: ngx-inference-nginx
     ports:
-      - "8081:80"
+      - "8081:8081"
     depends_on:
       - mock-epp
       - echo-server
     volumes:
-      - ../docker/nginx/nginx-test.conf:/etc/nginx/nginx.conf:ro
+      - /tmp/nginx-docker.conf:/etc/nginx/nginx.conf:ro
 
   # Mock External Processor for EPP (Endpoint Picker Processor) listening on :9001
   mock-epp:

tests/docker-compose.yml

@@ -90,7 +90,7 @@ if [[ "$ENVIRONMENT" != "local" && "$ENVIRONMENT" != "docker" && "$ENVIRONMENT"
     exit 1
 fi
 
-# Set module path and endpoints based on environment
+# Set module path, endpoints, and ports based on environment
 if [[ "$ENVIRONMENT" == "local" ]]; then
     if [[ "$(uname)" == "Darwin" ]]; then
         MODULE_PATH="$PROJECT_ROOT/target/debug/libngx_inference.dylib"
@@ -99,10 +99,11 @@ if [[ "$ENVIRONMENT" == "local" ]]; then
         MODULE_PATH="$PROJECT_ROOT/target/debug/libngx_inference.so"
         MIMETYPES_PATH="/etc/nginx/mime.types"
     fi
-    UPSTREAM_HOST="localhost:8080"
-    EPP_HOST="localhost:9001"
+    UPSTREAM_HOST="127.0.0.1:8000"
+    EPP_HOST="127.0.0.1:9001"
     ERROR_LOG="/tmp/nginx-ngx-inference-error.log"
     ACCESS_LOG="/tmp/nginx-ngx-inference-access.log"
+    NGINX_PORT="8080"
 elif [[ "$ENVIRONMENT" == "kind" ]]; then
     MODULE_PATH="/usr/lib/nginx/modules/libngx_inference.so"
     MIMETYPES_PATH="/etc/nginx/mime.types"
@@ -114,13 +115,16 @@ elif [[ "$ENVIRONMENT" == "kind" ]]; then
     # In Kubernetes, log to stdout/stderr for kubectl logs to work
     ERROR_LOG="/dev/stderr"
     ACCESS_LOG="/dev/stdout"
+    NGINX_PORT="8082"
 elif [[ "$ENVIRONMENT" == "docker" ]]; then
     MODULE_PATH="/usr/lib/nginx/modules/libngx_inference.so"
     MIMETYPES_PATH="/etc/nginx/mime.types"
     UPSTREAM_HOST="echo-server:80"
     EPP_HOST="mock-epp:9001"
-    ERROR_LOG="/tmp/nginx-ngx-inference-error.log"
-    ACCESS_LOG="/tmp/nginx-ngx-inference-access.log"
+    # In Docker, log to stdout/stderr for docker logs to work
+    ERROR_LOG="/dev/stderr"
+    ACCESS_LOG="/dev/stdout"
+    NGINX_PORT="8081"
 else
     # Default/fallback configuration
     MODULE_PATH="/usr/lib/nginx/modules/libngx_inference.so"
@@ -158,13 +162,17 @@ if [[ -n "$SERVER_CONFIG" ]]; then
     if [[ "$ENVIRONMENT" == "kind" ]]; then
         # In Kubernetes, use the kube-dns service IP
         RESOLVER="10.96.0.10"
+    elif [[ "$ENVIRONMENT" == "docker" ]]; then
+        # In Docker, use Docker's internal DNS server
+        RESOLVER="127.0.0.11"
     else
-        # For local/docker, use system resolver, filtering out invalid IPv6 addresses
+        # For local, use system resolver, filtering out invalid IPv6 addresses
         RESOLVER=$(grep '^nameserver' /etc/resolv.conf | grep -v '^nameserver fe80::' | awk '{print $2}' | head -1 || echo "8.8.8.8")
     fi
 
-    # Read server config and replace references with environment-specific hosts
+    # Read server config and replace references with environment-specific hosts and port
     SERVER_CONFIG_CONTENT=$(cat "$SERVER_CONFIG_FILE" | \
+        sed "s|listen 8081;|listen $NGINX_PORT;|g" | \
         sed "s|http://localhost:8080|http://$UPSTREAM_HOST|g" | \
         sed "s|\"localhost:8080\"|\"$UPSTREAM_HOST\"|g" | \
         sed "s|\"127.0.0.1:8080\"|\"$UPSTREAM_HOST\"|g" | \