Properly wait for cqlsh readiness

.github/insist.sh

@@ -0,0 +1,11 @@
+insist () {
+  command=$1
+  attempts=0
+  max_attempts=240
+  while ! eval "$command" ; do
+      [[ $attempts -ge $max_attempts ]] && echo "Failed!" && exit 1
+      attempts=$((attempts+1))
+      sleep 1;
+      echo "waiting... (${attempts}/${max_attempts})"
+  done
+}

.github/wait-for-cql.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+service=$1
+
+source insist.sh
+
+echo "Waiting for CQL to be ready in service ${service}"
+insist 'docker compose -f docker-compose-tests.yml exec ${service} bash -c "cqlsh -e '"'"'describe cluster'"'"'" > /dev/null'

.github/wait-for-port.sh

@@ -1,12 +1,8 @@
 #!/usr/bin/env bash
 
 port=$1
+
+source insist.sh
+
 echo "Waiting for successful HTTP status code on port ${port}"
-attempts=0
-max_attempts=240
-while ! curl -s "http://127.0.0.1:$port" > /dev/null ; do
-    [[ $attempts -ge $max_attempts ]] && echo "Failed!" && exit 1
-    attempts=$((attempts+1))
-    sleep 1;
-    echo "waiting... (${attempts}/${max_attempts})"
-done
+insist 'curl -s "http://127.0.0.1:$port" > /dev/null'

.github/workflows/tests.yml

@@ -25,11 +25,11 @@ jobs:
       - name: Set up services
         run: |
           docker compose -f docker-compose-tests.yml up &
-          .github/wait-for-port.sh 9042 # ScyllaDB
           .github/wait-for-port.sh 8000 # ScyllaDB Alternator
           .github/wait-for-port.sh 8001 # DynamoDB
-          .github/wait-for-port.sh 9043 # Cassandra
-          .github/wait-for-port.sh 9044 # ScyllaDB (used as a source)
+          .github/wait-for-cql.sh scylla
+          .github/wait-for-cql.sh cassandra
+          .github/wait-for-cql.sh scylla-source
           .github/wait-for-port.sh 8080 # Spark master
           .github/wait-for-port.sh 8081 # Spark worker
       - name: Run tests