From 4ddfe2a014097f67acf490e32d93a229f4275649 Mon Sep 17 00:00:00 2001 From: pmcphee77 <150798161+pmcphee77@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:55:47 +0000 Subject: [PATCH] PI-1772: Reverted auth URL for services expecting issuer url (#3050) --- projects/pre-sentence-reports-to-delius/deploy/values-dev.yml | 4 ++-- .../pre-sentence-reports-to-delius/deploy/values-preprod.yml | 4 ++-- .../pre-sentence-reports-to-delius/deploy/values-prod.yml | 4 ++-- projects/refer-and-monitor-and-delius/deploy/values-dev.yml | 4 ++-- .../refer-and-monitor-and-delius/deploy/values-preprod.yml | 4 ++-- projects/refer-and-monitor-and-delius/deploy/values-prod.yml | 4 ++-- projects/unpaid-work-and-delius/deploy/values-dev.yml | 4 ++-- projects/unpaid-work-and-delius/deploy/values-preprod.yml | 4 ++-- projects/unpaid-work-and-delius/deploy/values-prod.yml | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml b/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml index 67ff4f77c6..d442436602 100644 --- a/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml +++ b/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml @@ -7,8 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token + 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 INTEGRATIONS_ALFRESCO_URL: https://alfresco.test.delius.probation.hmpps.dsd.io/alfresco/service/noms-spg/ diff --git a/projects/pre-sentence-reports-to-delius/deploy/values-preprod.yml b/projects/pre-sentence-reports-to-delius/deploy/values-preprod.yml index 2ee649408d..41f25a51fc 100644 --- a/projects/pre-sentence-reports-to-delius/deploy/values-preprod.yml +++ b/projects/pre-sentence-reports-to-delius/deploy/values-preprod.yml @@ -7,8 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: preprod - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-preprod.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-preprod.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth/oauth/token + 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 INTEGRATIONS_ALFRESCO_URL: https://alfresco.pre-prod.delius.probation.hmpps.dsd.io/alfresco/service/noms-spg/ diff --git a/projects/pre-sentence-reports-to-delius/deploy/values-prod.yml b/projects/pre-sentence-reports-to-delius/deploy/values-prod.yml index 2a3f877201..cd7ebb109b 100644 --- a/projects/pre-sentence-reports-to-delius/deploy/values-prod.yml +++ b/projects/pre-sentence-reports-to-delius/deploy/values-prod.yml @@ -4,8 +4,8 @@ generic-service: env: SENTRY_ENVIRONMENT: prod - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-prod.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-prod.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in.hmpps.service.justice.gov.uk/auth/oauth/token + 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 INTEGRATIONS_ALFRESCO_URL: https://alfresco.probation.service.justice.gov.uk/alfresco/service/noms-spg/ diff --git a/projects/refer-and-monitor-and-delius/deploy/values-dev.yml b/projects/refer-and-monitor-and-delius/deploy/values-dev.yml index 5227a2ac47..21fc8dcbd5 100644 --- a/projects/refer-and-monitor-and-delius/deploy/values-dev.yml +++ b/projects/refer-and-monitor-and-delius/deploy/values-dev.yml @@ -7,8 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token + 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 LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG diff --git a/projects/refer-and-monitor-and-delius/deploy/values-preprod.yml b/projects/refer-and-monitor-and-delius/deploy/values-preprod.yml index 5404a88fbc..6fc9744be5 100644 --- a/projects/refer-and-monitor-and-delius/deploy/values-preprod.yml +++ b/projects/refer-and-monitor-and-delius/deploy/values-preprod.yml @@ -7,8 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: preprod - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-preprod.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-preprod.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth/oauth/token + 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 generic-prometheus-alerts: diff --git a/projects/refer-and-monitor-and-delius/deploy/values-prod.yml b/projects/refer-and-monitor-and-delius/deploy/values-prod.yml index aec31a3a8e..56f8c895e6 100644 --- a/projects/refer-and-monitor-and-delius/deploy/values-prod.yml +++ b/projects/refer-and-monitor-and-delius/deploy/values-prod.yml @@ -4,6 +4,6 @@ generic-service: env: SENTRY_ENVIRONMENT: prod - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-prod.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-prod.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in.hmpps.service.justice.gov.uk/auth/oauth/token + 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 \ No newline at end of file diff --git a/projects/unpaid-work-and-delius/deploy/values-dev.yml b/projects/unpaid-work-and-delius/deploy/values-dev.yml index a5a4da4b27..c552f1f891 100644 --- a/projects/unpaid-work-and-delius/deploy/values-dev.yml +++ b/projects/unpaid-work-and-delius/deploy/values-dev.yml @@ -7,8 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token + 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 INTEGRATIONS_ALFRESCO_URL: https://alfresco.test.delius.probation.hmpps.dsd.io/alfresco/service/noms-spg/ diff --git a/projects/unpaid-work-and-delius/deploy/values-preprod.yml b/projects/unpaid-work-and-delius/deploy/values-preprod.yml index 76cdd98f27..e4e42b1201 100644 --- a/projects/unpaid-work-and-delius/deploy/values-preprod.yml +++ b/projects/unpaid-work-and-delius/deploy/values-preprod.yml @@ -7,8 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: preprod - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-preprod.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-preprod.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth/oauth/token + 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 INTEGRATIONS_ALFRESCO_URL: https://alfresco.pre-prod.delius.probation.hmpps.dsd.io/alfresco/service/noms-spg/ diff --git a/projects/unpaid-work-and-delius/deploy/values-prod.yml b/projects/unpaid-work-and-delius/deploy/values-prod.yml index 86f9948da9..85c93c69d6 100644 --- a/projects/unpaid-work-and-delius/deploy/values-prod.yml +++ b/projects/unpaid-work-and-delius/deploy/values-prod.yml @@ -4,8 +4,8 @@ generic-service: env: SENTRY_ENVIRONMENT: prod - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-prod.svc.cluster.local/auth/oauth/token - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-prod.svc.cluster.local/auth/.well-known/jwks.json + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in.hmpps.service.justice.gov.uk/auth/oauth/token + 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 INTEGRATIONS_ALFRESCO_URL: https://alfresco.probation.service.justice.gov.uk/alfresco/service/noms-spg/