Add dp client

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
   static_code_analysis:
     uses: sidkos/metadata_server/.github/workflows/static_code_analysis.yml@main
     with:
-      build_and_install_script: "./scripts/build_and_install_open_api_client.sh"
+      build_and_install_script: "./scripts/build_and_install_dp_client.sh"
     secrets: inherit
 
   openapi-validation:

.github/workflows/ci_cd.yml

@@ -28,3 +28,15 @@ jobs:
       file: "Dockerfile"
       image_name: "metadata_server"
     secrets: inherit
+
+  component-tests:
+    name: 🧩 🔍 Component Tests
+    needs: build-server-image
+    uses: sidkos/metadata_server/.github/workflows/component_tests.yml@main
+    with:
+      image_name: "metadata_server"
+      image_tag: "latest"
+      tests_path: "./tests/component"
+      tests_command: "pytest"
+      build_and_install_script: "./scripts/build_and_install_dp_client.sh"
+    secrets: inherit

.github/workflows/component_tests.yml

@@ -0,0 +1,163 @@
+name: 🧩 🔍 🧱 Component Tests
+run-name: "Image: ${{ inputs.image_name }}:${{ inputs.image_tag }} | Command: ${{ inputs.tests_command }} Context: ${{ inputs.tests_path }}"
+
+on:
+  workflow_call:
+    inputs:
+      image_name:
+        description: 'Container image name (without registry and owner)'
+        required: false
+        type: string
+        default: 'metadata_server'
+      image_tag:
+        description: 'Container image tag'
+        required: false
+        type: string
+        default: 'latest'
+      tests_path:
+        description: 'Path to component tests'
+        required: false
+        type: string
+        default: './tests/component'
+      tests_command:
+        description: 'Command to run the tests'
+        required: false
+        type: string
+        default: 'pytest'
+      build_and_install_script:
+        description: 'Script to build and install client packages (dp-client)'
+        required: false
+        type: string
+        default: './scripts/build_and_install_dp_client.sh'
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to run the workflow on'
+        required: true
+        type: string
+      image_name:
+        description: 'Container image name (without registry and owner)'
+        required: false
+        type: string
+        default: 'metadata_server'
+      image_tag:
+        description: 'Container image tag'
+        required: false
+        type: string
+        default: 'latest'
+      tests_path:
+        description: 'Path to component tests'
+        required: false
+        type: string
+        default: './tests/component'
+      tests_command:
+        description: 'Command to run the tests'
+        required: false
+        type: string
+        default: 'pytest'
+      build_and_install_script:
+        description: 'Script to build and install client packages (dp-client)'
+        required: false
+        type: string
+        default: './scripts/build_and_install_dp_client.sh'
+
+permissions:
+  id-token: write
+  contents: write
+
+jobs:
+  component-tests:
+    name: "🧩 🔍 Component Tests"
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    defaults:
+      run:
+        shell: bash
+
+    services:
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_DB: ${{ vars.POSTGRES_DB }}
+          POSTGRES_USER: ${{ vars.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ vars.POSTGRES_PASSWORD }}
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd="pg_isready -U ${{ vars.POSTGRES_USER }}"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+    env:
+      DJANGO_SECRET_KEY: ${{ secrets.DJANGO_SECRET_KEY }}
+      DJANGO_DEBUG: ${{ vars.DJANGO_DEBUG }}
+      DJANGO_ALLOWED_HOSTS: ${{ vars.DJANGO_ALLOWED_HOSTS }}
+      TEST_USERNAME: ${{ vars.TEST_USERNAME }}
+      TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
+      METADATA_HOST: localhost
+      METADATA_PORT: 8000
+      POSTGRES_HOST: localhost
+      POSTGRES_PORT: "5432"
+      POSTGRES_DB: ${{ vars.POSTGRES_DB }}
+      POSTGRES_USER: ${{ vars.POSTGRES_USER }}
+      POSTGRES_PASSWORD: ${{ vars.POSTGRES_PASSWORD }}
+
+    steps:
+      - name: SetUp Python Project
+        uses: sidkos/metadata_server/.github/actions/setup_python_project@main
+
+      - name: Print runner env
+        run: env | sort
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      - name: Pull server image
+        run: |
+          IMAGE_REF="ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.image_tag }}"
+          echo "Pulling $IMAGE_REF"
+          docker pull "$IMAGE_REF"
+          echo "IMAGE_REF=$IMAGE_REF" >> $GITHUB_ENV
+
+      - name: Run server container
+        run: |
+          DB_PORT=${{ env.POSTGRES_PORT }}
+          docker run -d --name metadata-server \
+            --add-host=host.docker.internal:host-gateway \
+            -p 8000:8000 \
+            -e DJANGO_SECRET_KEY \
+            -e DJANGO_DEBUG \
+            -e DJANGO_ALLOWED_HOSTS \
+            -e POSTGRES_DB \
+            -e POSTGRES_USER \
+            -e POSTGRES_PASSWORD \
+            -e POSTGRES_HOST=host.docker.internal \
+            -e POSTGRES_PORT=$DB_PORT \
+            -e TEST_USERNAME \
+            -e TEST_PASSWORD \
+            -v "${{ github.workspace }}/scripts:/app/scripts:ro" \
+            "$IMAGE_REF" \
+            bash /app/scripts/start_server_in_container.sh
+
+      - name: Wait for server to be ready
+        run: |
+          for i in {1..30}; do
+            if curl -fsS "http://${{ env.METADATA_HOST }}:${{ env.METADATA_PORT }}/api/health/" >/dev/null; then
+              echo "Server is ready"; exit 0
+            fi
+            echo "Waiting for server... ($i)"; sleep 2
+          done
+          echo "Server did not become ready in time"; docker logs metadata-server || true; exit 1
+
+      - name: Build and install dp-client
+        if: ${{ inputs.build_and_install_script }}
+        run: ${{ inputs.build_and_install_script }}
+
+      - name: Run Component Tests
+        run: "python -m ${{ inputs.tests_command }} ${{ inputs.tests_path }} -s -v"

Dockerfile

@@ -8,6 +8,8 @@ COPY requirements.txt .
 RUN pip install --upgrade pip && pip install -r requirements.txt
 
 COPY src/ ./src/
+COPY scripts/start_server_in_container.sh /app/scripts/start_server_in_container.sh
+RUN chmod +x /app/scripts/start_server_in_container.sh
 
-CMD ["bash", "-c", "python src/manage.py migrate && python src/manage.py runserver 0.0.0.0:8000"]
+CMD ["bash", "/app/scripts/start_server_in_container.sh"]