Fix logs

Author: nikhilwoodruff

.github/workflows/deploy.yml

@@ -10,9 +10,21 @@ permissions:
   contents: read
 
 jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run tests
+        run: make test
+
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
+    needs: test
 
     steps:
       - name: Checkout code
@@ -104,12 +116,13 @@ jobs:
               --output text)
 
             if [ -n "$TASK_ARN" ] && [ "$TASK_ARN" != "None" ]; then
-              echo "--- Recent logs ---"
-              aws logs tail /ecs/${{ vars.ECS_CLUSTER_NAME }} \
-                --log-stream-name-prefix "ecs/api" \
+              TASK_ID=$(echo $TASK_ARN | rev | cut -d'/' -f1 | rev)
+              echo "--- Recent logs from task $TASK_ID ---"
+              aws logs tail /ecs/policyengine-api-v2-alpha \
+                --log-stream-name-prefix "api/$TASK_ID" \
                 --since 30s \
                 --format short \
-                --region ${{ vars.AWS_REGION }} 2>/dev/null || true
+                --region ${{ vars.AWS_REGION }} 2>&1 || echo "No logs available yet"
               echo "---"
             fi
 
@@ -149,12 +162,13 @@ jobs:
               --output text)
 
             if [ -n "$TASK_ARN" ] && [ "$TASK_ARN" != "None" ]; then
-              echo "--- Recent logs ---"
-              aws logs tail /ecs/${{ vars.ECS_CLUSTER_NAME }} \
-                --log-stream-name-prefix "ecs/worker" \
+              TASK_ID=$(echo $TASK_ARN | rev | cut -d'/' -f1 | rev)
+              echo "--- Recent logs from task $TASK_ID ---"
+              aws logs tail /ecs/policyengine-api-v2-alpha \
+                --log-stream-name-prefix "worker/$TASK_ID" \
                 --since 30s \
                 --format short \
-                --region ${{ vars.AWS_REGION }} 2>/dev/null || true
+                --region ${{ vars.AWS_REGION }} 2>&1 || echo "No logs available yet"
               echo "---"
             fi
 

.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+  pull_request:
+  push:
+    branches-ignore:
+      - main
+
+jobs:
+  test:
+    name: Run tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run tests
+        run: make test
+
+      - name: Report test results
+        if: always()
+        run: |
+          if [ $? -eq 0 ]; then
+            echo "✅ All tests passed"
+          else
+            echo "❌ Tests failed"
+            exit 1
+          fi

docker-compose.yml

@@ -29,7 +29,7 @@ services:
       redis:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
+      test: ["CMD", "python", "-c", "import httpx; exit(0 if httpx.get('http://localhost:8000/health', timeout=2).status_code == 200 else 1)"]
       interval: 5s
       timeout: 3s
       retries: 10