Merge pull request #2 from appwrite/feat/improvements-and-healthcheck

Add healthcheck endpoint and harden geo service

Author: lohanidamodar

.github/workflows/codeql.yml

@@ -1,17 +1,16 @@
-name: "CodeQL"
+name: "PHP Quality"
 
 on: [pull_request]
 jobs:
   lint:
-    name: CodeQL
+    name: Lint & Static Analysis
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    - name: Run CodeQL
+    - name: Run lint and static analysis
       run: |
-        docker run --rm -v $PWD:/app composer sh -c \
-        "composer install --profile --ignore-platform-reqs && composer check"
-        
+        docker run --rm -v $PWD:/app composer:2 sh -c \
+        "composer install --profile --ignore-platform-reqs && composer lint && composer check"

.github/workflows/tests.yml

@@ -0,0 +1,41 @@
+name: E2E Tests
+
+on:
+  pull_request:
+    branches: [main]
+  push:
+    branches: [main]
+
+env:
+  GEO_SECRET: test-secret
+  GEO_ENV: development
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build and start services
+        run: docker compose up -d --build geo
+
+      - name: Wait for server to be ready
+        run: |
+          for i in $(seq 1 30); do
+            if curl -sf http://localhost:8080/v1/health; then
+              echo "Server is ready"
+              exit 0
+            fi
+            sleep 1
+          done
+          echo "Server failed to start"
+          docker compose logs geo
+          exit 1
+
+      - name: Run E2E tests
+        run: docker compose run --rm tests
+
+      - name: Show logs on failure
+        if: failure()
+        run: docker compose logs geo

Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.0 AS composer
+FROM composer:2 AS composer
 
 ARG TESTING=false
 ENV TESTING=$TESTING
@@ -12,8 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
-# TODO fix utopia-php/docker-base and use appwrite/utopia-base
-FROM appwrite/base:0.9.3 as final 
+FROM appwrite/base:1.1.1 as final
 
 LABEL maintainer="team@appwrite.io"
 
@@ -27,4 +26,7 @@ COPY ./src /usr/src/code/src
 
 EXPOSE 80
 
-CMD ["php", "app/http.php"]
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
+    CMD php -r "exit(str_contains(file_get_contents('http://localhost:80/v1/health'), 'ok') ? 0 : 1);"
+
+CMD ["php", "app/http.php"]

composer.json

@@ -3,34 +3,47 @@
     "type": "project",
     "require": {
         "php": ">=8.3.0",
-        "utopia-php/fetch": "^0.2.1",
-        "utopia-php/http": "1.0.*",
-        "utopia-php/platform": "feat-upgrade-http-dev",
-        "utopia-php/di": "^0.1.0",
-        "utopia-php/system": "^0.8.0",
-        "utopia-php/logger": "^0.6.1",
+        "utopia-php/fetch": "0.5.*",
+        "utopia-php/http": "0.34.*",
+        "utopia-php/platform": "0.10.*",
+        "utopia-php/di": "0.3.*",
+        "utopia-php/system": "^0.10.1",
+        "utopia-php/logger": "^0.7.1",
         "utopia-php/dsn": "^0.2.1",
-        "utopia-php/cli": "dev-feat-upgrade-http as 0.19.0"
+        "utopia-php/cli": "0.23.*",
+        "utopia-php/console": "^0.1.1"
     },
     "autoload": {
         "psr-4": {
             "Appwrite\\Geo\\": "src/Geo"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests"
+        }
+    },
     "authors": [
         {
             "name": "Appwrite",
             "email": "team@appwrite.io"
         }
     ],
     "require-dev": {
-        "phpunit/phpunit": "^11.3",
-        "laravel/pint": "^1.18",
-        "phpstan/phpstan": "^1.12"
+        "phpunit/phpunit": "^13.0",
+        "laravel/pint": "^1.29",
+        "phpstan/phpstan": "^2.1"
     },
     "scripts": {
         "lint": "./vendor/bin/pint --test --config pint.json",
         "format": "./vendor/bin/pint --config pint.json",
-        "check": "./vendor/bin/phpstan analyse -c phpstan.neon"
+        "check": "./vendor/bin/phpstan analyse -c phpstan.neon",
+        "test:e2e": "./vendor/bin/phpunit --testsuite e2e"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": false,
+            "tbachert/spi": false
+        }
     }
 }