Update to use health endpoint check

.github/workflows/e2e-tests.yml

@@ -137,8 +137,8 @@ jobs:
         run: ./tests/assert-env-unset.sh
 
   test-connect:
-    name: Connect (ubuntu-latest, ${{ matrix.version }}, export-env=${{ matrix.export-env }})
+    name: Connect (${{ matrix.os }}, ${{ matrix.version }}, export-env=${{ matrix.export-env }})
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
       max-parallel: 4
@@ -179,7 +179,8 @@ jobs:
           OP_CONNECT_CREDENTIALS: ${{ secrets.OP_CONNECT_CREDENTIALS }}
         run: |
           echo "$OP_CONNECT_CREDENTIALS" > 1password-credentials.json
-          docker compose -f tests/fixtures/docker-compose.yml up -d && sleep 15
+          docker compose -f tests/fixtures/docker-compose.yml up -d
+          timeout 60 bash -c 'until curl -sf http://localhost:8080/health >/dev/null 2>&1; do sleep 2; done'
 
       - name: Configure 1Password Connect
         uses: ./configure

tests/assert-env-set.sh

@@ -39,14 +39,6 @@ assert_env_equals "FILE_MULTILINE_SECRET" "${MULTILINE_SECRET}"
 
 # WEBSITE/FILE_WEBSITE: required when ASSERT_WEBSITE=true (Service Account), skipped when false (Connect)
 if [ "${ASSERT_WEBSITE:-false}" = "true" ]; then
-  if [ -z "$(printenv WEBSITE 2>/dev/null)" ]; then
-    echo "Expected WEBSITE to be set (Service Account)"
-    exit 1
-  fi
-  if [ -z "$(printenv FILE_WEBSITE 2>/dev/null)" ]; then
-    echo "Expected FILE_WEBSITE to be set (Service Account)"
-    exit 1
-  fi
   assert_env_equals "WEBSITE" "${WEBSITE}"
   assert_env_equals "FILE_WEBSITE" "${WEBSITE}"
 fi