NRL-1666 Ran tests against perftest env, yay 🎉

Author: anjalitrace2-nhs

Makefile

@@ -13,9 +13,13 @@ TF_WORKSPACE_NAME ?= $(shell terraform -chdir=terraform/infrastructure workspace
 ENV ?= dev
 ACCOUNT ?= dev
 APP_ALIAS ?= default
-HOST ?= $(TF_WORKSPACE_NAME).api.record-locator.$(ENV).national.nhs.uk
+# HOST ?= $(TF_WORKSPACE_NAME).api.record-locator.$(ENV).national.nhs.uk
+# HOST ?= dev.api.record-locator.$(ENV).national.nhs.uk
+# HOST ?= perftest.record-locator.national.nhs.uk
+HOST ?= api.perftest.record-locator.national.nhs.uk
 ENV_TYPE ?= $(ENV)
-PERFTEST_TABLE_NAME ?= nhsd-nrlf--xaxel-deleteme-pointers-table
+# PERFTEST_TABLE_NAME ?= nhsd-nrlf--xaxel-deleteme-pointers-table
+PERFTEST_TABLE_NAME ?= perftest
 
 export PATH := $(PATH):$(PWD)/.venv/bin
 export USE_SHARED_RESOURCES := $(shell poetry run python scripts/are_resources_shared_for_stack.py $(TF_WORKSPACE_NAME))
@@ -253,18 +257,30 @@ generate-perftest-permissions: ## Generate perftest permissions and add to nrlf_
 
 # Run producer performance tests with configurable HOST and ENV_TYPE
 perftest-producer:
-	@echo "Running producer performance tests with HOST=$(HOST) and ENV_TYPE=$(ENV_TYPE)"
-	k6 run tests/performance/producer/perftest.js -e HOST=$(HOST) -e ENV_TYPE=$(ENV_TYPE) -e PERFTEST_TABLE_NAME=$(PERFTEST_TABLE_NAME)
+	@echo "Running producer performance tests with HOST=$(HOST) and ENV_TYPE=$(ENV_TYPE) and DIST_PATH=$(DIST_PATH)"
+	k6 run tests/performance/producer/perftest.js -e HOST=$(HOST) -e ENV_TYPE=$(ENV_TYPE) -e DIST_PATH=$(DIST_PATH)
 
+
+# perftest-consumer: perftest-prep-generate-pointer-table-extract generate-perftest-permissions
 perftest-consumer:
-	@echo "Running consumer performance tests with HOST=$(HOST) and ENV_TYPE=$(ENV_TYPE)"
-	k6 run tests/performance/consumer/perftest.js -e HOST=$(HOST) -e ENV_TYPE=$(ENV_TYPE)
+	@echo "Running consumer performance tests with HOST=$(HOST) and ENV_TYPE=$(ENV_TYPE) and DIST_PATH=$(DIST_PATH)"
+	k6 run tests/performance/consumer/perftest.js -e ENV_TYPE=$(ENV_TYPE) -e DIST_PATH=$(DIST_PATH) -e HOST=$(HOST)
+
+perftest-prep-generate-producer-data:
+	mkdir -p $(DIST_PATH)
+	PYTHONPATH=. poetry run python tests/performance/perftest_environment.py generate_producer_data --output_dir="$(DIST_PATH)"
 
-# Generates input csv for a given table
-perftest-prepare:
+perftest-prep-extract-consumer-data:
 	mkdir -p $(DIST_PATH)
-	PYTHONPATH=. poetry run python tests/performance/perftest_environment.py generate_pointer_table_extract $(PERFTEST_TABLE_NAME)
+	PYTHONPATH=. poetry run python tests/performance/perftest_environment.py extract_consumer_data --output_dir="$(DIST_PATH)"
+
+perftest-prep-generate-pointer-table-extract:
+	mkdir -p $(DIST_PATH)
+	PYTHONPATH=. poetry run python tests/performance/perftest_environment.py generate_pointer_table_extract --output_dir="$(DIST_PATH)"
+
+perftest-prepare: perftest-prep-generate-producer-data perftest-prep-extract-consumer-data perftest-prep-generate-pointer-table-extract
+	@echo "Prepared performance tests with PERFTEST_TABLE_NAME=$(PERFTEST_TABLE_NAME) and DIST_PATH=$(DIST_PATH)"
 
-perftest-seed-data: perftest-prepare
-	@echo "Seeding dynamo with data for performance tests with HOST=$(HOST) and ENV_TYPE=$(ENV_TYPE)"
-	poetry run python tests/performance/consumer/perftest.js --table_name="" --px_with_pointers="" --pointers_per_px="" --type_dists="" --custodian_dists=""
+# perftest-seed-data: perftest-prepare
+# 	@echo "Seeding dynamo with data for performance tests with table_name=$(PERFTEST_TABLE_NAME) and ENV_TYPE=$(ENV_TYPE)"
+# 	poetry run python tests/performance/consumer/perftest.js --table_name="$(PERFTEST_TABLE_NAME)" --px_with_pointers="" --pointers_per_px="" --type_dists="" --custodian_dists=""

tests/performance/consumer/client_perftest.js

@@ -3,16 +3,23 @@ import { check } from "k6";
 import exec from "k6/execution";
 import { CATEGORY_TYPE_GROUPS } from "../type-category-mappings.js";
 
-const csv = open("../producer_reference_data.csv");
+const csvPath = __ENV.DIST_PATH
+  ? `../../../${__ENV.DIST_PATH}/producer_reference_data.csv`
+  : "../producer_reference_data.csv";
+const csv = open(csvPath);
 const lines = csv.trim().split("\n");
 // Skip header
 const dataLines = lines.slice(1);
 
+// console.log("__ENV", JSON.stringify(__ENV, null, 2));
+console.log("__ENV.HOST", JSON.stringify(__ENV.HOST, null, 2));
+
 function getNextPointer() {
-  // pick the next line accoording to iteration in scenario
+  // pick the next line according to iteration in scenario
   const iter = exec.vu.iterationInScenario;
   const index = iter % dataLines.length;
   const line = dataLines[index];
+  console.log("🚀 ~ getNextPointer ~ line:", line);
   const [count, pointer_id, pointer_type, custodian, nhs_number] = line
     .split(",")
     .map((field) => field.trim());
@@ -43,6 +50,7 @@ function getCustodianFromPointerId(pointer_id) {
 function checkResponse(res) {
   const is_success = check(res, { "status is 200": (r) => r.status === 200 });
   if (!is_success) {
+    console.log("🚀 ~ checkResponse ~ res.status:", res.status);
     console.warn(res.json());
   }
 }
@@ -60,6 +68,11 @@ export function countDocumentReference() {
   const identifier = encodeURIComponent(
     `https://fhir.nhs.uk/Id/nhs-number|${nhs_number}`
   );
+
+  console.log(
+    "🚀 ~ countDocumentReference ~ `https://${__ENV.HOST}/consumer/DocumentReference?_summary=count&subject:identifier=${identifier}`:",
+    `https://${__ENV.HOST}/consumer/DocumentReference?_summary=count&subject:identifier=${identifier}`
+  );
   const res = http.get(
     `https://${__ENV.HOST}/consumer/DocumentReference?_summary=count&subject:identifier=${identifier}`,
     {
@@ -73,6 +86,8 @@ export function readDocumentReference() {
   const { pointer_id } = getNextPointer();
   const custodian = getCustodianFromPointerId(pointer_id);
 
+  console.log("🚀 ~ countDocumentReference ~ __ENV.HOST:", __ENV.HOST);
+
   const res = http.get(
     `https://${__ENV.HOST}/consumer/DocumentReference/${pointer_id}`,
     {
@@ -92,6 +107,8 @@ export function searchDocumentReference() {
   );
   const type = encodeURIComponent(`http://snomed.info/sct|${pointer_type}`);
 
+  console.log("🚀 ~ countDocumentReference ~ __ENV.HOST:", __ENV.HOST);
+
   const res = http.get(
     `https://${__ENV.HOST}/consumer/DocumentReference?subject:identifier=${identifier}&type=${type}`,
     {
@@ -113,6 +130,8 @@ export function searchDocumentReferenceByCategory() {
     `http://snomed.info/sct|${category_code}`
   );
 
+  console.log("🚀 ~ countDocumentReference ~ __ENV.HOST:", __ENV.HOST);
+
   const res = http.get(
     `https://${__ENV.HOST}/consumer/DocumentReference?subject:identifier=${identifier}&category=${category}`,
     {
@@ -131,6 +150,8 @@ export function searchPostDocumentReference() {
     type: `http://snomed.info/sct|${pointer_type}`,
   });
 
+  console.log("🚀 ~ countDocumentReference ~ __ENV.HOST:", __ENV.HOST);
+
   const res = http.post(
     `https://${__ENV.HOST}/consumer/DocumentReference/_search`,
     body,
@@ -151,6 +172,8 @@ export function searchPostDocumentReferenceByCategory() {
     category: `http://snomed.info/sct|${category_code}`,
   });
 
+  console.log("🚀 ~ countDocumentReference ~ __ENV.HOST:", __ENV.HOST);
+
   const res = http.post(
     `https://${__ENV.HOST}/consumer/DocumentReference/_search`,
     body,
@@ -168,6 +191,8 @@ export function countPostDocumentReference() {
   const body = JSON.stringify({
     "subject:identifier": `https://fhir.nhs.uk/Id/nhs-number|${nhs_number}`,
   });
+
+  console.log("🚀 ~ countDocumentReference ~ __ENV.HOST:", __ENV.HOST);
   const res = http.post(
     `https://${__ENV.HOST}/consumer/DocumentReference/_search?_summary=count`,
     body,
@@ -193,6 +218,9 @@ export function searchPostDocumentReferenceAccessDenied() {
     "nrl.ods-code": deniedCustodian,
     "nrl.app-id": "K6PerformanceTest",
   });
+
+  console.log("🚀 ~ countDocumentReference ~ __ENV.HOST:", __ENV.HOST);
+
   const res = http.post(
     `https://${__ENV.HOST}/consumer/DocumentReference/_search`,
     body,

tests/performance/perftest_environment.py

@@ -24,7 +24,8 @@ def _get_pointers_table_name():
     return f"nhsd-nrlf--{perftest_table_name}-pointers-table"
 
 
-def extract_consumer_data(out="consumer_reference_data.json"):
+def extract_consumer_data(output_dir="."):
+    out = output_dir + "/consumer_reference_data.json"
     table_name = _get_pointers_table_name()
     table = DYNAMODB.Table(table_name)
     scan_kwargs = {}
@@ -87,9 +88,9 @@ def __next__(self):
 
 
 def generate_producer_data(
+    output_dir=".",
     proportion_existing=0.8,  # Proportion of output that should be existing NHS numbers
     total_count=1000,  # Total number of NHS numbers to output
-    out="producer_reference_data.json",
     last_existing_nhs_number=None,  # Optionally specify the last NHS number in the table
 ):
     """
@@ -98,12 +99,14 @@ def generate_producer_data(
     - total_count: total number of NHS numbers in output
     NHS numbers are generated in a semi-deterministic way, similar to the NFT seeding script.
     """
+    out = output_dir + "/producer_reference_data.json"
     table_name = _get_pointers_table_name()
     table = DYNAMODB.Table(table_name)
     scan_kwargs = {}
     done = False
     start_key = None
     existing_nhs_numbers = set()
+
     # Scan DynamoDB table for all existing NHS numbers
     while not done:
         if start_key:
@@ -178,11 +181,12 @@ def __next__(self):
 
 
 def generate_pointer_table_extract(
-    out="producer_reference_data.csv",
+    output_dir=".",
 ):
     """
     Generate a CSV file containing all pointer IDs, pointer type, custodian, and nhs_number (patient).
     """
+    out = output_dir + "/producer_reference_data.csv"
     table_name = _get_pointers_table_name()
     table = DYNAMODB.Table(table_name)
     scan_kwargs = {}
@@ -192,8 +196,8 @@ def generate_pointer_table_extract(
     buffer_size = 1_000_000  # 10k rows needs ~3MB of RAM, so 1M rows needs ~300MB
     count = 1
 
-    with open(out, "w", newline="") as csvfile:
-        writer = csv.writer(csvfile)
+    with open(out, "w", newline="") as csv_file:
+        writer = csv.writer(csv_file)
         writer.writerow(
             ["count", "pointer_id", "pointer_type", "custodian", "nhs_number"]
         )

tests/performance/producer/seed_nft_tables.py

@@ -3,7 +3,6 @@
 dynamodb = boto3.client("dynamodb")
 resource = boto3.resource("dynamodb")
 
-logger.setLevel("ERROR")
 
 # DOC_REF_TEMPLATE = load_document_reference("NFT-template")