NRL-1948 Renamed logs to better reflect what's being logged and removed comments

anjalitrace2-nhs · anjalitrace2-nhs · commit 3c6d492efdc9 · 2026-02-27T16:40:16.000Z
diff --git a/Makefile b/Makefile
@@ -105,7 +105,7 @@ publish-ci-image: ## Publish the CI image
 
 test: check-warn ## Run the unit tests
 	@echo "Running unit tests"
-	PYTHONPATH=. poetry run pytest --ignore tests/smoke -k "not beefy" $(TEST_ARGS)
+	PYTHONPATH=. poetry run pytest --ignore tests/smoke $(TEST_ARGS)
 
 test-features-integration: check-warn ## Run the BDD feature tests in the integration environment
 	@echo "Running feature tests in the integration environment ${TF_WORKSPACE_NAME}"
diff --git a/layer/nrlf/core/authoriser.py b/layer/nrlf/core/authoriser.py
@@ -26,7 +26,7 @@ def get_pointer_permissions_v2(
     app_id = connection_metadata.nrl_app_id
 
     key = f"{producer_or_consumer}/{app_id}/{ods_code}.json"
-    logger.log(LogReference.S3PERMISSIONS011, key=key)
+    logger.log(LogReference.V2PERMISSIONS011, key=key)
 
     file_path = f"{lookup_path}/{key}"
 
@@ -36,7 +36,7 @@ def get_pointer_permissions_v2(
             pointer_permissions = json.load(file)
     except Exception as exc:
         logger.log(
-            LogReference.S3PERMISSIONS014,
+            LogReference.V2PERMISSIONS014,
             exc_info=sys.exc_info(),
             stacklevel=5,
             error=str(exc),
@@ -107,7 +107,7 @@ def parse_permissions_file(
             pointer_types = json.load(file)
     except Exception as exc:
         logger.log(
-            LogReference.S3PERMISSIONS005,  # not s3 tho?
+            LogReference.S3PERMISSIONS005,
             exc_info=sys.exc_info(),
             stacklevel=5,
             error=str(exc),
diff --git a/layer/nrlf/core/log_references.py b/layer/nrlf/core/log_references.py
@@ -70,7 +70,7 @@ class LogReference(Enum):
         "WARN", "An unhandled exception occurred whilst handling response headers"
     )
 
-    # S3 Permissions Lookup Logs
+    # S3 / Embedded Permissions Lookup Logs
     S3PERMISSIONS001 = _Reference("INFO", "Retrieving pointer types from S3 bucket")
     S3PERMISSIONS002 = _Reference("INFO", "Retrieved list of pointer types from S3")
     S3PERMISSIONS003 = _Reference("WARN", "No permissions file found in S3")
@@ -79,21 +79,22 @@ class LogReference(Enum):
     )
     S3PERMISSIONS005 = _Reference(
         "EXCEPTION",
-        "An error occurred whilst parsing embedded permissions files from S3",
+        "An error occurred whilst parsing embedded permissions files",
     )
-    # S3 Permissions Lookup Logs - v2 permissions
-    S3PERMISSIONS011 = _Reference(
+
+    # V2 Embedded Permissions Lookup Logs
+    V2PERMISSIONS011 = _Reference(
         "INFO", "Retrieving v2 pointer permissions from lambda layer"
     )
-    S3PERMISSIONS012 = _Reference(
+    V2PERMISSIONS012 = _Reference(
         "INFO", "Retrieved v2 pointer permissions from lambda layer"
     )
-    S3PERMISSIONS013 = _Reference(
+    V2PERMISSIONS013 = _Reference(
         "WARN", "No v2 permissions file found in lambda layer"
     )
-    S3PERMISSIONS014 = _Reference(
+    V2PERMISSIONS014 = _Reference(
         "EXCEPTION",
-        "An error occurred whilst retrieving v2 pointer permissions ",
+        "An error occurred whilst retrieving v2 pointer permissions",
     )
 
     # Parse Logs
diff --git a/layer/nrlf/core/tests/test_authoriser.py b/layer/nrlf/core/tests/test_authoriser.py
@@ -38,7 +38,7 @@ def test_authoriser_get_v2_permissions_with_pointer_types(mocker):
 
     assert result.get("types") == ["http://snomed.info/sct|736253001"]
 
-    spy.assert_called_with(LogReference.S3PERMISSIONS011, key=expected_lookup_key)
+    spy.assert_called_with(LogReference.V2PERMISSIONS011, key=expected_lookup_key)
 
 
 def test_authoriser_parse_v2_permission_file_with_no_permission_file(mocker):
@@ -55,4 +55,4 @@ def test_authoriser_parse_v2_permission_file_with_no_permission_file(mocker):
 
     assert metadata_result == {}
 
-    spy.assert_any_call(LogReference.S3PERMISSIONS011, key=expected_lookup_key)
+    spy.assert_any_call(LogReference.V2PERMISSIONS011, key=expected_lookup_key)

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class LogReference(Enum):`
`70`	`70`	`"WARN", "An unhandled exception occurred whilst handling response headers"`
`71`	`71`	`)`
`72`	`72`
`73`		`- # S3 Permissions Lookup Logs`
	`73`	`+ # S3 / Embedded Permissions Lookup Logs`
`74`	`74`	`S3PERMISSIONS001 = _Reference("INFO", "Retrieving pointer types from S3 bucket")`
`75`	`75`	`S3PERMISSIONS002 = _Reference("INFO", "Retrieved list of pointer types from S3")`
`76`	`76`	`S3PERMISSIONS003 = _Reference("WARN", "No permissions file found in S3")`
`@@ -79,21 +79,22 @@ class LogReference(Enum):`
`79`	`79`	`)`
`80`	`80`	`S3PERMISSIONS005 = _Reference(`
`81`	`81`	`"EXCEPTION",`
`82`		`- "An error occurred whilst parsing embedded permissions files from S3",`
	`82`	`+ "An error occurred whilst parsing embedded permissions files",`
`83`	`83`	`)`
`84`		`- # S3 Permissions Lookup Logs - v2 permissions`
`85`		`- S3PERMISSIONS011 = _Reference(`
	`84`	`+`
	`85`	`+ # V2 Embedded Permissions Lookup Logs`
	`86`	`+ V2PERMISSIONS011 = _Reference(`
`86`	`87`	`"INFO", "Retrieving v2 pointer permissions from lambda layer"`
`87`	`88`	`)`
`88`		`- S3PERMISSIONS012 = _Reference(`
	`89`	`+ V2PERMISSIONS012 = _Reference(`
`89`	`90`	`"INFO", "Retrieved v2 pointer permissions from lambda layer"`
`90`	`91`	`)`
`91`		`- S3PERMISSIONS013 = _Reference(`
	`92`	`+ V2PERMISSIONS013 = _Reference(`
`92`	`93`	`"WARN", "No v2 permissions file found in lambda layer"`
`93`	`94`	`)`
`94`		`- S3PERMISSIONS014 = _Reference(`
	`95`	`+ V2PERMISSIONS014 = _Reference(`
`95`	`96`	`"EXCEPTION",`
`96`		`- "An error occurred whilst retrieving v2 pointer permissions ",`
	`97`	`+ "An error occurred whilst retrieving v2 pointer permissions",`
`97`	`98`	`)`
`98`	`99`
`99`	`100`	`# Parse Logs`