From 21d81e0ab0c349a28ab35f245bef665c22160207 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <jsha+github@letsencrypt.org>
Date: Thu, 5 Mar 2026 15:00:32 -0800
Subject: [PATCH] test: add health check for bvitess

This replaces the health check inside `test/entrypoint.sh`. Advantage: if
bvitess exits outright during health checking, `docker compose` can report
that more clearly than `test/entrypoint.sh` can, and can also terminte the run
of the `boulder` container early, rather than waiting for the health check to
timeout.

We can apply the same transformation to the other health checks if we like this
one.
---
 docker-compose.yml | 38 ++++++++++++++++++++++++++++++--------
 test/entrypoint.sh |  3 ---
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6b27b97fa53..81689492087 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,14 +51,22 @@ services:
       - 4001:4001 # ACMEv2
       - 4003:4003 # SFE
     depends_on:
-      - bmariadb
-      - bproxysql
-      - bvitess
-      - bredis_1
-      - bredis_2
-      - bconsul
-      - bjaeger
-      - bpkimetal
+      bmariadb:
+        condition: service_started
+      bproxysql:
+        condition: service_started
+      bvitess:
+        condition: service_healthy
+      bredis_1:
+        condition: service_started
+      bredis_2:
+        condition: service_started
+      bconsul:
+        condition: service_started
+      bjaeger:
+        condition: service_started
+      bpkimetal:
+        condition: service_started
     entrypoint: test/entrypoint.sh
     working_dir: &boulder_working_dir /boulder
 
@@ -154,6 +162,20 @@ services:
       # databases on startup.
       KEYSPACES: boulder_sa,incidents_sa,boulder_sa_next,incidents_sa_next
       NUM_SHARDS: 1,1,1,1
+    healthcheck:
+      # Make sure the service is up and the tables are created. Use `serials` because it happens
+      # to be last in the SQL initialization files, so if it exists the other tables do too.
+      # Note that the mysql command issues some queries on startup that result in this spurious
+      # logging from bvitess:
+      #   You have an error in your SQL syntax; check the manual that corresponds to your MySQL
+      #   server version for the right syntax to use near '$$ from dual limit 10001'
+      test: [ "CMD", "mysql", "-h", "127.0.0.1", "-P", "33577", "-D", "boulder_sa",
+                "-e", "SELECT 1 FROM serials"]
+      interval: 2s
+      timeout: 30s
+      retries: 3
+      start_period: 10s
+      start_interval: 2s
     networks:
       bouldernet:
         aliases:
diff --git a/test/entrypoint.sh b/test/entrypoint.sh
index 2ef0cad3cda..f24758e2afe 100755
--- a/test/entrypoint.sh
+++ b/test/entrypoint.sh
@@ -46,9 +46,6 @@ configure_database_endpoints
 ./test/wait-for-it.sh boulder-mariadb 3306
 ./test/wait-for-it.sh boulder-proxysql 6033
 
-# make sure we can reach vitess
-./test/wait-for-it.sh boulder-vitess 33577
-
 # make sure we can reach pkilint
 ./test/wait-for-it.sh bpkimetal 8080