Merge branch 'master' into ca-da-sos-respondent-access-code

hmcts · Jul 22, 2024 · e771316 · e771316
2 parents 718263c + 31c3b2e
commit e771316
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 54 deletions.
diff --git 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
@@ -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
@@ -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
@@ -6,17 +6,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:
       MANAGEMENT_ENDPOINT_HEALTH_CACHE_TIMETOLIVE: "30000"
       DOCMOSIS_SERVICE_DEV_MODE_FLAG: "true"

diff --git 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/main/resources/application.yml b/src/main/resources/application.yml
@@ -517,6 +517,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
@@ -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