Merge branch 'main' into feature/CCM-13711_test-data-variations-2

Author: masl2

.env.template

@@ -3,3 +3,27 @@ API_KEY=
 HEADERAUTH=
 PR_NUMBER=prxx # remove if needs to run against main
 NHSD_APIM_TOKEN=
+PROXY_NAME=
+# * nhs-notify-supplier--internal-dev--nhs-notify-supplier
+# * nhs-notify-supplier--internal-dev--nhs-notify-supplier-PR-XX
+# * nhs-notify-supplier--ref--nhs-notify-supplier -- ref env
+
+# API Keys
+# ========
+# In order to find out the value of an environments given API key, follow these steps
+# 1. Log in to Non-Prod
+# 2. Navigate to 'Publish' > 'Apps' and search for the app linked to authentication
+# 3. Copy the "key" from the Credentials related to the app
+# Note: For INT and higher environments use developer portal https://identity.prod.api.platform.nhs.uk/
+export NON_PROD_API_KEY=xxx
+export INTEGRATION_API_KEY=xxx
+export PRODUCTION_API_KEY=xxx
+
+# Private Keys
+# ============
+# private key used to generate authentication for tests ran against the internal-dev and internal-qa
+export NON_PROD_PRIVATE_KEY=xxx # path to the private key file
+# private key used to generate authentication for tests ran against the int environment
+export INTEGRATION_PRIVATE_KEY=xxx
+# private key used to generate authentication for tests ran against the prod environment
+export PRODUCTION_PRIVATE_KEY=xxx

.gitignore

@@ -32,6 +32,13 @@ dist
 /specification/api/components/security/security.yml
 /specification/api/components/parameters/authorization/authorization.yml
 /scripts/JWT/*.pem
+/tests/e2e-tests/test-report.xml
 
 # ignore PACTS
 .pacts
+
+# python venvs
+.venv/
+venv/
+env/
+ENV/

Makefile

@@ -121,3 +121,54 @@ ${VERBOSE}.SILENT: \
 	config \
 	dependencies \
 	deploy \
+
+#####################
+# E2E Test commands #
+#####################
+
+TEST_CMD := APIGEE_ACCESS_TOKEN="$(APIGEE_ACCESS_TOKEN)" \
+	PYTHONPATH=. poetry run pytest --disable-warnings -vv \
+	--color=yes \
+	-n 4 \
+	--api-name=nhs-notify-supplier \
+	--proxy-name="$(PROXY_NAME)" \
+	-s \
+	--reruns 5 \
+	--reruns-delay 5 \
+	--only-rerun 'AssertionError: Unexpected 429' \
+	--only-rerun 'AssertionError: Unexpected 504' \
+	--only-rerun 'AssertionError: Unexpected 502' \
+	--junitxml=test-report.xml
+
+
+.internal-dev-test:
+	@cd tests/e2e-tests && \
+	$(TEST_CMD) \
+	api \
+	-m devtest
+
+.integration-test:
+	$(TEST_CMD) \
+	tests/api \
+	-m inttest
+
+
+PROD_CMD := APIGEE_ACCESS_TOKEN="$(APIGEE_ACCESS_TOKEN)" \
+	PYTHONPATH=. poetry run pytest --disable-warnings -vv \
+	--color=yes \
+	-n 4 \
+	--api-name=nhs-notify-supplier \
+	--proxy-name="$(PROXY_NAME)" \
+	-s \
+	--reruns 5 \
+	--reruns-delay 5 \
+	--only-rerun 'AssertionError: Unexpected 429' \
+	--only-rerun 'AssertionError: Unexpected 504' \
+	--only-rerun 'AssertionError: Unexpected 502' \
+	--junitxml=test-report.xml
+
+.prod-test:
+	@cd tests/e2e-tests && \
+	$(PROD_CMD) \
+	tests/api \
+	-m prodtest

infrastructure/terraform/components/api/module_lambda_get_letter.tf

@@ -24,7 +24,7 @@ module "get_letter" {
   function_include_common = true
   handler_function_name   = "getLetter"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 

infrastructure/terraform/components/api/module_lambda_get_letters.tf

@@ -24,7 +24,7 @@ module "get_letters" {
   function_include_common = true
   handler_function_name   = "getLetters"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 1024
   timeout                 = 29
   log_level               = var.log_level
 

infrastructure/terraform/components/api/module_lambda_get_status.tf

@@ -24,7 +24,7 @@ module "get_status" {
   function_include_common = true
   handler_function_name   = "getStatus"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 

infrastructure/terraform/components/api/module_lambda_letter_status_update.tf

@@ -24,7 +24,7 @@ module "letter_status_update" {
   function_include_common = true
   handler_function_name   = "letterStatusUpdate"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 

infrastructure/terraform/components/api/module_lambda_mi_updates_transformer.tf

@@ -24,7 +24,7 @@ module "mi_updates_transformer" {
   function_include_common = true
   handler_function_name   = "handler"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 

infrastructure/terraform/components/api/module_lambda_patch_letter.tf

@@ -24,7 +24,7 @@ module "patch_letter" {
   function_include_common = true
   handler_function_name   = "patchLetter"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level
 

infrastructure/terraform/components/api/module_lambda_post_mi.tf

@@ -24,7 +24,7 @@ module "post_mi" {
   function_include_common = true
   handler_function_name   = "postMI"
   runtime                 = "nodejs22.x"
-  memory                  = 128
+  memory                  = 512
   timeout                 = 29
   log_level               = var.log_level