Minor fixes

Author: dlzhry2nhs

.github/workflows/sonarcloud.yml

@@ -49,6 +49,8 @@ jobs:
       - name: Run unittest with batchprocessorfilter-coverage
         working-directory: batch_processor_filter
         id: batchprocessorfilter
+        env:
+          PYTHONPATH: ${{ github.workspace }}/batch_processor_filter/src:${{ github.workspace }}/batch_processor_filter/tests
         continue-on-error: true
         run: |
           poetry install

batch_processor_filter/Dockerfile

@@ -22,4 +22,4 @@ COPY src .
 RUN chmod 644 $(find . -type f) && chmod 755 $(find . -type d)
 # Build as non-root user
 USER 1001:1001
-CMD ["batch_processor_filter.lambda_handler"]
+CMD ["lambda_handler.lambda_handler"]

batch_processor_filter/poetry.lock

@@ -7,7 +7,8 @@ readme      = "README.md"
 packages    = [{include = "src"}]
 
 [tool.poetry.dependencies]
-python                  = "~3.11"
+python = "~3.11"
+coverage = "^7.9.1"
 
 [build-system]
 requires      = ["poetry-core ~= 1.5.0"]

batch_processor_filter/pyproject.toml

@@ -2,6 +2,7 @@
 
 from lambda_handler import lambda_handler
 
+
 class TestLambdaHandler(TestCase):
     def test_lambda_handler(self):
         result = lambda_handler({}, {})

batch_processor_filter/test/__init__.py batch_processor_filter/tests/__init__.pybatch_processor_filter/test/__init__.py renamed to batch_processor_filter/tests/__init__.py

@@ -4,7 +4,7 @@ sonar.organization=nhsdigital
 sonar.host.url=https://sonarcloud.io
 sonar.python.version=3.11
 sonar.exclusions=**/e2e/**,**/e2e_batch/**,**/temporary_sandbox/**,**/devtools/**,**/proxies/**,**/scripts/**,**/terraform/**,**/tests/**,redis_sync/src/log_decorator.py
-sonar.python.coverage.reportPaths=backend-coverage.xml,delta-coverage.xml,ack-lambda-coverage.xml,filenameprocessor-coverage.xml,recordforwarder-coverage.xml,recordprocessor-coverage.xml,mesh_processor-coverage.xml,redis_sync-coverage.xml,mns_subscription-coverage.xml,id_sync-coverage.xml,shared-coverage.xml
+sonar.python.coverage.reportPaths=backend-coverage.xml,delta-coverage.xml,ack-lambda-coverage.xml,filenameprocessor-coverage.xml,recordforwarder-coverage.xml,recordprocessor-coverage.xml,mesh_processor-coverage.xml,redis_sync-coverage.xml,mns_subscription-coverage.xml,id_sync-coverage.xml,shared-coverage.xml,batchprocessorfilter-coverage.xml
 sonar.cpd.exclusions=**/cache.py,**/authentication.py,**/test_cache.py,**/test_authentication.py,**/mns_service.py,**/errors.py,redis_sync/src/log_decorator.py,**/Dockerfile,lambdas/shared/src/common/**,filenameprocessor/src/logging_decorator.py
 sonar.issue.ignore.multicriteria=exclude_snomed_urls,exclude_hl7_urls
 sonar.issue.ignore.multicriteria.exclude_snomed_urls.ruleKey=python:S5332

…essor_filter/test/test_lambda_handler.py …ssor_filter/tests/test_lambda_handler.pybatch_processor_filter/test/test_lambda_handler.py renamed to batch_processor_filter/tests/test_lambda_handler.py batch_processor_filter/test/test_lambda_handler.py renamed to batch_processor_filter/tests/test_lambda_handler.py

@@ -1,7 +1,6 @@
 # FIFO SQS Queue - targeted by Filename Processor Lambda function
 resource "aws_sqs_queue" "batch_file_created" {
   name                        = "${local.short_prefix}-batch-file-created-queue.fifo"
-  policy                      = data.aws_iam_policy_document.batch_file_created_queue_policy.json
   fifo_queue                  = true
   content_based_deduplication = true # Optional, helps with deduplication
   visibility_timeout_seconds  = 900 # TODO - discuss and refine both this, max receives and DLQ