NRL-1841 Tidy up test output

Author: anjalitrace2-nhs

Makefile

@@ -317,7 +317,7 @@ perftest-producer-internal:	## Run producer perf tests
 	k6 run tests/performance/producer/perftest.js -e HOST=$(PERFTEST_HOST) -e ENV_TYPE=$(ENV_TYPE) -e DIST_PATH=$(DIST_PATH)
 
 perftest-producer-public: check-warn ## Run the producer perftests for the external access points
-	@echo "Starting token refresher in background with ENV=$(ENV)"
+	@echo "Starting token refresher in background with ENV=$(ENV) PERFTEST_TOKEN_REFRESH_PORT=$(PERFTEST_TOKEN_REFRESH_PORT)"
 	ENV=$(ENV) TOKEN_REFRESH_PORT=$(PERFTEST_TOKEN_REFRESH_PORT) PYTHONPATH=. poetry run python ./tests/performance/token_refresher.py &
 	trap "kill $$(lsof -t -i :$(PERFTEST_TOKEN_REFRESH_PORT)) 2>/dev/null" EXIT
 	@echo "Fetching public mode configuration..."
@@ -337,7 +337,7 @@ perftest-consumer-internal:
 	k6 run tests/performance/consumer/perftest.js -e HOST=$(PERFTEST_HOST) -e ENV_TYPE=$(ENV_TYPE) -e DIST_PATH=$(DIST_PATH)
 
 perftest-consumer-public: check-warn ## Run the consumer perftests for the external access points
-	@echo "Starting token refresher with ENV=$(ENV)"
+	@echo "Starting token refresher in background with ENV=$(ENV) PERFTEST_TOKEN_REFRESH_PORT=$(PERFTEST_TOKEN_REFRESH_PORT)"
 	ENV=$(ENV) TOKEN_REFRESH_PORT=$(PERFTEST_TOKEN_REFRESH_PORT) PYTHONPATH=. poetry run python ./tests/performance/token_refresher.py &
 	trap "kill $$(lsof -t -i :$(PERFTEST_TOKEN_REFRESH_PORT)) 2>/dev/null" EXIT
 	@echo "Fetching public mode configuration..."
@@ -362,7 +362,7 @@ perftest-generate-pointer-table-extract:
 	aws s3 cp "${DIST_PATH}/pointer_extract-${PERFTEST_TABLE_NAME}.zip" "s3://nhsd-nrlf--${ENV}-metadata/performance/seed-pointers-extract-${PERFTEST_TABLE_NAME}.zip"
 
 perftest-run-token-refresher:
-	@echo "Starting token refresher with ENV=$(ENV)"
+	@echo "Starting token refresher in background with ENV=$(ENV) PERFTEST_TOKEN_REFRESH_PORT=$(PERFTEST_TOKEN_REFRESH_PORT)"
 	ENV=$(ENV) TOKEN_REFRESH_PORT=$(PERFTEST_TOKEN_REFRESH_PORT) PYTHONPATH=. poetry run python ./tests/performance/token_refresher.py &
 	trap "kill $$(lsof -t -i :$(PERFTEST_TOKEN_REFRESH_PORT)) 2>/dev/null" EXIT
 

tests/performance/README.md

@@ -75,6 +75,7 @@ make perftest-prepare PERFTEST_TABLE_NAME=nhsd-nrlf--perftest-baseline-pointers-
 #### Internal mode
 
 ```sh
+assume nhsd-nrlf-test
 make perftest-consumer-internal ENV_TYPE=perftest PERFTEST_HOST=perftest-1.perftest.record-locator.national.nhs.uk
 make perftest-producer-internal ENV_TYPE=perftest PERFTEST_HOST=perftest-1.perftest.record-locator.national.nhs.uk
 ```
@@ -84,6 +85,7 @@ make perftest-producer-internal ENV_TYPE=perftest PERFTEST_HOST=perftest-1.perft
 Via apigee proxies - most similar to a supplier. Spins up a local http server in background responsible for refreshing bearer token (valid for 5 mins each).
 
 ```sh
+assume nhsd-nrlf-mgmt
 make perftest-consumer-public ENV=perftest
 make perftest-producer-public ENV=perftest
 ```

tests/performance/test-config.js

@@ -24,9 +24,9 @@ function initConfig() {
     return config;
   }
 
-  const configData = fetchConfig();
-
   if (connectMode === "public") {
+    const configData = fetchConfig();
+
     config = {
       connectMode: "public",
       baseUrl: __ENV.TEST_PUBLIC_BASE_URL.replace(/\/$/, ""),
@@ -40,7 +40,10 @@ function initConfig() {
       throw new Error("Public mode requires TEST_PUBLIC_BASE_URL");
     }
     if (!config.bearerToken) {
-      throw new Error("Bearer token not found in config file");
+      throw new Error(
+        "Bearer token not found in config",
+        Object.keys(configData)
+      );
     }
   } else {
     config = {

tests/performance/token_refresher.py

@@ -1,4 +1,11 @@
 #!/usr/bin/env python3
+"""
+Token refresher useful for running perf tests in public mode. Runs in background of test run and spins up two threads:
+    - a looped task which fetches a new bearer token from APIM every 5 mins
+    - http server which returns the most recently fetched token
+
+See makefile perftest-consumer-public & perftest-producer-public for usage
+"""
 import json
 import os
 import threading

tests/utilities/get_access_token.py

@@ -109,7 +109,7 @@ def generate_client_assertion(app_secrets: dict):
             "sub": app_secrets["api_key"],
             "aud": app_secrets["oauth_url"],
             "jti": str(uuid4()),
-            "exp": time() + 300,  # max:312, still times out at just < 10 mins :(
+            "exp": time() + 300,  # max:312
         },
         app_secrets["private_key"],
         algorithm="RS512",