Enhance MinIO handling in replication management and update legacy test bootstrap. Add MinIO replication logic, legacy setup cleanup, and include necessary tests for improved MinIO interaction and error tolerance.

2026-05-18 14:12:03 +02:00
parent 3261ed8414
commit ab31cd6dbb
33 changed files with 2392 additions and 252 deletions
@@ -0,0 +1,48 @@
+USE_ENV=true
+DEBUG=true
+ENCRYPTION_KEY=ci-test-encryption-key
+CORS=*
+CONFIG_TIMEZONE=Europe/Copenhagen
+
+CONFIG_DB_TARGET=debug
+CONFIG_DB_HOST=mysql-debug
+CONFIG_DB_USER=root
+CONFIG_DB_PASSWORD=debug_root_password
+CONFIG_DB_DATABASE=nnks_db_debug
+CONFIG_DB_PORT=3306
+CONFIG_DB_SSL_MODE=DISABLED
+CONFIG_DB_DEBUG_HOST=mysql-debug
+CONFIG_DB_DEBUG_USER=root
+CONFIG_DB_DEBUG_PASSWORD=debug_root_password
+CONFIG_DB_DEBUG_DATABASE=nnks_db_debug
+CONFIG_DB_DEBUG_PORT=3306
+CONFIG_DB_DEBUG_SSL_MODE=DISABLED
+
+REDIS_CONFIG_HOST=redis
+REDIS_CONFIG_USER=default
+REDIS_CONFIG_DATABASE=0
+REDIS_CONFIG_PASSWORD=
+REDIS_CONFIG_PORT=6379
+REDIS_CONFIG_DEBUG_HOST=redis
+REDIS_CONFIG_DEBUG_USER=default
+REDIS_CONFIG_DEBUG_DATABASE=0
+REDIS_CONFIG_DEBUG_PASSWORD=
+REDIS_CONFIG_DEBUG_PORT=6379
+
+ECONOMIC_API_APP_ACCESS_GRANT=ci-test
+ECONOMIC_API_APP_ACCESS_GRANT2=ci-test-secondary
+ECONOMIC_API_APP_SECRET_TOKEN=ci-test-secret
+WORDPRESS_STATIC_TOKEN=ci-test
+EMAIL_WASH_CERTIFICATE_TOKEN=ci-test
+WORDPRESS_API_URL=http://localhost
+MINIO_ENDPOINT=
+MINIO_ACCESS_KEY=
+MINIO_SECRET_KEY=
+SLACK_DEFAULT_WEBHOOK=
+
+EDGE_BROKER_URL=http://edge-broker:4300
+EDGE_PUBLIC_BROKER_URL=http://localhost/api/edge-broker
+EDGE_AUTH_MODE=manager
+EDGE_BROKER_SHARED_SECRET=truckwash-edge-ci
+EDGE_GATEWAY_VIEW_CACHE_TTL=0
+TRUCKWASH_TEST_BLOCK_REAL_SHELLY=1
@@ -0,0 +1,48 @@
+USE_ENV=true
+DEBUG=true
+ENCRYPTION_KEY=ci-test-encryption-key
+CORS=*
+CONFIG_TIMEZONE=Europe/Copenhagen
+
+CONFIG_DB_TARGET=debug
+CONFIG_DB_HOST=mysql-debug
+CONFIG_DB_USER=root
+CONFIG_DB_PASSWORD=debug_root_password
+CONFIG_DB_DATABASE=nnks_db_debug
+CONFIG_DB_PORT=3306
+CONFIG_DB_SSL_MODE=DISABLED
+CONFIG_DB_DEBUG_HOST=mysql-debug
+CONFIG_DB_DEBUG_USER=root
+CONFIG_DB_DEBUG_PASSWORD=debug_root_password
+CONFIG_DB_DEBUG_DATABASE=nnks_db_debug
+CONFIG_DB_DEBUG_PORT=3306
+CONFIG_DB_DEBUG_SSL_MODE=DISABLED
+
+REDIS_CONFIG_HOST=redis
+REDIS_CONFIG_USER=default
+REDIS_CONFIG_DATABASE=0
+REDIS_CONFIG_PASSWORD=
+REDIS_CONFIG_PORT=6379
+REDIS_CONFIG_DEBUG_HOST=redis
+REDIS_CONFIG_DEBUG_USER=default
+REDIS_CONFIG_DEBUG_DATABASE=0
+REDIS_CONFIG_DEBUG_PASSWORD=
+REDIS_CONFIG_DEBUG_PORT=6379
+
+ECONOMIC_API_APP_ACCESS_GRANT=ci-test
+ECONOMIC_API_APP_ACCESS_GRANT2=ci-test-secondary
+ECONOMIC_API_APP_SECRET_TOKEN=ci-test-secret
+WORDPRESS_STATIC_TOKEN=ci-test
+EMAIL_WASH_CERTIFICATE_TOKEN=ci-test
+WORDPRESS_API_URL=http://localhost
+MINIO_ENDPOINT=
+MINIO_ACCESS_KEY=
+MINIO_SECRET_KEY=
+SLACK_DEFAULT_WEBHOOK=
+
+EDGE_BROKER_URL=http://edge-broker:4300
+EDGE_PUBLIC_BROKER_URL=http://localhost/api/edge-broker
+EDGE_AUTH_MODE=manager
+EDGE_BROKER_SHARED_SECRET=truckwash-edge-ci
+EDGE_GATEWAY_VIEW_CACHE_TTL=0
+TRUCKWASH_TEST_BLOCK_REAL_SHELLY=1
@@ -7,6 +7,7 @@ services:

  mysql-debug:
    container_name: "${COMPOSE_PROJECT_NAME:-api}-mysql-debug"
+    ports: !reset []

  edge-broker:
    container_name: "${COMPOSE_PROJECT_NAME:-api}-edge-broker"
@@ -19,6 +20,7 @@ services:

  caddy:
    container_name: "${COMPOSE_PROJECT_NAME:-api}-caddy"
+    depends_on: !reset []
    labels:
      - "traefik.http.routers.local-api-ci.rule=PathPrefix(`/api`)"
      - "traefik.http.routers.local-api-ci.entrypoints=web"
@@ -30,8 +32,29 @@ services:

  php1:
    container_name: "${COMPOSE_PROJECT_NAME:-api}-php1"
+    depends_on: !reset []
    environment:
      AUTO_COMPOSER_INSTALL: "false"
+      USE_ENV: "true"
+      CONFIG_DB_TARGET: "debug"
+      CONFIG_DB_HOST: "mysql-debug"
+      CONFIG_DB_USER: "root"
+      CONFIG_DB_PASSWORD: "debug_root_password"
+      CONFIG_DB_DATABASE: "nnks_db_debug"
+      CONFIG_DB_PORT: "3306"
+      CONFIG_DB_DEBUG_HOST: "mysql-debug"
+      CONFIG_DB_DEBUG_USER: "root"
+      CONFIG_DB_DEBUG_PASSWORD: "debug_root_password"
+      CONFIG_DB_DEBUG_DATABASE: "nnks_db_debug"
+      CONFIG_DB_DEBUG_PORT: "3306"
+      REDIS_CONFIG_HOST: "redis"
+      REDIS_CONFIG_PORT: "6379"
+      REDIS_CONFIG_DATABASE: "0"
+      REDIS_CONFIG_DEBUG_HOST: "redis"
+      REDIS_CONFIG_DEBUG_PORT: "6379"
+      REDIS_CONFIG_DEBUG_DATABASE: "0"
+      TRUCKWASH_TEST_BLOCK_REAL_SHELLY: "1"
+      EDGE_GATEWAY_VIEW_CACHE_TTL: "0"
    volumes:
      - ci_php_app:/var/www/html

@@ -5,69 +5,42 @@ on:
  push:

 jobs:
-  unit:
-    name: Unit (required)
-    # Match the labels exposed by the Coolify-managed GitHub runner.
+  php:
+    name: PHP ${{ matrix.suite }} (required)
    runs-on: [self-hosted, Linux, X64, default]
+    strategy:
+      fail-fast: false
+      matrix:
+        suite: [unit, integration, api, legacy]
+    env:
+      COMPOSE_PROJECT_NAME: php-${{ github.run_id }}-${{ github.job }}-${{ matrix.suite }}-${{ github.run_attempt }}

    steps:
      - name: Checkout
        uses: actions/checkout@v4

      - name: Setup Node.js
+        if: ${{ matrix.suite == 'unit' }}
        uses: actions/setup-node@v4
        with:
          node-version: 22

      - name: Check AI workflow sync
+        if: ${{ matrix.suite == 'unit' }}
        run: node scripts/sync-ai-workflow.mjs --check

-      - name: Materialize compose env files
-        env:
-          COMPOSE_ENV: ${{ secrets.COMPOSE_ENV }}
-          COMPOSE_ENV_STAGING: ${{ secrets.COMPOSE_ENV_STAGING }}
-        run: |
-          set -euo pipefail
-          if [ -z "${COMPOSE_ENV}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV is not configured." >&2
-            exit 1
-          fi
-          if [ -z "${COMPOSE_ENV_STAGING}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV_STAGING is not configured." >&2
-            exit 1
-          fi
-          printf '%s\n' "$COMPOSE_ENV" > .env
-          printf '%s\n' "$COMPOSE_ENV_STAGING" > .env.staging
+      - name: Run PHP ${{ matrix.suite }} suite
+        run: bash scripts/php-ci-test.sh ${{ matrix.suite }}

-      - name: Boot php1 test stack
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml up -d redis mysql-debug php1
-
-      - name: Sync PHP app checkout
-        run: tar -C services/nginx/app -cf - . | docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 tar -C /var/www/html -xf -
-
-      - name: Resolve dependencies
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer update --no-interaction --prefer-dist"
-
-      - name: Run unit tests
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer test:unit"
-
-      - name: Generate coverage report
-        run: |
-          docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && if php -m | grep -Eq '^(pcov|xdebug)$'; then composer test:coverage; else echo 'Skipping coverage: no pcov/xdebug extension available in php1 image.'; fi"
-
-      - name: Upload coverage artifact
-        if: ${{ github.event_name == 'pull_request' }}
+      - name: Upload PHP suite logs
+        if: ${{ failure() }}
        continue-on-error: true
        uses: actions/upload-artifact@v4
        with:
-          name: unit-coverage-clover
-          path: services/nginx/app/build/logs/clover.xml
+          name: php-${{ matrix.suite }}-logs
+          path: .tmp/ci-logs/${{ matrix.suite }}
          if-no-files-found: warn
-          retention-days: 1
-
-      - name: Tear down php1 test stack
-        if: always()
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml down -v
+          retention-days: 3

  edge-agent:
    name: Edge Agent (required)
@@ -100,22 +73,11 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4

-      - name: Materialize compose env files
-        env:
-          COMPOSE_ENV: ${{ secrets.COMPOSE_ENV }}
-          COMPOSE_ENV_STAGING: ${{ secrets.COMPOSE_ENV_STAGING }}
+      - name: Materialize CI compose env files
        run: |
          set -euo pipefail
-          if [ -z "${COMPOSE_ENV}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV is not configured." >&2
-            exit 1
-          fi
-          if [ -z "${COMPOSE_ENV_STAGING}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV_STAGING is not configured." >&2
-            exit 1
-          fi
-          printf '%s\n' "$COMPOSE_ENV" > .env
-          printf '%s\n' "$COMPOSE_ENV_STAGING" > .env.staging
+          cp .github/ci.env .env
+          cp .github/ci.env.staging .env.staging

      - name: Validate compose contracts
        run: |
@@ -153,22 +115,11 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4

-      - name: Materialize compose env files
-        env:
-          COMPOSE_ENV: ${{ secrets.COMPOSE_ENV }}
-          COMPOSE_ENV_STAGING: ${{ secrets.COMPOSE_ENV_STAGING }}
+      - name: Materialize CI compose env files
        run: |
          set -euo pipefail
-          if [ -z "${COMPOSE_ENV}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV is not configured." >&2
-            exit 1
-          fi
-          if [ -z "${COMPOSE_ENV_STAGING}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV_STAGING is not configured." >&2
-            exit 1
-          fi
-          printf '%s\n' "$COMPOSE_ENV" > .env
-          printf '%s\n' "$COMPOSE_ENV_STAGING" > .env.staging
+          cp .github/ci.env .env
+          cp .github/ci.env.staging .env.staging

      - name: Setup Node.js
        uses: actions/setup-node@v4
@@ -179,10 +130,16 @@ jobs:
        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml up -d traefik redis mysql-debug edge-broker php1 caddy

      - name: Sync PHP app checkout
-        run: tar -C services/nginx/app -cf - . | docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 tar -C /var/www/html -xf -
+        run: >
+          tar
+          --exclude='./vendor'
+          --exclude='./.phpunit.cache'
+          --exclude='./build/logs'
+          -C services/nginx/app -cf - .
+          | docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 tar -C /var/www/html -xf -

      - name: Resolve dependencies
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer update --no-interaction --prefer-dist"
+        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer install --no-interaction --prefer-dist --no-progress"

      - name: Verify edge gateway test files
        run: >
@@ -200,7 +157,13 @@ jobs:
          "cd /var/www/html &&
          RUN_API_TESTS=1
          API_TEST_BOOTSTRAP_SCHEMA=1
+          API_TEST_ALLOW_LIVE_DB=1
          CONFIG_DB_TARGET=debug
+          CONFIG_DB_HOST=mysql-debug
+          CONFIG_DB_USER=\${CONFIG_DB_USER:-root}
+          CONFIG_DB_PASSWORD=\${CONFIG_DB_PASSWORD:-debug_root_password}
+          CONFIG_DB_DATABASE=\${CONFIG_DB_DATABASE:-nnks_db_debug}
+          CONFIG_DB_PORT=3306
          CONFIG_DB_DEBUG_HOST=mysql-debug
          CONFIG_DB_DEBUG_USER=\${CONFIG_DB_DEBUG_USER:-root}
          CONFIG_DB_DEBUG_PASSWORD=\${CONFIG_DB_DEBUG_PASSWORD:-debug_root_password}
@@ -221,6 +184,11 @@ jobs:
          "cd /var/www/html &&
          RUN_INTEGRATION_TESTS=1
          CONFIG_DB_TARGET=debug
+          CONFIG_DB_HOST=mysql-debug
+          CONFIG_DB_USER=\${CONFIG_DB_USER:-root}
+          CONFIG_DB_PASSWORD=\${CONFIG_DB_PASSWORD:-debug_root_password}
+          CONFIG_DB_DATABASE=\${CONFIG_DB_DATABASE:-nnks_db_debug}
+          CONFIG_DB_PORT=3306
          CONFIG_DB_DEBUG_HOST=mysql-debug
          CONFIG_DB_DEBUG_USER=\${CONFIG_DB_DEBUG_USER:-root}
          CONFIG_DB_DEBUG_PASSWORD=\${CONFIG_DB_DEBUG_PASSWORD:-debug_root_password}
@@ -261,87 +229,3 @@ jobs:
      - name: Tear down local stack
        if: always()
        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml down -v
-
-  integration:
-    name: Integration (advisory)
-    runs-on: [self-hosted, Linux, X64, default]
-    continue-on-error: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Materialize compose env files
-        env:
-          COMPOSE_ENV: ${{ secrets.COMPOSE_ENV }}
-          COMPOSE_ENV_STAGING: ${{ secrets.COMPOSE_ENV_STAGING }}
-        run: |
-          set -euo pipefail
-          if [ -z "${COMPOSE_ENV}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV is not configured." >&2
-            exit 1
-          fi
-          if [ -z "${COMPOSE_ENV_STAGING}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV_STAGING is not configured." >&2
-            exit 1
-          fi
-          printf '%s\n' "$COMPOSE_ENV" > .env
-          printf '%s\n' "$COMPOSE_ENV_STAGING" > .env.staging
-
-      - name: Boot integration stack
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml up -d redis mysql-debug php1
-
-      - name: Sync PHP app checkout
-        run: tar -C services/nginx/app -cf - . | docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 tar -C /var/www/html -xf -
-
-      - name: Resolve dependencies
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer update --no-interaction --prefer-dist"
-
-      - name: Run integration tests
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T -e RUN_INTEGRATION_TESTS=1 php1 sh -lc "cd /var/www/html && composer test:integration"
-
-      - name: Tear down integration stack
-        if: always()
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml down -v
-
-  api:
-    name: API (advisory)
-    runs-on: [self-hosted, Linux, X64, default]
-    continue-on-error: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Materialize compose env files
-        env:
-          COMPOSE_ENV: ${{ secrets.COMPOSE_ENV }}
-          COMPOSE_ENV_STAGING: ${{ secrets.COMPOSE_ENV_STAGING }}
-        run: |
-          set -euo pipefail
-          if [ -z "${COMPOSE_ENV}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV is not configured." >&2
-            exit 1
-          fi
-          if [ -z "${COMPOSE_ENV_STAGING}" ]; then
-            echo "Required GitHub secret COMPOSE_ENV_STAGING is not configured." >&2
-            exit 1
-          fi
-          printf '%s\n' "$COMPOSE_ENV" > .env
-          printf '%s\n' "$COMPOSE_ENV_STAGING" > .env.staging
-
-      - name: Boot API stack
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml up -d redis mysql-debug php1
-
-      - name: Sync PHP app checkout
-        run: tar -C services/nginx/app -cf - . | docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 tar -C /var/www/html -xf -
-
-      - name: Resolve dependencies
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer update --no-interaction --prefer-dist"
-
-      - name: Run API tests
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T -e RUN_API_TESTS=1 -e API_TEST_BOOTSTRAP_SCHEMA=1 php1 sh -lc "cd /var/www/html && composer test:api"
-
-      - name: Tear down API stack
-        if: always()
-        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml down -v