Feature/cdapi 55

.github/actions/start-local-lambda/action.yaml

@@ -8,7 +8,7 @@ inputs:
   health-path:
     description: "Health probe path to POST"
     required: false
-    default: "/2015-03-31/functions/function/invocations"
+    default: "/"
   max-seconds:
     description: "Maximum seconds to wait for readiness"
     required: false
@@ -26,25 +26,4 @@ runs:
       run: |
         set -euo pipefail
         echo "Starting local Lambda: '${{ inputs.deploy-command }}'"
-        nohup ${{ inputs.deploy-command }} >/tmp/lambda.log 2>&1 &
-        echo $! > /tmp/lambda.pid
-        echo "PID: $(cat /tmp/lambda.pid)"
-    - name: "Wait for Lambda to be ready"
-      shell: bash
-      run: |
-        set -euo pipefail
-        BASE_URL="${BASE_URL:-http://localhost:5001}"
-        HEALTH_URL="${BASE_URL}${{ inputs.health-path }}"
-        MAX="${{ inputs.max-seconds }}"
-        echo "Waiting for Lambda at ${HEALTH_URL} (max ${MAX}s)..."
-        for i in $(seq 1 "${MAX}"); do
-          if curl -sSf -X POST "${HEALTH_URL}" -d '{}' >/dev/null; then
-            echo "Lambda is ready"
-            exit 0
-          fi
-          sleep 1
-        done
-        echo "Lambda did not become ready in time"
-        echo "---- recent lambda log ----"
-        tail -n 200 /tmp/lambda.log || true
-        exit 1
+        bash -c "${{ inputs.deploy-command }}"

.github/workflows/preview-env.yaml

@@ -16,8 +16,9 @@ permissions:
 env:
   AWS_REGION: eu-west-2
   PREVIEW_PREFIX: pr-
+  PYTHON_VERSION: 3.14
   LAMBDA_RUNTIME: python3.14
-  LAMBDA_HANDLER: handler.handler
+  LAMBDA_HANDLER: lambda_handler.handler
 
 jobs:
   pr-preview:
@@ -34,13 +35,16 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548
         with:
-          python-version: "3.14"
+          python-version: "${{ env.PYTHON_VERSION }}"
+
+      - name: "Setup Python project"
+        uses: ./.github/actions/setup-python-project
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Package artifact
         run: |
-          cd infrastructure/environments/preview
-          rm -f artifact.zip
-          zip -r artifact.zip .
+          make build
 
       - name: Select AWS role inputs
         id: role-select
@@ -86,7 +90,7 @@ jobs:
       - name: Create or update preview Lambda (on open/sync/reopen)
         if: github.event.action != 'closed'
         run: |
-          cd infrastructure/environments/preview
+          cd pathology-api/target/
           FN="${{ steps.names.outputs.function_name }}"
           echo "Deploying preview function: $FN"
           wait_for_lambda_ready() {

.github/workflows/stage-2-test.yaml

@@ -1,7 +1,7 @@
 name: "Test stage"
 
 env:
-  BASE_URL: "http://localhost:5001"
+  BASE_URL: "http://localhost:5002"
   HOST: "localhost"
 
 on:

.gitignore

@@ -23,3 +23,4 @@ pathology-api/test-artefacts/
 **/.env
 
 **/.DS_Store
+**/.coverage

Makefile

@@ -9,6 +9,9 @@ docker := doas docker
 else
 docker := docker
 endif
+
+dockerNetwork := pathology-local
+
 # ==============================================================================
 
 # Example CI/CD targets are: dependencies, build, publish, deploy, clean, etc.
@@ -17,49 +20,66 @@ endif
 dependencies: # Install dependencies needed to build and test the project @Pipeline
 	cd pathology-api && poetry sync
 
-.PHONY: build-pathology-api
-build-pathology-api: dependencies
+.PHONY: build
+build: clean-artifacts dependencies
 	@cd pathology-api
 	@echo "Running type checks..."
 	@rm -rf target && rm -rf dist
 	@poetry run mypy --no-namespace-packages .
 	@echo "Packaging dependencies..."
 	@poetry build --format=wheel
-	@pip install "dist/pathology_api-0.1.0-py3-none-any.whl" --target "./target/pathology-api"
-	# Copy main file separately as it is not included within the package.
+	VERSION=$$(poetry version -s)
+	@pip install "dist/pathology_api-$$VERSION-py3-none-any.whl" --target "./target/pathology-api" --platform manylinux2014_x86_64 --only-binary=:all:
+	# Copy lambda_handler file separately as it is not included within the package.
 	@cp lambda_handler.py ./target/pathology-api/
-	@rm -rf ../infrastructure/images/pathology-api/resources/build/
-	@mkdir ../infrastructure/images/pathology-api/resources/build/
-	@cp -r ./target/pathology-api ../infrastructure/images/pathology-api/resources/build/
-	# Remove temporary build artefacts once build has completed
-	@rm -rf target && rm -rf dist
+	@cd ./target/pathology-api
+	@zip -r "../artifact.zip" .
+
+.PHONY: build-images
+build-images: build # Build the project artefact @Pipeline
+	@mkdir infrastructure/images/pathology-api/resources/build/
+	@cp pathology-api/target/artifact.zip infrastructure/images/pathology-api/resources/build/
+	@mkdir infrastructure/images/pathology-api/resources/build/pathology-api
+	@unzip infrastructure/images/pathology-api/resources/build/artifact.zip -d infrastructure/images/pathology-api/resources/build/pathology-api
 
-.PHONY: build
-build: build-pathology-api # Build the project artefact @Pipeline
 	@echo "Building Docker image using Docker. Utilising python version: ${PYTHON_VERSION} ..."
-	@$(docker) buildx build --load --provenance=false --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t localhost/pathology-api-image infrastructure/images/pathology-api
+	@$(docker) buildx build --load --platform=linux/amd64 --provenance=false --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t localhost/pathology-api-image infrastructure/images/pathology-api
 	@echo "Docker image 'pathology-api-image' built successfully!"
 
+	@echo "Building api-gateway-mock using Docker. Utilising python version: ${PYTHON_VERSION} ..."
+	@$(docker) buildx build --load --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t localhost/api-gateway-mock-image infrastructure/images/api-gateway-mock
+	@echo "Docker image 'api-gateway-mock-image' built successfully!"
+
 publish: # Publish the project artefact @Pipeline
 	# TODO: Implement the artefact publishing step
 
-deploy: clean build # Deploy the project artefact to the target environment @Pipeline
-	@if [[ -n "$${IN_BUILD_CONTAINER}" ]]; then \
-		echo "Starting using local docker network ..." ; \
-		$(docker) run --name pathology-api -p 5001:8080 --network pathology-local -d localhost/pathology-api-image ; \
-	else \
-		$(docker) run --name pathology-api -p 5001:8080 -d localhost/pathology-api-image ; \
-	fi
+deploy: clean-docker build-images # Deploy the project artefact to the target environment @Pipeline
+	$(docker) network create $(dockerNetwork) || echo "Docker network '$(dockerNetwork)' already exists."
+	$(docker) run  --platform linux/amd64 --name pathology-api -p 5001:8080 --network $(dockerNetwork) -d localhost/pathology-api-image
+	$(docker) run --name api-gateway-mock -p 5002:5000 --network $(dockerNetwork) -d localhost/api-gateway-mock-image
+
+clean-artifacts:
+	@echo "Removing build artefacts..."
+	@rm -rf infrastructure/images/pathology-api/resources/build/
+	@rm -rf pathology-api/target && rm -rf pathology-api/dist
 
-clean:: stop # Clean-up project resources (main) @Operations
+clean-docker: stop
 	@echo "Removing pathology API container..."
 	@$(docker) rm pathology-api || echo "No pathology API container currently exists."
 
+	@echo "Removing api-gateway-mock container..."
+	@$(docker) rm api-gateway-mock || echo "No api-gateway-mock container currently exists."
+
+clean:: clean-artifacts clean-docker  # Clean-up project resources (main) @Operations
+
 .PHONY: stop
 stop:
 	@echo "Stopping pathology API container..."
 	@$(docker) stop pathology-api || echo "No pathology API container currently running."
 
+	@echo "Stopping api-gateway-mock container..."
+	@$(docker) stop api-gateway-mock || echo "No api-gateway-mock container currently running."
+
 config:: # Configure development environment (main) @Configuration
 	# Configure poetry to trust dev certificate if specified
 	@if [[ -n "$${DEV_CERTS_INCLUDED}" ]]; then \

infrastructure/images/api-gateway-mock/Dockerfile

@@ -0,0 +1,12 @@
+# Retrieve the python version from build arguments, deliberately set to "invalid" by default to highlight when no version is provided when building the container.
+ARG PYTHON_VERSION=invalid
+# Use the specified python version to retrieve the required base lambda image.
+ARG url=python:${PYTHON_VERSION}-alpine3.23
+FROM $url
+
+COPY resources/ /resources
+WORKDIR /resources
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+ENTRYPOINT ["flask", "--app", "server", "run", "--host=0.0.0.0"]

infrastructure/images/api-gateway-mock/resources/requirements.txt

@@ -0,0 +1,2 @@
+flask==3.1.2
+requests==2.32.5

infrastructure/images/api-gateway-mock/resources/server.py

@@ -0,0 +1,72 @@
+from logging.config import dictConfig
+
+import requests
+from flask import Flask, request
+
+# Very simple logging configuration taken from https://flask.palletsprojects.com/en/stable/logging/
+dictConfig(
+    {
+        "version": 1,
+        "formatters": {
+            "default": {
+                "format": "[%(asctime)s] %(levelname)s in %(module)s: %(message)s",
+            },
+        },
+        "handlers": {
+            "wsgi": {
+                "class": "logging.StreamHandler",
+                "stream": "ext://sys.stdout",
+                "formatter": "default",
+            }
+        },
+        "root": {"level": "INFO", "handlers": ["wsgi"]},
+    }
+)
+
+app = Flask(__name__)
+
+
+@app.route("/", methods=["POST", "GET"], defaults={"path_params": None})
+@app.route("/<path:path_params>", methods=["POST", "GET"])
+def forward_request(path_params):
+    app.logger.info("received request with data: %s", request.get_data(as_text=True))
+
+    response = requests.post(
+        "http://pathology-api:8080/2015-03-31/functions/function/invocations",
+        json={
+            "body": request.get_data(as_text=True).replace("\n", "").replace(" ", ""),
+            "requestContext": {
+                "http": {
+                    "path": f"/{path_params}",
+                    "method": request.method,
+                },
+                "requestId": "request-id",
+                "stage": "$default",
+            },
+            "httpMethod": request.method,
+            "rawPath": f"/{path_params}",
+            "rawQueryString": "",
+            "pathParameters": {"proxy": path_params},
+        },
+        headers={"Content-Type": "application/json"},
+        timeout=120,
+    )
+
+    app.logger.info(
+        "response: status_code=%s, body=%s", response.status_code, response.text
+    )
+
+    app.logger.info("response: %s", response.text)
+    response_data = response.json()
+
+    output = (
+        (
+            response_data["body"],
+            response_data["statusCode"],
+            response_data["headers"],
+        )
+        if "body" in response_data
+        else (response_data, 500, {"Content-Type": "text/plain"})
+    )
+
+    return output