[NRL-1922] Resolve all remaining low sev Sonar warnings

mattdean3-nhs · mattdean3-nhs · commit 004d9a964563 · 2026-03-03T17:45:16.000Z
diff --git a/layer/nrlf/core/constants.py b/layer/nrlf/core/constants.py
@@ -73,7 +73,7 @@ class PointerTypes(Enum):
 
     @staticmethod
     def list():
-        return list(map(lambda type: type.value, PointerTypes))
+        return [type.value for type in PointerTypes]
 
     def coding_system(self):
         return self.value.split(TYPE_SEPARATOR)[0]
@@ -93,7 +93,7 @@ class Categories(Enum):
 
     @staticmethod
     def list():
-        return list(map(lambda category: category.value, Categories))
+        return [category.value for category in Categories]
 
     def coding_system(self):
         return self.value.split(TYPE_SEPARATOR)[0]
diff --git a/layer/nrlf/core/validators.py b/layer/nrlf/core/validators.py
@@ -146,7 +146,7 @@ def validate(self, data: Dict[str, Any] | DocumentReference):
             self._validate_content(resource)
             self._validate_content_format(resource)
             self._validate_content_extension(resource)
-            self._validate_practiceSetting(resource)
+            self._validate_practice_setting(resource)
 
         except StopValidationError:
             logger.log(LogReference.VALIDATOR003)
@@ -287,19 +287,16 @@ def _validate_asid(self, asid_references: list):
                 diagnostics=f"Invalid ASID value '{asid_value}'. A single ASID consisting of 12 digits can be provided in the context.related field.",
                 field=f"context.related[{idx}].identifier.value",
             )
-            return
 
     def _validate_ssp_asid(self, model: DocumentReference):
         """
         Validate that the document contains a valid ASID in the context.related field when the content contains an SSP URL
         """
 
         ssp_content = any(
-            [
-                content
-                for content in model.content
-                if content.attachment.url.startswith("ssp://")
-            ]
+            content
+            for content in model.content
+            if content.attachment.url.startswith("ssp://")
         )
 
         logger.log(LogReference.VALIDATOR001, step="ssp_content_and_asid_exists")
@@ -338,7 +335,6 @@ def _validate_ssp_asid(self, model: DocumentReference):
                 diagnostics="Missing ASID identifier. context.related must contain a single valid ASID identifier when content contains an SSP URL",
                 field="context.related",
             )
-            return
 
     def _validate_type(self, model: DocumentReference):
         """
@@ -652,9 +648,8 @@ def _validate_author(self, model: DocumentReference):
                 diagnostics=f"Invalid author value: '{identifier.value}' Author value must be less than 13 characters",
                 field="author[0].identifier.value",
             )
-            return
 
-    def _validate_practiceSetting(self, model: DocumentReference):
+    def _validate_practice_setting(self, model: DocumentReference):
         """
         Validate the practice setting field contains an appropriate coding system and code.
         """
@@ -716,7 +711,6 @@ def _validate_practiceSetting(self, model: DocumentReference):
                 diagnostics=f"Invalid practice setting coding: display {practice_setting_display} does not match the expected display for {practice_setting_value} Practice Setting coding is bound to value set {PRACTICE_SETTING_VALUE_SET_URL}",
                 field="context.practiceSetting.coding[0]",
             )
-            return
 
     def _validate_content(self, model: DocumentReference):
         """
diff --git a/terraform/account-wide-infrastructure/modules/glue/LogSchemaGeneration/LogSchemaGeneration.ipynb b/terraform/account-wide-infrastructure/modules/glue/LogSchemaGeneration/LogSchemaGeneration.ipynb
@@ -12,7 +12,7 @@
     ")\n",
     "import json\n",
     "from datetime import datetime, timedelta\n",
-    "from typing import List, Dict, Type, Set, Any"
+    "from typing import List, Dict, Any"
    ]
   },
   {
@@ -22,7 +22,7 @@
    "outputs": [],
    "source": [
     "# Initialize CloudWatch client\n",
-    "session = boto3.Session(region_name=\"eu-west-2\", profile_name=\"nhsd-nrlf-dev\")\n",
+    "session = boto3.Session(profile_name=\"nhsd-nrlf-dev\")\n",
     "client = session.client(\"logs\")"
    ]
   },

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`")\n",`
`13`	`13`	`"import json\n",`
`14`	`14`	`"from datetime import datetime, timedelta\n",`
`15`		`- "from typing import List, Dict, Type, Set, Any"`
	`15`	`+ "from typing import List, Dict, Any"`
`16`	`16`	`]`
`17`	`17`	`},`
`18`	`18`	`{`
`@@ -22,7 +22,7 @@`
`22`	`22`	`"outputs": [],`
`23`	`23`	`"source": [`
`24`	`24`	`"# Initialize CloudWatch client\n",`
`25`		`- "session = boto3.Session(region_name=\"eu-west-2\", profile_name=\"nhsd-nrlf-dev\")\n",`
	`25`	`+ "session = boto3.Session(profile_name=\"nhsd-nrlf-dev\")\n",`
`26`	`26`	`"client = session.client(\"logs\")"`
`27`	`27`	`]`
`28`	`28`	`},`