diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 37f4d3808d..ab42c3fd05 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -44,6 +44,7 @@ def secrets = [ secret('idam-data-store-system-user-username', 'ROLE_ASSIGNMENT_USER_EMAIL') ], 'civil-${env}': [ + secret('case-document-am-api-s2s-secret', 'CASE_DOCUMENT_AM_API_S2S_SECRET'), secret('microservicekey-civil-service', 'S2S_SECRET'), secret('ccd-importer-username', 'CCD_CONFIGURER_IMPORTER_USERNAME'), secret('ccd-importer-password', 'CCD_CONFIGURER_IMPORTER_PASSWORD'), diff --git a/charts/civil-ccd/Chart.yaml b/charts/civil-ccd/Chart.yaml index f460442b48..fcf2d79888 100644 --- a/charts/civil-ccd/Chart.yaml +++ b/charts/civil-ccd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: A Helm chart for civil-ccd App name: civil-ccd home: https://github.com/hmcts/civil-ccd-definition -version: 0.0.50 +version: 0.0.51 maintainers: - name: HMCTS Civil team @@ -66,3 +66,17 @@ dependencies: version: ~0.0.58 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' condition: am-org-role-mapping-service.enabled + +# Stiching + - name: ccd-case-document-am-api + version: 1.7.14 + repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' + condition: ccd-case-document-am-api.enabled + - name: em-ccdorc + version: 2.0.25 + repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' + condition: em-ccdorc.enabled + - name: em-stitching + version: 1.0.55 + repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' + condition: em-stitching.enabled diff --git a/charts/civil-ccd/values.enableHelm.template.yaml b/charts/civil-ccd/values.enableHelm.template.yaml index a5d555b93f..73c9191985 100644 --- a/charts/civil-ccd/values.enableHelm.template.yaml +++ b/charts/civil-ccd/values.enableHelm.template.yaml @@ -3,6 +3,7 @@ xui-webapp: nodejs: imagePullPolicy: Always releaseNameOverride: ${SERVICE_NAME}-xui-webapp + image: hmctspublic.azurecr.io/xui/webapp:latest devcpuRequests: 100m devmemoryRequests: 1Gi devcpuLimits: 1 diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index da6ee80b30..567db7778f 100644 --- a/charts/civil-ccd/values.preview.template.yaml +++ b/charts/civil-ccd/values.preview.template.yaml @@ -53,7 +53,9 @@ civil-service: - name: hmc-servicebus-shared-access-key-tf alias: HMC_HEARINGS_TOPIC_ACCESS_KEY environment: - LAUNCH_DARKLY_ENV: ${SERVICE_FQDN} + LAUNCH_DARKLY_ENV: aat + EM_CCD_ORCHESTRATOR_URL: http://${SERVICE_NAME}-em-ccdorc + CASE_DOCUMENT_AM_URL: http://${SERVICE_NAME}-cdam OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat2.internal:8443/openam/oauth2/realms/root/realms/hmcts SERVICE_REQUEST_UPDATE: https://${SERVICE_NAME}.preview.platform.hmcts.net/service-request-update SERVICE_REQUEST_UPDATE_CLAIM_ISSUED: https://${SERVICE_NAME}.preview.platform.hmcts.net/service-request-update-claim-issued @@ -102,6 +104,7 @@ civil-service: CREATE DATABASE "camunda" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; CREATE DATABASE "role_assignment" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; CREATE DATABASE "ts_translation_service" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; + CREATE DATABASE "emstitch" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; 02_init_wa.sql: | CREATE DATABASE "wa-task-management-api" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; CREATE DATABASE "wa-case-event-handler" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; @@ -122,6 +125,8 @@ xui-webapp: nodejs: ingressHost: xui-${SERVICE_FQDN} environment: + FEATURE_ACCESS_MANAGEMENT_ENABLED: true + SERVICES_DOCUMENTS_API_V2: http://${SERVICE_NAME}-cdam SERVICES_WORK_ALLOCATION_TASK_API: http://{{ .Release.Name }}-wa-task-management-api SERVICES_WA_WORKFLOW_API_URL: http://wa-workflow-api-${SERVICE_FQDN} SERVICES_TRANSLATION_API_URL: http://${SERVICE_NAME}-translation-service @@ -131,6 +136,7 @@ ccd: ras: enabled: true global: + ccdStitchUrl: http://${SERVICE_NAME}-emstitch postgresUsername: hmcts postgresPassword: ${POSTGRES_PASSWORD} postgresSecret: postgres @@ -142,6 +148,8 @@ ccd: ccd-data-store-api: java: environment: + CASE_DOCUMENT_AM_API_ATTACH_DOCUMENT_ENABLED: true + CASE_DOCUMENT_AM_URL: http://${SERVICE_NAME}-cdam OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-{{ .Values.global.environment }}.internal:8443/openam/oauth2/hmcts CCD_S2S_AUTHORISED_SERVICES_CASE_USER_ROLES: civil_service,aac_manage_case_assignment DATA_STORE_S2S_AUTHORISED_SERVICES: ccd_data,ccd_gw,ccd_ps,bulk_scan_orchestrator,ccpay_bubble,ctsc_work_allocation,em_ccd_orchestrator,xui_webapp,civil_service,ccd_case_document_am_api,aac_manage_case_assignment,wa_task_management_api,wa_task_monitor,wa_case_event_handler,wa_workflow_api,civil_general_applications @@ -214,6 +222,63 @@ camunda-bpm: key: PASSWORD disabled: true +em-ccdorc: + enabled: true + java: + image: hmctspublic.azurecr.io/em/ccdorc:latest + releaseNameOverride: ${SERVICE_NAME}-em-ccdorc + ingressHost: em-ccdorc-${SERVICE_FQDN} + environment: + IDAM_API_BASE_URI: https://idam-api.aat.platform.hmcts.net + OPEN_ID_API_BASE_URI: https://idam-web-public.aat.platform.hmcts.net/o + S2S_BASE_URI: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal + EM_STITCHING_API_URL: https://em-stitching-${SERVICE_FQDN} + DM_STORE_APP_URL: http://dm-store-aat.service.core-compute-aat.internal + CCD_DATA_API_URL: http://${SERVICE_NAME}-ccd-data-store-api + CALLBACK_HTTP_SCHEME: https + CALLBACK_DOMAIN: em-ccdorc-${SERVICE_FQDN} + +em-stitching: + enabled: true + java: + imagePullPolicy: Always + releaseNameOverride: ${SERVICE_NAME}-em-stitching + image: hmctspublic.azurecr.io/em/stitching:latest + ingressHost: em-stitching-${SERVICE_FQDN} + environment: + IDAM_API_BASE_URI: https://idam-api.aat.platform.hmcts.net + OPEN_ID_API_BASE_URI: https://idam-web-public.aat.platform.hmcts.net/o + S2S_BASE_URI: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal + DM_STORE_APP_URL: http://dm-store-aat.service.core-compute-aat.internal + CDAM_URL: http://${SERVICE_NAME}-cdam + SPRING_DATASOURCE_HOST: ${SERVICE_NAME}-postgresql + SPRING_DATASOURCE_NAME: emstitch + SPRING_DATASOURCE_OPTIONS: "?ssl=disable" + SPRING_DATASOURCE_PORT: 5432 + SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER} + SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD} + ENABLE_DB_MIGRATE: true + RUN_DB_MIGRATION_ON_STARTUP: true + FLYWAY_POSTGRESQL_TRANSACTIONAL_LOCK: false + LOGGING_LEVEL_UK_GOV_HMCTS_REFORM_EM: DEBUG + +ccd-case-document-am-api: + enabled: true + java: + releaseNameOverride: ${SERVICE_NAME}-cdam + imagePullPolicy: Always + image: hmctspublic.azurecr.io/ccd/case-document-am-api:latest + ingressHost: ccd-case-document-am-api-${SERVICE_FQDN} + environment: + IDAM_API_URL: https://idam-api.aat.platform.hmcts.net + IDAM_OIDC_URL: https://idam-web-public.aat.platform.hmcts.net + OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat.internal:8443/openam/oauth2/hmcts + S2S_URL: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal + DM_STORE_BASE_URL: http://dm-store-aat.service.core-compute-aat.internal + CCD_DATA_STORE_API_BASE_URL: http://${SERVICE_NAME}-ccd-data-store-api + CASE_DOCUMENT_AM_API_S2S_SECRET: ${CASE_DOCUMENT_AM_API_S2S_SECRET} + keyVaults: [] + postgresql: enabled: false flexibleserver: civil-preview diff --git a/charts/civil-ccd/values.yaml b/charts/civil-ccd/values.yaml index 2c6e98432b..e3ba1387c0 100644 --- a/charts/civil-ccd/values.yaml +++ b/charts/civil-ccd/values.yaml @@ -18,3 +18,9 @@ ccd-def-cleanup: enabled: false am-org-role-mapping-service: enabled: false +ccd-case-document-am-api: + enabled: false +em-ccdorc: + enabled: false +em-stitching: + enabled: false