Merge branch 'VED-81-Number-Update' into VED-480-Number-Update-terraform

Author: JamesW1-NHS

.github/workflows/sonarcloud.yml

@@ -145,6 +145,13 @@ jobs:
             poetry install
             poetry run coverage run -m unittest discover || echo "shared tests failed" >> ../../failed_tests.txt
             poetry run coverage xml -o ../../shared-coverage.xml
+            ls ../../shared-coverage.xml
+            # show director of ../.. as absolute path
+            echo "Parent directory of shared-coverage.xml: $(pwd)/../../"
+            #check files created
+            if [ ! -f ../../shared-coverage.xml ]; then
+              echo "shared-coverage.xml not found"
+            fi
 
       - name: Run unittest with id_sync
         working-directory: lambdas/id_sync
@@ -168,6 +175,7 @@ jobs:
         run: |
           echo "Checking for test failures..."
           ls *-coverage.xml
+          cat shared-coverage.xml || echo "shared-coverage.xml not found"
           if [ -s failed_tests.txt ]; then
             echo "The following tests failed:"
             cat failed_tests.txt

.gitignore

@@ -31,3 +31,4 @@ openapi.json
 devtools/volume/
 backend/tests/.coverage
 redis_sync/.vscode/settings.json.default
+lambdas/shared/.coverage

lambdas/shared/.coverage

@@ -1,17 +1,20 @@
-
 test:
-	@PYTHONPATH=src python -m unittest discover -s tests -p "test_*.py" -v
+    @PYTHONPATH=src python -m unittest discover -s tests -p "test_*.py" -v
 
 test-list:
-	@PYTHONPATH=src:tests:tests python -m unittest discover -s tests/common -p "test_*.py" --verbose | grep test_
+    @PYTHONPATH=src:tests python -m unittest discover -s tests -p "test_*.py" --verbose | grep test_
 
 coverage-run:
-	@PYTHONPATH=src:tests coverage run -m unittest discover -v
+    @PYTHONPATH=src coverage run --source=src -m unittest discover -s tests -p "test_*.py" -v
 
 coverage-report:
-	coverage report -m
+    @PYTHONPATH=src coverage report -m
 
 coverage-html:
-	coverage html
+    @PYTHONPATH=src coverage html
+
+coverage: coverage-run coverage-report
+
+coverage-full: coverage-run coverage-report coverage-html
 
-.PHONY: build package test
+.PHONY: build package test test-list coverage-run coverage-report coverage-html coverage coverage-full

lambdas/shared/Makefile

@@ -13,8 +13,7 @@ description = ""
 authors = ["s.wates <[email protected]>"]
 readme = "README.md"
 packages = [
-    {include = "common", from = "src"},
-    {include = "aws", from = "src"}
+    {include = "common", from = "src"}
 ]
 
 [tool.poetry.dependencies]

lambdas/shared/pyproject.toml

@@ -42,6 +42,28 @@ def test_repr(self):
         self.assertIn("abc-123", repr(record))
         self.assertTrue(repr(record).startswith("<SQSEventRecord"))
 
+    def test_initialization(self):
+        record = SQSEventRecord(
+            message_id="test-id",
+            receipt_handle="test-handle",
+            body="{}",
+            attributes={},
+            message_attributes={},
+            md5_of_body="test-md5",
+            event_source="aws:sqs",
+            event_source_arn="my-arn",
+            aws_region="us-east-1"
+        )
+        self.assertEqual(record.message_id, "test-id")
+        self.assertEqual(record.receipt_handle, "test-handle")
+        self.assertEqual(record.body, "{}")
+        self.assertEqual(record.attributes, {})
+        self.assertEqual(record.message_attributes, {})
+        self.assertEqual(record.md5_of_body, "test-md5")
+        self.assertEqual(record.event_source, "aws:sqs")
+        self.assertEqual(record.event_source_arn, "my-arn")
+        self.assertEqual(record.aws_region, "us-east-1")
+
 
 if __name__ == '__main__':
     unittest.main()

lambdas/shared/tests/test_common/test_sqs_event_record.py

@@ -3,7 +3,8 @@ sonar.projectKey=NHSDigital_immunisation-fhir-api
 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/**,lambdas/redis_sync/src/log_decorator.py,lambdas/shared/src/common/log_decorator.py,lambdas/shared/src/common/clients.py,lambdas/id_sync/src/id_sync.py
+sonar.spd.exclusions=lambdas/redis_sync/src/log_decorator.py,lambdas/shared/src/common/log_decorator.py,lambdas/shared/src/common/clients.py,lambdas/id_sync/src/id_sync.py
+sonar.exclusions=**/e2e/**,**/e2e_batch/**,**/temporary_sandbox/**,**/devtools/**,**/proxies/**,**/scripts/**,**/terraform/**,**/tests/**
 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,id_sync-coverage.xml,shared-coverage.xml
 sonar.issue.ignore.multicriteria=exclude_snomed_urls,exclude_hl7_urls
 sonar.issue.ignore.multicriteria.exclude_snomed_urls.ruleKey=python:S5332