diff --git a/build.gradle b/build.gradle index b36c04a1..b0571825 100644 --- a/build.gradle +++ b/build.gradle @@ -181,7 +181,6 @@ def versions = [ pitest: '1.7.3', powerMock: '2.0.0', puppyCrawl: '8.29', - reformPropertiesVolume: '0.0.4', reformsJavaLogging: '5.1.1', restAssured: '4.5.1', serenity: '2.2.13', @@ -250,7 +249,6 @@ dependencies { implementation (group: 'commons-beanutils', name: 'commons-beanutils', version: versions.commonsBeanUtils) { force = true } - implementation (group: 'org.springframework.security', name: 'spring-security-rsa', version: versions.spring_security_rsa) { force = true exclude group: 'org.springframework.security', module: 'spring-security-crypto' @@ -259,7 +257,6 @@ dependencies { implementation group: 'org.springframework.security', name: 'spring-security-crypto', version: versions.springSecurityCrypto implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator' - implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: versions.springCloud implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: versions.bouncycastle implementation group: 'com.github.hmcts', name:'ccd-case-document-am-client', version: versions.ccdCaseDocumentAmClient @@ -292,7 +289,6 @@ dependencies { implementation group: 'uk.gov.hmcts.reform', name: 'logging-appinsights', version: versions.reformsJavaLogging implementation group: 'uk.gov.hmcts.reform', name: 'logging-spring', version: versions.reformsJavaLogging implementation group: 'uk.gov.hmcts.reform', name: 'logging-httpcomponents', version: versions.reformsJavaLogging - implementation group: 'uk.gov.hmcts.reform', name: 'properties-volume-spring-boot-starter', version: versions.reformPropertiesVolume implementation (group: 'uk.gov.hmcts.reform', name:'service-auth-provider-client', version: versions.serviceTokenGenerator) { exclude group: 'io.reactivex', module: 'io.reactivex' exclude group: 'io.reactivex', module: 'rxnetty' diff --git a/charts/prl-dgs/Chart.yaml b/charts/prl-dgs/Chart.yaml index c7877164..7904c76b 100644 --- a/charts/prl-dgs/Chart.yaml +++ b/charts/prl-dgs/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.0" description: Family Private Law - Document Generator Service name: prl-dgs -version: 0.0.50 +version: 0.0.51 dependencies: - name: java version: 5.2.0 diff --git a/charts/prl-dgs/values.aat.template.yaml b/charts/prl-dgs/values.aat.template.yaml index f4735819..ee150063 100644 --- a/charts/prl-dgs/values.aat.template.yaml +++ b/charts/prl-dgs/values.aat.template.yaml @@ -11,15 +11,25 @@ java: prl: resourceGroup: prl secrets: - - microservicekey-prl-dgs-api - - docmosis-api-key - - launchDarkly-sdk-key - - AppInsightsInstrumentationKey - - prl-cos-idam-client-secret - - test-genericpassword - - idam-solicitor-username - - idam-solicitor-password - - system-update-user-username - - system-update-user-password + - name: microservicekey-prl-dgs-api + alias: AUTH_PROVIDER_SERVICE_CLIENT_KEY + - name: docmosis-api-key + alias: DOCMOSIS_SERVICE_ACCESS_KEY + - name: launchDarkly-sdk-key + alias: LAUNCH_DARKLY_SDK_KEY + - name: AppInsightsInstrumentationKey + alias: APP_INSIGHTS_INSTRUMENTATION_KEY + - name: prl-cos-idam-client-secret + alias: IDAM_CLIENT_SECRET + - name: test-genericpassword + alias: PRL_GENERIC_PASSWORD + - name: idam-solicitor-username + alias: IDAM_SOLICITOR_USERNAME + - name: idam-solicitor-password + alias: IDAM_SOLICITOR_PASSWORD + - name: system-update-user-username + alias: SYSTEM_UPDATE_USER_USERNAME + - name: system-update-user-password + alias: PRL_SYSTEM_UPDATE_PASSWORD aadIdentityName: prl diff --git a/charts/prl-dgs/values.preview.template.yaml b/charts/prl-dgs/values.preview.template.yaml index fe2e0ecf..89efe594 100644 --- a/charts/prl-dgs/values.preview.template.yaml +++ b/charts/prl-dgs/values.preview.template.yaml @@ -6,22 +6,33 @@ java: prl: resourceGroup: prl secrets: - - microservicekey-prl-dgs-api - - docmosis-api-key - - launchDarkly-sdk-key - - AppInsightsInstrumentationKey - - prl-cos-idam-client-secret - - test-genericpassword - - idam-solicitor-username - - idam-solicitor-password - - system-update-user-username - - system-update-user-password - - app-insights-connection-string + - name: microservicekey-prl-dgs-api + alias: AUTH_PROVIDER_SERVICE_CLIENT_KEY + - name: docmosis-api-key + alias: DOCMOSIS_SERVICE_ACCESS_KEY + - name: launchDarkly-sdk-key + alias: LAUNCH_DARKLY_SDK_KEY + - name: AppInsightsInstrumentationKey + alias: APP_INSIGHTS_INSTRUMENTATION_KEY + - name: prl-cos-idam-client-secret + alias: IDAM_CLIENT_SECRET + - name: test-genericpassword + alias: PRL_GENERIC_PASSWORD + - name: idam-solicitor-username + alias: IDAM_SOLICITOR_USERNAME + - name: idam-solicitor-password + alias: IDAM_SOLICITOR_PASSWORD + - name: system-update-user-username + alias: SYSTEM_UPDATE_USER_USERNAME + - name: system-update-user-password + alias: PRL_SYSTEM_UPDATE_PASSWORD + - name: app-insights-connection-string + alias: app-insights-connection-string environment: MANAGEMENT_ENDPOINT_HEALTH_CACHE_TIMETOLIVE: "30000" DOCMOSIS_SERVICE_DEV_MODE_FLAG: "true" PDF_TEST_ENABLED: "true" - CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-2281-cdam + CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-2223-cdam AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" IDAM_S2S_URL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" DOCMOSIS_SERVICE_BASE_URL: "https://docmosis.aat.platform.hmcts.net" diff --git a/charts/prl-dgs/values.yaml b/charts/prl-dgs/values.yaml index ced0bbd6..d95f7cdd 100644 --- a/charts/prl-dgs/values.yaml +++ b/charts/prl-dgs/values.yaml @@ -11,17 +11,28 @@ java: prl: resourceGroup: prl secrets: - - microservicekey-prl-dgs-api - - docmosis-api-key - - launchDarkly-sdk-key - - AppInsightsInstrumentationKey - - prl-cos-idam-client-secret - - test-genericpassword - - idam-solicitor-username - - idam-solicitor-password - - system-update-user-username - - system-update-user-password - - app-insights-connection-string + - name: microservicekey-prl-dgs-api + alias: AUTH_PROVIDER_SERVICE_CLIENT_KEY + - name: docmosis-api-key + alias: DOCMOSIS_SERVICE_ACCESS_KEY + - name: launchDarkly-sdk-key + alias: LAUNCH_DARKLY_SDK_KEY + - name: AppInsightsInstrumentationKey + alias: APP_INSIGHTS_INSTRUMENTATION_KEY + - name: prl-cos-idam-client-secret + alias: IDAM_CLIENT_SECRET + - name: test-genericpassword + alias: PRL_GENERIC_PASSWORD + - name: idam-solicitor-username + alias: IDAM_SOLICITOR_USERNAME + - name: idam-solicitor-password + alias: IDAM_SOLICITOR_PASSWORD + - name: system-update-user-username + alias: SYSTEM_UPDATE_USER_USERNAME + - name: system-update-user-password + alias: PRL_SYSTEM_UPDATE_PASSWORD + - name: app-insights-connection-string + alias: app-insights-connection-string environment: AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" IDAM_S2S_URL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" diff --git a/src/contractTest/resources/application.yml b/src/contractTest/resources/application.yml index 7893f50e..0eb19600 100644 --- a/src/contractTest/resources/application.yml +++ b/src/contractTest/resources/application.yml @@ -102,6 +102,18 @@ document: - templateName: PRL-LET-WEL-C100-AP15.docx filename: Cover_letter_ap15_welsh.pdf document-generator: docmosis + - templateName: PRL-LET-ENG-FL401-RE8.docx + filename: Cover_letter_re8.pdf + document-generator: docmosis + - templateName: PRL-LET-WEL-FL401-RE8.docx + filename: Cover_letter_welsh_re8.pdf + document-generator: docmosis + - templateName: PRL-LET-ENG-C100-RE7.docx + filename: cover_letter_re7.pdf + document-generator: docmosis + - templateName: PRL-LET-WEL-C100-RE7.docx + filename: cover_letter_welsh_re7.pdf + document-generator: docmosis pdf: familyCourtImgKey: "familycourt" familyCourtImgVal: "[userImage:familycourt.png]" diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 274e11f6..19332a27 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -231,16 +231,16 @@ document: - templateName: FL-PRL-GOR-ENG-Citizen-Uploaded-Statement.docx filename: Citizen_Uploaded_Statement.pdf document-generator: docmosis - - templateName: FL-PRL-GOR-ENG-C7R.docx + - templateName: FL-PRL-GOR-ENG-LIP-C7R-DRAFT.docx filename: C7_Draft_Document.pdf document-generator: docmosis - - templateName: FL-PRL-GOR-WEL-C7R.docx + - templateName: FL-PRL-GOR-WEL-LIP-C7R-DRAFT.docx filename: Draft_C7_response_Welsh.pdf document-generator: docmosis - - templateName: FL-PRL-GOR-ENG-C7R-Final.docx + - templateName: FL-PRL-GOR-ENG-LIP-C7R-FINAL.docx filename: C7_Document.pdf document-generator: docmosis - - templateName: FL-PRL-GOR-WEL-C7R-Final.docx + - templateName: FL-PRL-GOR-WEL-LIP-C7R-FINAL.docx filename: Final_C7_response_Welsh.pdf document-generator: docmosis - templateName: FL-PRL-GOR-ENG-SOLICITOR-C7R-DRAFT.docx @@ -423,6 +423,9 @@ document: - templateName: PRL-LET-ENG-C100-RE7.docx filename: cover_letter_re7.pdf document-generator: docmosis + - templateName: PRL-LET-WEL-C100-RE7.docx + filename: cover_letter_welsh_re7.pdf + document-generator: docmosis - templateName: PRL-LET-ENG-FL401-AP1.docx filename: cover_letter_ap1.pdf document-generator: docmosis @@ -503,7 +506,12 @@ document: - templateName: PRL-LET-WEL-C100-AP15.docx filename: Cover_letter_ap15_welsh.pdf document-generator: docmosis - + - templateName: PRL-LET-ENG-FL401-RE8.docx + filename: Cover_letter_re8.pdf + document-generator: docmosis + - templateName: PRL-LET-WEL-FL401-RE8.docx + filename: Cover_letter_welsh_re8.pdf + document-generator: docmosis pdf: familyCourtImgKey: "familycourt" familyCourtImgVal: "[userImage:familycourt.png]" @@ -527,6 +535,9 @@ spring: web: resources: static-locations: + config: + import: "optional:configtree:/mnt/secrets/prl/" + # GENERAL SPRING BOOT ACTUATOR CONFIG # Context path for Spring Boot Actuator endpoints diff --git a/src/main/resources/bootstrap.yaml b/src/main/resources/bootstrap.yaml index 817504e3..8b137891 100644 --- a/src/main/resources/bootstrap.yaml +++ b/src/main/resources/bootstrap.yaml @@ -1,18 +1 @@ -spring: - cloud: - propertiesvolume: - enabled: true - prefixed: true - paths: /mnt/secrets/prl - aliases: - prl.microservicekey-prl-dgs-api: AUTH_PROVIDER_SERVICE_CLIENT_KEY - prl.docmosis-api-key: DOCMOSIS_SERVICE_ACCESS_KEY - prl.launchDarkly-sdk-key: LAUNCH_DARKLY_SDK_KEY - prl.AppInsightsInstrumentationKey: APP_INSIGHTS_INSTRUMENTATION_KEY - prl.prl-cos-idam-client-secret: IDAM_CLIENT_SECRET - prl.test-genericpassword: PRL_GENERIC_PASSWORD - prl.idam-solicitor-username: IDAM_SOLICITOR_USERNAME - prl.idam-solicitor-password: IDAM_SOLICITOR_PASSWORD - prl.system-update-user-password: PRL_SYSTEM_UPDATE_PASSWORD - prl.system-update-user-username: SYSTEM_UPDATE_USER_USERNAME