PI-2364 - update regex to make it simpler

Author: achimber-moj

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ authorisation:
   consumers:
     mapps.client.org:
       - "/v1/persons"
-      - "/v1/persons/\\.*+[^/]*$"
+      - "/v1/persons/[^/]*$"
       - "/v1/persons/.*/images"
       - "/v1/images/.*"
       - "/v1/persons/.*/addresses"
@@ -49,19 +49,19 @@ authorisation:
       - "/v1/persons/.*/person-responsible-officer"
       - "/v1/persons/.*/risk-management-plan"
     ctrlo:
-      - "/v1/epf/person-details/.*/\\.*+[^/]*$"
+      - "/v1/epf/person-details/.*/[^/]*$"
     moj-pes:
       - "/v1/persons/.*/name"
-      - "/v1/hmpps-id/nomis-number/\\.*+[^/]*$"
+      - "/v1/hmpps-id/nomis-number/[^/]*$"
       - "/v1/persons/.*/cell-location"
     kubernetes-health-check-client:
       - "/health/liveness"
       - "/health/readiness"
     heartbeat:
-      - "/v1/persons/\\.*+[^/]*$"
+      - "/v1/persons/[^/]*$"
     pnd:
       - "/v1/persons"
-      - "/v1/persons/\\.*+[^/]*$"
+      - "/v1/persons/[^/]*$"
       - "/v1/persons/.*/addresses"
       - "/v1/persons/.*/alerts/pnd"
       - "/v1/persons/.*/sentences"

src/main/resources/application-local-docker.yml

@@ -26,10 +26,10 @@ authorisation:
   consumers:
     automated-test-client:
       - "/v1/persons"
-      - "/v1/persons/\\.*+[^/]*$"
+      - "/v1/persons/[^/]*$"
       - "/v1/persons/.*/images"
       - "/v1/persons/.*/name"
-      - "/v1/images/\\.*+[^/]*$"
+      - "/v1/images/[^/]*$"
       - "/v1/persons/.*/addresses"
       - "/v1/persons/.*/offences"
       - "/v1/persons/.*/alerts"
@@ -51,8 +51,8 @@ authorisation:
       - "/v1/persons/.*/person-responsible-officer"
       - "/v1/persons/.*/risk-management-plan"
       - "/v1/persons/.*/cell-location"
-      - "/v1/epf/person-details/.*/\\.*+[^/]*$"
-      - "/v1/hmpps-id/nomis-number/\\.*+[^/]*$"
+      - "/v1/epf/person-details/.*/[^/]*$"
+      - "/v1/hmpps-id/nomis-number/[^/]*$"
       - "/health"
       - "/health/ping"
       - "/health/readiness"

src/main/resources/application-local.yml

@@ -33,10 +33,10 @@ authorisation:
   consumers:
     automated-test-client:
       - "/v1/persons"
-      - "/v1/persons/\\.*+[^/]*$"
+      - "/v1/persons/[^/]*$"
       - "/v1/persons/.*/images"
       - "/v1/persons/.*/name"
-      - "/v1/images/\\.*+[^/]*$"
+      - "/v1/images/[^/]*$"
       - "/v1/persons/.*/addresses"
       - "/v1/persons/.*/offences"
       - "/v1/persons/.*/alerts"
@@ -58,8 +58,8 @@ authorisation:
       - "/v1/persons/.*/status-information"
       - "/v1/persons/.*/risk-management-plan"
       - "/v1/persons/.*/cell-location"
-      - "/v1/epf/person-details/.*/\\.*+[^/]*$"
-      - "/v1/hmpps-id/nomis-number/\\.*+[^/]*$"
+      - "/v1/epf/person-details/.*/[^/]*$"
+      - "/v1/hmpps-id/nomis-number/[^/]*$"
       - "/health"
       - "/health/ping"
       - "/health/readiness"

src/main/resources/application-preprod.yml

@@ -27,10 +27,10 @@ services:
 authorisation:
   consumers:
     ctrlo:
-      - "/v1/epf/person-details/.*/\\.*+[^/]*$"
+      - "/v1/epf/person-details/.*/[^/]*$"
     moj-pes:
       - "/v1/persons/.*/name"
-      - "/v1/hmpps-id/nomis-number/\\.*+[^/]*$"
+      - "/v1/hmpps-id/nomis-number/[^/]*$"
       - "/v1/persons/.*/cell-location"
     kubernetes-health-check-client:
       - "/health/liveness"

src/main/resources/application-prod.yml

@@ -27,10 +27,10 @@ services:
 authorisation:
   consumers:
     ctrlo:
-      - "/v1/epf/person-details/.*/\\.*+[^/]*$"
+      - "/v1/epf/person-details/.*/[^/]*$"
     moj-pes:
       - "/v1/persons/.*/name"
-      - "/v1/hmpps-id/nomis-number/\\.*+[^/]*$"
+      - "/v1/hmpps-id/nomis-number/[^/]*$"
       - "/v1/persons/.*/cell-location"
     kubernetes-health-check-client:
       - "/health/liveness"

src/main/resources/application-test.yml

@@ -41,10 +41,10 @@ authorisation:
   consumers:
     automated-test-client:
       - "/v1/persons"
-      - "/v1/persons/\\.*+[^/]*$"
+      - "/v1/persons/[^/]*$"
       - "/v1/persons/.*/images"
       - "/v1/persons/.*/name"
-      - "/v1/images/\\.*+[^/]*$"
+      - "/v1/images/[^/]*$"
       - "/v1/persons/.*/addresses"
       - "/v1/persons/.*/offences"
       - "/v1/persons/.*/alerts"
@@ -56,7 +56,7 @@ authorisation:
       - "/v1/persons/.*/risks/serious-harm"
       - "/v1/persons/.*/risks/dynamic"
       - "/v1/persons/.*/reported-adjudications"
-      - "/v1/epf/person-details/.*/\\.*+[^/]*$"
+      - "/v1/epf/person-details/.*/[^/]*$"
       - "/v1/persons/.*/adjudications"
       - "/v1/persons/.*/licences/conditions"
       - "/v1/persons/.*/case-notes"
@@ -67,7 +67,7 @@ authorisation:
       - "/v1/persons/.*/risk-management-plan"
       - "/v1/persons/.*/cell-location"
       - "/v1/persons/.*/status-information"
-      - "/v1/hmpps-id/nomis-number/\\.*+[^/]*$"
+      - "/v1/hmpps-id/nomis-number/[^/]*$"
       - "/health"
       - "/health/ping"
       - "/health/readiness"

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/smoke/AuthoriseConfigTest.kt

@@ -21,10 +21,10 @@ class AuthoriseConfigTest : DescribeSpec(
       {
         "automated-test-client": [
           "/v1/persons",
-          "/v1/persons/\\.*+[^/]*${'$'}",
+          "/v1/persons/[^/]*$",
           "/v1/persons/.*/images",
           "/v1/persons/.*/name",
-          "/v1/images/\\.*+[^/]*${'$'}",
+          "/v1/images/[^/]*$",
           "/v1/persons/.*/addresses",
           "/v1/persons/.*/offences",
           "/v1/persons/.*/alerts",
@@ -46,8 +46,8 @@ class AuthoriseConfigTest : DescribeSpec(
           "/v1/persons/.*/person-responsible-officer",
           "/v1/persons/.*/risk-management-plan",
           "/v1/persons/.*/cell-location",
-          "/v1/epf/person-details/.*/\\.*+[^/]*${'$'}",
-          "/v1/hmpps-id/nomis-number/\\.*+[^/]*${'$'}",
+          "/v1/epf/person-details/.*/[^/]*$",
+          "/v1/hmpps-id/nomis-number/[^/]*$",
           "/health",
           "/health/ping",
           "/health/readiness",