Merge branch 'main' into feature/PI-2344-create-api

ministryofjustice · Jul 15, 2024 · 3777dd9 · 3777dd9
2 parents a470b4d + 71e7dc8
commit 3777dd9
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 14 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-E123456.json b/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-E123456.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/E123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\"\n}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/E123456/ALLOW/10069390/COMPLETE\",\n \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"E123456\"}]}}",
   "Timestamp": "2023-12-05T15:32:33.823Z",
   "MessageAttributes": {
     "eventType": {

diff --git a/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-F123456.json b/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-F123456.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/F123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\"\n}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/F123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"F123456\"}]}}",
   "Timestamp": "2023-12-05T15:32:33.823Z",
   "MessageAttributes": {
     "eventType": {

diff --git a/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-G123456.json b/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-G123456.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/G123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\"\n}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/G123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"G123456\"}]}}",
   "Timestamp": "2023-12-05T15:32:33.823Z",
   "MessageAttributes": {
     "eventType": {

diff --git a/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-H123456.json b/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-H123456.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/H123456/ALLOW/10078385/COMPLETE\",\n  \"occurredAt\": \"2023-12-15T08:34:44+00:00\"\n}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/H123456/ALLOW/10078385/COMPLETE\",\n  \"occurredAt\": \"2023-12-15T08:34:44+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"H123456\"}]}}",
   "Timestamp": "2023-12-15T08:34:44.000Z",
   "MessageAttributes": {
     "eventType": {

diff --git a/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-L123456.json b/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-L123456.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/L123456/ALLOW/10096930/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\"\n}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/L123456/ALLOW/10096930/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"L123456\"}]}}",
   "Timestamp": "2023-12-05T15:32:33.823Z",
   "MessageAttributes": {
     "eventType": {

diff --git a/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-M123456.json b/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-M123456.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/M123456/ALLOW/100835871/COMPLETE\",\n  \"occurredAt\": \"2023-12-15T08:34:44+00:00\"\n}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/M123456/ALLOW/100835871/COMPLETE\",\n  \"occurredAt\": \"2023-12-15T08:34:44+00:00\",\"personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"M123456\"}]}}",
   "Timestamp": "2023-12-15T08:34:44.000Z",
   "MessageAttributes": {
     "eventType": {

diff --git a/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-N123456.json b/...nt-summary-and-delius/src/dev/resources/messages/assessment-summary-produced-N123456.json
@@ -1,7 +1,7 @@
 {
   "Type": "Notification",
   "MessageId": "33ad848a-4342-5ff2-9fe9-d96307935317",
-  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/N123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\"\n}",
+  "Message": "{\n  \"eventType\": \"assessment.summary.produced\",\n  \"version\": 1,\n  \"description\": \"Assessment Summary has been produced\",\n  \"detailUrl\": \"http://localhost:{wiremock.port}/eor/oasys/ass/asssumm/N123456/ALLOW/10069390/COMPLETE\",\n  \"occurredAt\": \"2023-12-05T15:32:32+00:00\",\",personReference\":{\"identifiers\":[{\"type\":\"CRN\",\"value\":\"N123456\"}]}}",
   "Timestamp": "2023-12-05T15:32:33.823Z",
   "MessageAttributes": {
     "eventType": {

diff --git a/...ment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt b/...ment-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt
@@ -47,5 +47,8 @@ class Handler(
 
 fun HmppsDomainEvent.telemetryProperties() = listOfNotNull(
     "occurredAt" to occurredAt.toString(),
+    "crn" to crn(),
     detailUrl?.let { "detailUrl" to it }
 ).toMap()
+
+fun HmppsDomainEvent.crn(): String = personReference.findCrn() ?: throw IllegalArgumentException("Missing CRN")
diff --git a/projects/person-search-index-from-delius/container/Dockerfile b/projects/person-search-index-from-delius/container/Dockerfile
@@ -4,7 +4,7 @@ COPY --chown=yq /pipelines /pipelines
 RUN find /pipelines -type f -name '*.yml' -exec sh -c 'f="$1"; yq -o=json "$f" > "${f%.yml}.json"' shell {} +;
 
 
-FROM logstash:8.14.2
+FROM logstash:8.14.3
 
 USER root
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/tools/ingress-testing/api-client/gradle/wrapper/gradle-wrapper.jar b/tools/ingress-testing/api-client/gradle/wrapper/gradle-wrapper.jar
diff --git a/tools/ingress-testing/api-client/gradle/wrapper/gradle-wrapper.properties b/tools/ingress-testing/api-client/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/tools/ingress-testing/api-client/gradlew b/tools/ingress-testing/api-client/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/tools/ingress-testing/api-client/gradlew.bat b/tools/ingress-testing/api-client/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################