Mesh code refactoring

Author: Valswyn-NHS

.github/workflows/sonarcloud.yml

@@ -13,7 +13,6 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependency') }}
     runs-on: ubuntu-latest
 
-    
     steps:
       - uses: actions/checkout@v4
         with:
@@ -26,10 +25,10 @@ jobs:
         run: |
           aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
           aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
-      
+
       - name: Initialize Unit Test Failure Tracker
         run: echo "false" > test_failed.txt
-          
+
       - name: Run unittest with filenameprocessor-coverage
         id: filenameprocessor
         continue-on-error: true
@@ -38,23 +37,20 @@ jobs:
           poetry run coverage run --source=filenameprocessor -m unittest discover -s filenameprocessor || echo "filenameprocessor tests failed" >> failed_tests.txt
           poetry run coverage xml -o sonarcloud-coverage-filenameprocessor-coverage.xml
 
-      
       - name: Run unittest with recordprocessor-coverage
         id: recordprocessor
         continue-on-error: true
         run: |
           poetry run coverage run --source=recordprocessor -m unittest discover -s recordprocessor || echo "recordprocessor tests failed" >> failed_tests.txt
           poetry run coverage xml -o sonarcloud-coverage-recordprocessor-coverage.xml
 
-
       - name: Run unittest with recordforwarder-coverage
         id: recordforwarder
         continue-on-error: true
         run: |
           PYTHONPATH=$(pwd)/backend:$(pwd)/backend/tests poetry run coverage run --source=backend -m unittest discover -s backend/tests -p "*batch*.py" || echo "recordforwarder tests failed" >> failed_tests.txt
           poetry run coverage xml -o sonarcloud-coverage-recordforwarder-coverage.xml
 
-          
       - name: Run unittest with coverage-ack-lambda
         id: acklambda
         continue-on-error: true
@@ -70,22 +66,22 @@ jobs:
           pip install poetry==1.8.4 mypy-boto3-dynamodb==1.35.54 boto3==1.26.165 coverage botocore==1.29.165 jmespath==1.0.1 python-dateutil==2.9.0 urllib3==1.26.20 s3transfer==0.6.2 typing-extensions==4.12.2
           poetry run coverage run --source=delta_backend -m unittest discover -s delta_backend || echo "delta tests failed" >> failed_tests.txt
           poetry run coverage xml -o sonarcloud-coverage-delta.xml
-      
+
       - name: Run unittest with coverage-fhir-api
         id: fhirapi
         continue-on-error: true
         run: |
           pip install poetry==1.8.4 moto==4.2.11 coverage redis botocore==1.35.49 simplejson responses structlog fhir.resources jsonpath_ng pydantic==1.10.13 requests aws-lambda-typing cffi pyjwt boto3-stubs-lite[dynamodb]~=1.26.90 python-stdnum==1.20
           poetry run coverage run --source=backend -m unittest discover -s backend || echo "fhir-api tests failed" >> failed_tests.txt
           poetry run coverage xml -o sonarcloud-coverage.xml
-      
+
       - name: Run unittest with coverage-mesh-processor
         id: meshprocessor
         continue-on-error: true
         run: |
           pip install poetry==1.8.4 moto==4.2.11 coverage redis botocore==1.35.49 simplejson responses structlog fhir.resources jsonpath_ng pydantic==1.10.13 requests aws-lambda-typing cffi pyjwt boto3-stubs-lite[dynamodb]~=1.26.90 python-stdnum==1.20
-          poetry run coverage run --source=meshfileprocessor -m unittest discover -s meshfileprocessor || echo "meshfileprocessor tests failed" >> failed_tests.txt
-          poetry run coverage xml -o sonarcloud-meshfileprocessor-coverage.xml
+          poetry run coverage run --source=mesh_processor -m unittest discover -s mesh_processor || echo "mesh_processor tests failed" >> failed_tests.txt
+          poetry run coverage xml -o sonarcloud-mesh_processor-coverage.xml
 
       - name: Run Test Failure Summary
         id: check_failure
@@ -106,5 +102,5 @@ jobs:
       - name: SonarCloud Scan
         uses: SonarSource/sonarqube-scan-action@master
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

meshfileprocessor/Dockerfile mesh_processor/Dockerfilemeshfileprocessor/Dockerfile renamed to mesh_processor/Dockerfile

@@ -6,16 +6,11 @@ RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:' >> /etc/group && \
     chown -R 1001:1001 /home/appuser && pip install "poetry~=1.5.0"
 
-# Install Poetry as root
+
+
 COPY poetry.lock pyproject.toml README.md ./
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main
 
-# -----------------------------
-# FROM base AS test
-# COPY src src
-# COPY tests tests
-# RUN poetry install --no-interaction --no-ansi --no-root && \
-#     pytest --disable-warnings tests
 
 # -----------------------------
 FROM base AS build

mesh_processor/Makefile

@@ -0,0 +1,8 @@
+build:
+	docker build -t mesh-lambda-build .
+
+package: build
+	mkdir -p build
+	docker run --rm -v $(shell pwd)/build:/build mesh-lambda-build
+
+.PHONY: build package