Merge branch 'main' into aea-4506-communal-qc

Author: wildjames

.github/actions/mark_jira_released/action.yml

@@ -16,7 +16,7 @@ runs:
       with:
         aws-region: eu-west-2
         role-to-assume: ${{ inputs.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
-        role-session-name: account-resources-release-notes-run-lambda
+        role-session-name: fhir-validator-lambda-release-notes-run-lambda
 
     - name: call markJiraReleased lambda
       shell: bash

.github/actions/update_confluence_jira/action.yml

@@ -32,7 +32,7 @@ runs:
       with:
         aws-region: eu-west-2
         role-to-assume: ${{ inputs.TARGET_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
-        role-session-name: account-resources-release-notes-target
+        role-session-name: fhir-validator-lambda-release-notes-target
 
     - name: Get deployed tag on target
       shell: bash
@@ -46,7 +46,7 @@ runs:
       with:
         aws-region: eu-west-2
         role-to-assume: ${{ inputs.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
-        role-session-name: account-resources-release-notes-dev
+        role-session-name: fhir-validator-lambda-release-notes-dev
 
     - name: get current dev tag
       shell: bash
@@ -58,7 +58,7 @@ runs:
       with:
         aws-region: eu-west-2
         role-to-assume: ${{ inputs.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
-        role-session-name: account-resources-release-notes-run-lambda
+        role-session-name: fhir-validator-lambda-release-notes-run-lambda
         unset-current-credentials: true
 
     - name: create int release notes

.github/workflows/delete_old_cloudformation_stacks.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           aws-region: eu-west-2
           role-to-assume: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
-          role-session-name: github-actions
+          role-session-name: fhir-validator-lambda-delete-old-stacks
 
       - name: delete stacks
         shell: bash

.github/workflows/sam_release_code.yml

@@ -88,7 +88,7 @@ jobs:
         with:
           aws-region: eu-west-2
           role-to-assume: ${{ secrets.CLOUD_FORMATION_DEPLOY_ROLE }}
-          role-session-name: github-actions
+          role-session-name: fhir-validator-lambda-release-code
 
       - name: download build artifact
         uses: actions/download-artifact@v4

poetry.lock

@@ -18,8 +18,8 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fhir.version>7.4.5</fhir.version>
-        <log4j.version>2.24.1</log4j.version>
+        <fhir.version>7.6.0</fhir.version>
+        <log4j.version>2.24.2</log4j.version>
         <fasterxml.version>2.18.1</fasterxml.version>
         <sonar.organization>nhsdigital</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>io.github.hakky54</groupId>
             <artifactId>logcaptor</artifactId>
-            <version>2.9.3</version>
+            <version>2.10.0</version>
             <scope>test</scope>
         </dependency>
         <!--The

pom.xml

@@ -28,7 +28,7 @@ requests = "^2.32.3"
 flake8 = "^7.1.1"
 pip-licenses = "^4.5.1"
 pre-commit = "^3.5.0"
-cfn-lint = "^1.18.4"
+cfn-lint = "^1.20.1"
 
 [tool.poetry.scripts]
 

pyproject.toml

@@ -216,7 +216,7 @@
                     "valueString": "Terminology_PassThrough_TX_Message"
                 }
             ],
-            "severity": "information",
+            "severity": "warning",
             "code": "processing",
             "details": {
                 "coding": [
@@ -247,7 +247,7 @@
                     "valueString": "Terminology_PassThrough_TX_Message"
                 }
             ],
-            "severity": "information",
+            "severity": "warning",
             "code": "processing",
             "details": {
                 "coding": [

src/test/resources/results/invalidBundle.json

@@ -153,10 +153,22 @@
                 {
                     "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
                     "valueInteger": 499
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id",
+                    "valueString": "This_element_does_not_match_any_known_slice_"
                 }
             ],
             "severity": "information",
             "code": "processing",
+            "details": {
+                "coding": [
+                    {
+                        "system": "http://hl7.org/fhir/java-core-messageId",
+                        "code": "This_element_does_not_match_any_known_slice_"
+                    }
+                ]
+            },
             "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))",
             "location": [
                 "Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]",
@@ -501,10 +513,22 @@
                 {
                     "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
                     "valueInteger": 1598
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id",
+                    "valueString": "This_element_does_not_match_any_known_slice_"
                 }
             ],
             "severity": "information",
             "code": "processing",
+            "details": {
+                "coding": [
+                    {
+                        "system": "http://hl7.org/fhir/java-core-messageId",
+                        "code": "This_element_does_not_match_any_known_slice_"
+                    }
+                ]
+            },
             "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[1].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))",
             "location": [
                 "Bundle.entry[1].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]",
@@ -849,10 +873,22 @@
                 {
                     "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
                     "valueInteger": 2710
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id",
+                    "valueString": "This_element_does_not_match_any_known_slice_"
                 }
             ],
             "severity": "information",
             "code": "processing",
+            "details": {
+                "coding": [
+                    {
+                        "system": "http://hl7.org/fhir/java-core-messageId",
+                        "code": "This_element_does_not_match_any_known_slice_"
+                    }
+                ]
+            },
             "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[2].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))",
             "location": [
                 "Bundle.entry[2].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]",
@@ -1197,10 +1233,22 @@
                 {
                     "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
                     "valueInteger": 3810
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id",
+                    "valueString": "This_element_does_not_match_any_known_slice_"
                 }
             ],
             "severity": "information",
             "code": "processing",
+            "details": {
+                "coding": [
+                    {
+                        "system": "http://hl7.org/fhir/java-core-messageId",
+                        "code": "This_element_does_not_match_any_known_slice_"
+                    }
+                ]
+            },
             "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[3].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))",
             "location": [
                 "Bundle.entry[3].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]",
@@ -1621,10 +1669,22 @@
                 {
                     "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
                     "valueInteger": 495
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id",
+                    "valueString": "This_element_does_not_match_any_known_slice_"
                 }
             ],
             "severity": "information",
             "code": "processing",
+            "details": {
+                "coding": [
+                    {
+                        "system": "http://hl7.org/fhir/java-core-messageId",
+                        "code": "This_element_does_not_match_any_known_slice_"
+                    }
+                ]
+            },
             "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))",
             "location": [
                 "Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]",
@@ -2048,10 +2108,22 @@
                 {
                     "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col",
                     "valueInteger": 499
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id",
+                    "valueString": "This_element_does_not_match_any_known_slice_"
                 }
             ],
             "severity": "information",
             "code": "processing",
+            "details": {
+                "coding": [
+                    {
+                        "system": "http://hl7.org/fhir/java-core-messageId",
+                        "code": "This_element_does_not_match_any_known_slice_"
+                    }
+                ]
+            },
             "diagnostics": "This element does not match any known slice defined in the profile https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-CodeableConcept (this may not be a problem, but you should check that it's not intended to match a slice) - Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]: Does not match slice 'SNOMED' (discriminator: ('http://snomed.info/sct' in system))",
             "location": [
                 "Bundle.entry[0].resource/*MedicationRequest/null*/.medication.ofType(CodeableConcept).coding[0]",

src/test/resources/results/searchSet.json

@@ -135,7 +135,7 @@
                     "valueString": "Terminology_PassThrough_TX_Message"
                 }
             ],
-            "severity": "information",
+            "severity": "warning",
             "code": "processing",
             "details": {
                 "coding": [
@@ -266,7 +266,7 @@
                     "valueString": "Terminology_PassThrough_TX_Message"
                 }
             ],
-            "severity": "information",
+            "severity": "warning",
             "code": "processing",
             "details": {
                 "coding": [
@@ -397,7 +397,7 @@
                     "valueString": "Terminology_PassThrough_TX_Message"
                 }
             ],
-            "severity": "information",
+            "severity": "warning",
             "code": "processing",
             "details": {
                 "coding": [
@@ -528,7 +528,7 @@
                     "valueString": "Terminology_PassThrough_TX_Message"
                 }
             ],
-            "severity": "information",
+            "severity": "warning",
             "code": "processing",
             "details": {
                 "coding": [