From 03bcb71c04e83bcc36a8a7db1ad8a69d6133bc27 Mon Sep 17 00:00:00 2001 From: Jennings-HMCTS Date: Tue, 9 Nov 2021 16:45:26 +0000 Subject: [PATCH 1/2] added paymentoutcome_web to values.yaml and application.properties --- api/src/main/resources/application-local.properties | 2 +- api/src/main/resources/application.properties | 2 +- charts/payment-api/Chart.yaml | 2 +- charts/payment-api/values.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/src/main/resources/application-local.properties b/api/src/main/resources/application-local.properties index 3a2682cfb5..39d8721f57 100644 --- a/api/src/main/resources/application-local.properties +++ b/api/src/main/resources/application-local.properties @@ -17,7 +17,7 @@ case-payment-orders.api.url=http://localhost:4457 auth.idam.client.baseUrl=http://localhost:23443 auth.provider.service.client.baseUrl=http://localhost:23443 -trusted.s2s.service.names=cmc,probate_frontend,divorce_frontend,ccd_gw,bar_api,finrem_payment_service,ccpay_bubble,jui_webapp,xui_webapp,fpl_case_service,iac,unspec_service,probate_backend,civil_service +trusted.s2s.service.names=cmc,probate_frontend,divorce_frontend,ccd_gw,bar_api,finrem_payment_service,ccpay_bubble,jui_webapp,xui_webapp,fpl_case_service,iac,unspec_service,probate_backend,civil_service,paymentoutcome_web card.payments.report.scheduler.enabled = ${CARD_PAYMENTS_REPORT_SCHEDULER_ENABLED:true} card.payments.email.from=${CARD_PAYMENTS_EMAIL_FROM:dummy@gmail.com} diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties index 6f25e3f2fb..c565d1be96 100644 --- a/api/src/main/resources/application.properties +++ b/api/src/main/resources/application.properties @@ -73,7 +73,7 @@ gov.pay.operational_services=${GOV_PAY_OPERATIONAL_SERVICES:#{ccd_gw,api_gw}} idam.s2s-auth.totp_secret=${PAYMENT_S2S_SECRET:AAAAAAAAAAAAAAAA} idam.s2s-auth.microservice=${PAYMENT_S2S_MICROSERVICE_NAME:payment_app} idam.s2s-auth.url=${AUTH_PROVIDER_SERVICE_CLIENT_BASEURL:#{http://dummy.dummy.net}} -trusted.s2s.service.names=${TRUSTED_S2S_SERVICE_NAMES:cmc,cmc_claim_store,probate_frontend,divorce_frontend,ccd_gw,bar_api,api_gw,finrem_payment_service,ccpay_bubble,jui_webapp,xui_webapp,fpl_case_service,iac,probate_backend,civil_service} +trusted.s2s.service.names=${TRUSTED_S2S_SERVICE_NAMES:cmc,cmc_claim_store,probate_frontend,divorce_frontend,ccd_gw,bar_api,api_gw,finrem_payment_service,ccpay_bubble,jui_webapp,xui_webapp,fpl_case_service,iac,probate_backend,civil_service,paymentoutcome_web} auth.idam.client.baseUrl=${AUTH_IDAM_CLIENT_BASEURL:#{http://dummy.dummy.net}} auth.provider.service.client.baseUrl=${AUTH_PROVIDER_SERVICE_CLIENT_BASEURL:#{http://dummy.dummy.net}} diff --git a/charts/payment-api/Chart.yaml b/charts/payment-api/Chart.yaml index 6e653ed56e..82fba11ebb 100644 --- a/charts/payment-api/Chart.yaml +++ b/charts/payment-api/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0" description: Helm chart for the HMCTS payment api name: payment-api home: https://github.com/hmcts/ccpay-payment-app -version: 2.0.53 +version: 2.0.54 maintainers: - name: HMCTS Fees & Payments Dev Team email: ccpay@hmcts.net diff --git a/charts/payment-api/values.yaml b/charts/payment-api/values.yaml index 15a912d512..25bf1f3060 100644 --- a/charts/payment-api/values.yaml +++ b/charts/payment-api/values.yaml @@ -20,7 +20,7 @@ java: OIDC_CLIENT_ID: "paybubble" OIDC_ISSUER: "https://forgerock-am.service.core-compute-idam-{{ .Values.global.environment }}.internal:8443/openam/oauth2/hmcts" OIDC_S2S_MICROSERVICE_NAME: ccpay_bubble - OIDC_AUDIENCE_LIST: paybubble,cmc_citizen,probate,divorce,xuiwebapp,xuimowebapp,xuiaowebapp,fees_admin_frontend,finrem,bar_frontend,fpl_case_service,ccd_gateway + OIDC_AUDIENCE_LIST: paybubble,cmc_citizen,probate,divorce,xuiwebapp,xuimowebapp,xuiaowebapp,fees_admin_frontend,finrem,bar_frontend,fpl_case_service,ccd_gateway,paymentoutcome_web LAUNCH_DARKLY_USER_NAME_PREFIX: '{{ .Values.global.environment }}' AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal @@ -37,7 +37,7 @@ java: GOV_PAY_OPERATIONAL_SERVICES: "ccd_gw,api_gw,xui_webapp" PCI_PAL_CALLBACK_URL: https://core-api-mgmt-{{ .Values.global.environment }}.azure-api.net/telephony-api/telephony/callback - TRUSTED_S2S_SERVICE_NAMES: "cmc,cmc_claim_store,probate_frontend,divorce_frontend,ccd_gw,bar_api,api_gw,finrem_payment_service,ccpay_bubble,jui_webapp,xui_webapp,fpl_case_service,civil_service,iac" + TRUSTED_S2S_SERVICE_NAMES: "cmc,cmc_claim_store,probate_frontend,divorce_frontend,ccd_gw,bar_api,api_gw,finrem_payment_service,ccpay_bubble,jui_webapp,xui_webapp,fpl_case_service,civil_service,iac,paymentoutcome_web" CARD_PAYMENTS_REPORT_SCHEDULER_ENABLED: "true" CARD_PAYMENTS_EMAIL_FROM: "no-reply@mail-payment-nonprod.platform.hmcts.net" CARD_PAYMENTS_EMAIL_MESSAGE: "Hi,

Please find attached Payment by Account reconciliation report.

Regards,
Fees & Payments Team

" From 880d4a377145c79acbb14b103708f380adadf511 Mon Sep 17 00:00:00 2001 From: Jennings-HMCTS Date: Tue, 9 Nov 2021 16:49:03 +0000 Subject: [PATCH 2/2] Update values.yaml --- charts/payment-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/payment-api/values.yaml b/charts/payment-api/values.yaml index 25bf1f3060..9121826d6f 100644 --- a/charts/payment-api/values.yaml +++ b/charts/payment-api/values.yaml @@ -20,7 +20,7 @@ java: OIDC_CLIENT_ID: "paybubble" OIDC_ISSUER: "https://forgerock-am.service.core-compute-idam-{{ .Values.global.environment }}.internal:8443/openam/oauth2/hmcts" OIDC_S2S_MICROSERVICE_NAME: ccpay_bubble - OIDC_AUDIENCE_LIST: paybubble,cmc_citizen,probate,divorce,xuiwebapp,xuimowebapp,xuiaowebapp,fees_admin_frontend,finrem,bar_frontend,fpl_case_service,ccd_gateway,paymentoutcome_web + OIDC_AUDIENCE_LIST: paybubble,cmc_citizen,probate,divorce,xuiwebapp,xuimowebapp,xuiaowebapp,fees_admin_frontend,finrem,bar_frontend,fpl_case_service,ccd_gateway LAUNCH_DARKLY_USER_NAME_PREFIX: '{{ .Values.global.environment }}' AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal