tier config updates (#2848)

* tier config updates * tier config updates
ministryofjustice · Nov 30, 2023 · 7b3b66f · 7b3b66f
1 parent 7279704
commit 7b3b66f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/projects/refer-and-monitor-and-delius/src/main/resources/application.yml b/projects/refer-and-monitor-and-delius/src/main/resources/application.yml
@@ -31,6 +31,8 @@ spring:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
 
+springdoc.default-produces-media-type: application/json
+
 delius.db.username: ReferAndMonitorAndDelius # Should match value in [deploy/database/access.yml].
 
 management:

diff --git a/projects/tier-to-delius/deploy/values-dev.yml b/projects/tier-to-delius/deploy/values-dev.yml
@@ -11,7 +11,6 @@ generic-service:
     INTEGRATIONS_TIER_URL: https://hmpps-tier-dev.hmpps.service.justice.gov.uk
     SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json
     SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer
-    CRN-STREAMING_TIMEOUT: "10800000"
 
     LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG
 

diff --git a/projects/tier-to-delius/deploy/values-preprod.yml b/projects/tier-to-delius/deploy/values-preprod.yml
@@ -11,7 +11,6 @@ generic-service:
     INTEGRATIONS_TIER_URL: https://hmpps-tier-preprod.hmpps.service.justice.gov.uk
     SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json
     SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth/issuer
-    CRN-STREAMING_TIMEOUT: "21600000"
 
 generic-prometheus-alerts:
   businessHoursOnly: true
diff --git a/projects/tier-to-delius/deploy/values-prod.yml b/projects/tier-to-delius/deploy/values-prod.yml
@@ -7,5 +7,4 @@ generic-service:
     SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in.hmpps.service.justice.gov.uk/auth/oauth/token
     INTEGRATIONS_TIER_URL: https://hmpps-tier.hmpps.service.justice.gov.uk
     SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json
-    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in.hmpps.service.justice.gov.uk/auth/issuer
-    CRN-STREAMING_TIMEOUT: "21600000"
+    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in.hmpps.service.justice.gov.uk/auth/issuer
diff --git a/projects/tier-to-delius/deploy/values.yaml b/projects/tier-to-delius/deploy/values.yaml
@@ -15,8 +15,8 @@ generic-service:
     common:
       SPRING_DATASOURCE_URL: DB_URL
     tier-to-delius-client-credentials:
-      SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_TIER-TO-DELIUS_CLIENT-ID: CLIENT_ID
-      SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_TIER-TO-DELIUS_CLIENT-SECRET: CLIENT_SECRET
+      OAUTH2_CLIENT-ID: CLIENT_ID
+      OAUTH2_CLIENT-SECRET: CLIENT_SECRET
     tier-to-delius-database:
       SPRING_DATASOURCE_USERNAME: DB_USERNAME
       SPRING_DATASOURCE_PASSWORD: DB_PASSWORD

diff --git a/projects/tier-to-delius/src/main/resources/application.yml b/projects/tier-to-delius/src/main/resources/application.yml
@@ -21,12 +21,13 @@ spring:
       default:
         provider: hmpps-auth
         authorization-grant-type: client_credentials
-        client-id: tier-to-delius
-        client-secret: tier-to-delius
+        client-id: ${oauth2.client-id}
+        client-secret: ${oauth2.client-secret}
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
-  springdoc.default-produces-media-type: application/json
+
+springdoc.default-produces-media-type: application/json
 
 delius.db.username: TierToDelius # Should match value in [deploy/database/access.yml].