NRL-1666 Tidy up for review as-is

Author: anjalitrace2-nhs

Makefile

@@ -13,13 +13,10 @@ 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 ?= dev.api.record-locator.$(ENV).national.nhs.uk
-# HOST ?= perftest.record-locator.national.nhs.uk
-HOST ?= api.perftest.record-locator.national.nhs.uk
+HOST ?= $(TF_WORKSPACE_NAME).api.record-locator.$(ENV).national.nhs.uk
 ENV_TYPE ?= $(ENV)
-# PERFTEST_TABLE_NAME ?= nhsd-nrlf--xaxel-deleteme-pointers-table
 PERFTEST_TABLE_NAME ?= perftest
+PERFTEST_HOST ?= api.perftest.record-locator.national.nhs.uk
 
 export PATH := $(PATH):$(PWD)/.venv/bin
 export USE_SHARED_RESOURCES := $(shell poetry run python scripts/are_resources_shared_for_stack.py $(TF_WORKSPACE_NAME))
@@ -255,32 +252,28 @@ generate-models: check-warn ## Generate Pydantic Models
 generate-perftest-permissions: ## Generate perftest permissions and add to nrlf_permissions
 	poetry run python tests/performance/producer/generate_permissions.py --output_dir="$(DIST_PATH)/nrlf_permissions/K6PerformanceTest"
 
-# 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) 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)
+	@echo "Running producer performance tests with HOST=$(PERFTEST_HOST) and ENV_TYPE=$(ENV_TYPE) and DIST_PATH=$(DIST_PATH)"
+	k6 run tests/performance/producer/perftest.js -e HOST=$(PERFTEST_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) 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)
+	@echo "Running consumer performance tests with HOST=$(PERFTEST_HOST) and ENV_TYPE=$(ENV_TYPE) and DIST_PATH=$(DIST_PATH)"
+	k6 run tests/performance/consumer/perftest.js -e HOST=$(PERFTEST_HOST) -e ENV_TYPE=$(ENV_TYPE) -e DIST_PATH=$(DIST_PATH)
 
 perftest-prep-generate-producer-data:
+	@echo "Generating producer reference with PERFTEST_TABLE_NAME=$(PERFTEST_TABLE_NAME) and DIST_PATH=$(DIST_PATH)"
 	mkdir -p $(DIST_PATH)
 	PYTHONPATH=. poetry run python tests/performance/perftest_environment.py generate_producer_data --output_dir="$(DIST_PATH)"
 
 perftest-prep-extract-consumer-data:
+	@echo "Generating consumer reference with PERFTEST_TABLE_NAME=$(PERFTEST_TABLE_NAME) and DIST_PATH=$(DIST_PATH)"
 	mkdir -p $(DIST_PATH)
 	PYTHONPATH=. poetry run python tests/performance/perftest_environment.py extract_consumer_data --output_dir="$(DIST_PATH)"
 
 perftest-prep-generate-pointer-table-extract:
+	@echo "Generating pointer table extract with PERFTEST_TABLE_NAME=$(PERFTEST_TABLE_NAME) and DIST_PATH=$(DIST_PATH)"
 	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 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/README.md

@@ -1,30 +1,21 @@
 # Performance Testing
 
+<!-- TODO: make this proper -->
+
 some high level context short
 
 ## Run perf tests
 
-### Prepare
-
 ```sh
 assume management
 make truststore-pull-all ENV=<env>  # e.g. perftest
 cd ./terraform/infrastructure
 tf workspace select # perftest-1 or active stack
 cd ../../ # project root
-assume dev
-make perftest-prepare PERFTEST_TABLE_NAME=<POINTER_TABLE_NAME>
+assume
+make perftest-prepare PERFTEST_TABLE_NAME=<pointer table name>
 
 make perftest-consumer ENV_TYPE=<env>  # e.g. perftest
 ```
 
-choose existing table name/create table with this script > `PERFTEST_TABLE_NAME` env var
-makes these files
-
-### Run
-
-these/find profiles available
-
-### Outputs
-
-handy bits
+<!-- Mention relevant input files + any environment prep needed e.g. restoring tables from backup -->

tests/performance/constants.js

@@ -15,9 +15,6 @@ export const POINTERS_TO_DELETE = ALL_POINTER_IDS.slice(0, 3500);
 export const POINTER_IDS = ALL_POINTER_IDS.slice(3500);
 export const NHS_NUMBERS = REFERENCE_DATA["nhs_numbers"];
 
-// export const POINTER_TYPES = CATEGORY_TYPE_GROUPS.flatMap((group) =>
-//   group.types.map((t) => t.code)
-// );
 // filter only 736253001, 736253002, 1363501000000100, 861421000000109, 749001000000101 for now
 export const FILTERED_POINTER_TYPES = [
   "736253001",

tests/performance/consumer/client_perftest.js

@@ -11,15 +11,11 @@ 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 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());
@@ -50,7 +46,6 @@ 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());
   }
 }
@@ -69,10 +64,6 @@ export function countDocumentReference() {
     `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}`,
     {
@@ -86,8 +77,6 @@ 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}`,
     {
@@ -107,8 +96,6 @@ 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}`,
     {
@@ -130,8 +117,6 @@ 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}`,
     {
@@ -150,8 +135,6 @@ 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,
@@ -172,8 +155,6 @@ 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,
@@ -192,7 +173,6 @@ export function countPostDocumentReference() {
     "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,
@@ -219,8 +199,6 @@ export function searchPostDocumentReferenceAccessDenied() {
     "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

@@ -6,13 +6,9 @@
 
 import boto3
 
-# from nhs_number import generate
-
-
 DYNAMODB = boto3.resource("dynamodb", region_name="eu-west-2")
 
 default_table_name = "default-table-name"
-# default_table_name = "nhsd-nrlf--xaxel-deleteme-pointers-table"
 
 
 def _get_pointers_table_name():