Merge branch 'main' into feature/eja-eli-385-remove-wildcard-resource-and-passrole-permissions

Author: eddalmond1

.gitignore

@@ -48,3 +48,5 @@ sandbox/specification/*
 /specification/tmp/*
 /tests/e2e/data/out*
 /tests/e2e/reports/*
+/tests/e2e/.temp/
+/tests/e2e/certs/

.tool-versions

@@ -3,8 +3,9 @@
 terraform 1.12.1
 pre-commit 4.2.0
 vale 3.11.2
-poetry 2.1.3
+poetry 2.1.4
 act 0.2.77
+nodejs 22.18.0
 
 # ==============================================================================
 # The section below is reserved for Docker image versions.

poetry.lock

@@ -63,6 +63,7 @@ jsonschema = "^4.24.0"
 behave = "^1.2.6"
 boto3 = "^1.38.42"
 python-dotenv = "^1.1.1"
+openapi-spec-validator = "^0.7.2"
 
 [tool.poetry-plugin-lambda-build]
 docker-image = "public.ecr.aws/sam/build-python3.13:1.139-x86_64"  # See https://gallery.ecr.aws/search?searchTerm=%22python%22&architecture=x86-64&popularRegistries=amazon&verified=verified&operatingSystems=Linux

pyproject.toml

@@ -1,7 +1,9 @@
 [pytest]
 python_files = *_tests.py test_*.py
 norecursedirs = .venv .eggs build dist utils
-addopts = --strict-markers
+#addopts = --strict-markers
 markers =
     e2e: end to end tests
     smoketest: suitable to run against all environments even production
+    functionale2eregression: functional regression tests
+    sandboxtests: tests to replicate example sandbox responses agreed with vita

pytest.ini

@@ -42,3 +42,5 @@ assets/
 # Logs
 *.log
 /helpers/output/
+/.hypothesis/unicode_data/15.1.0/charmap.json.gz
+/tests/.hypothesis/unicode_data/15.1.0/charmap.json.gz

tests/e2e/.env.example

@@ -0,0 +1,85 @@
+{
+  "request": {
+    "requestTimestamp": "2025-08-11 07:43:12.954767+00:00",
+    "headers": {
+      "xRequestId": null,
+      "xCorrelationId": null,
+      "nhsdEndUserOrganisationOds": null,
+      "nhsdApplicationId": null
+    },
+    "queryParams": {
+      "category": null,
+      "conditions": null,
+      "includeActions": null
+    },
+    "nhsNumber": "9900376001"
+  },
+  "response": {
+    "responseId": "0300f1e8-6004-4229-a972-29220f08b8e9",
+    "lastUpdated": "2025-08-11 07:43:13.267973+00:00",
+    "condition": [
+      {
+        "campaignId": "AUTO_RSV_ELI-376-01-Campaign-ID",
+        "campaignVersion": 1,
+        "iterationId": "AUTO_RSV_ELI-376-01-Iteration-ID",
+        "iterationVersion": 1,
+        "conditionName": "RSV",
+        "status": "actionable",
+        "statusText": "You should have the RSV vaccine",
+        "eligibilityCohorts": [
+          {
+            "cohortCode": "rsv_eli_376_cohort_1",
+            "cohortStatus": "actionable"
+          },
+          {
+            "cohortCode": "rsv_eli_376_cohort_2",
+            "cohortStatus": "actionable"
+          },
+          {
+            "cohortCode": "rsv_eli_376_cohort_3",
+            "cohortStatus": "actionable"
+          },
+          {
+            "cohortCode": "rsv_eli_376_cohort_4",
+            "cohortStatus": "actionable"
+          }
+        ],
+        "eligibilityCohortGroups": [
+          {
+            "cohortCode": "rsv_eli_376_cohort_group",
+            "cohortText": "are a member of eli_376_cohort_group_0",
+            "cohortStatus": "actionable"
+          },
+          {
+            "cohortCode": "rsv_eli_376_cohort_group",
+            "cohortText": "are a member of eli_376_cohort_group_10",
+            "cohortStatus": "actionable"
+          },
+          {
+            "cohortCode": "rsv_eli_376_cohort_group",
+            "cohortText": "are a member of eli_376_cohort_group_20",
+            "cohortStatus": "actionable"
+          },
+          {
+            "cohortCode": "rsv_eli_376_cohort_group_other",
+            "cohortText": "are a member of eli_376_cohort_group_other",
+            "cohortStatus": "actionable"
+          }
+        ],
+        "filterRules": null,
+        "suitabilityRules": null,
+        "actionRule": null,
+        "actions": [
+          {
+            "internalActionCode": "TEST_ACTION",
+            "actionType": "ButtonWithAuthLink",
+            "actionCode": "TestAction",
+            "actionDescription": "TestAction Description",
+            "actionUrl": "http://www.nhs.uk/book-rsv",
+            "actionUrlLabel": "Continue to booking"
+          }
+        ]
+      }
+    ]
+  }
+}