Merge branch 'master' into COT-484_Civil_DJ_SiR_correct_appt_name

hmcts · Nov 7, 2023 · 6487274 · 6487274
2 parents 1df67d7 + 21406f1
commit 6487274
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 31 deletions.
diff --git a/charts/am-org-role-mapping-service/Chart.yaml b/charts/am-org-role-mapping-service/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: A Helm chart for AM Organisation Role Mapping Service
 name: am-org-role-mapping-service
 home: https://github.com/hmcts/am-org-role-mapping-service
-version: 0.0.53
+version: 0.0.54
 maintainers:
   - name: Access Management Team
 dependencies:

diff --git a/charts/am-org-role-mapping-service/values.preview.template.yaml b/charts/am-org-role-mapping-service/values.preview.template.yaml
@@ -19,12 +19,18 @@ java:
   keyVaults:
     am:
       secrets:
-        - app-insights-connection-string
-        - am-org-role-mapping-service-s2s-secret
-        - role-assignment-service-LD-SDK-KEY
-        - orm-IDAM-CLIENT-ID
-        - orm-IDAM-CLIENT-SECRET
-        - orm-IDAM-ADMIN-SECRET
+        - name: app-insights-connection-string
+          alias: app-insights-connection-string
+        - name: am-org-role-mapping-service-s2s-secret
+          alias: AM_ORG_ROLE_MAPPING_SERVICE_SECRET
+        - name: role-assignment-service-LD-SDK-KEY
+          alias: LD_SDK_KEY
+        - name: orm-IDAM-CLIENT-ID
+          alias: ORM_IDAM_CLIENT_ID
+        - name: orm-IDAM-CLIENT-SECRET
+          alias: ORG_ROLE_MAPPING_IDAM_CLIENT_SECRET
+        - name: orm-IDAM-ADMIN-SECRET
+          alias: ORG_ROLE_MAPPING_IDAM_ADMIN_PASSWORD
   environment:
     IDAM_S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal

diff --git a/charts/am-org-role-mapping-service/values.yaml b/charts/am-org-role-mapping-service/values.yaml
@@ -6,15 +6,24 @@ java:
   keyVaults:
     am:
       secrets:
-        - app-insights-connection-string
-        - am-org-role-mapping-service-s2s-secret
-        - role-assignment-service-LD-SDK-KEY
-        - orm-IDAM-CLIENT-ID
-        - orm-IDAM-CLIENT-SECRET
-        - orm-IDAM-ADMIN-SECRET
-        - caseworker-topic-primary-send-listen-shared-access-key
-        - org-role-mapping-service-POSTGRES-PASS
-        - judicial-topic-primary-send-listen-shared-access-key
+        - name: app-insights-connection-string
+          alias: app-insights-connection-string
+        - name: am-org-role-mapping-service-s2s-secret
+          alias: AM_ORG_ROLE_MAPPING_SERVICE_SECRET
+        - name: role-assignment-service-LD-SDK-KEY
+          alias: LD_SDK_KEY
+        - name: orm-IDAM-CLIENT-ID
+          alias: ORM_IDAM_CLIENT_ID
+        - name: orm-IDAM-CLIENT-SECRET
+          alias: ORG_ROLE_MAPPING_IDAM_CLIENT_SECRET
+        - name: orm-IDAM-ADMIN-SECRET
+          alias: ORG_ROLE_MAPPING_IDAM_ADMIN_PASSWORD
+        - name: caseworker-topic-primary-send-listen-shared-access-key
+          alias: AMQP_CRD_SHARED_ACCESS_KEY_VALUE
+        - name: org-role-mapping-service-POSTGRES-PASS
+          alias: ORG_ROLE_MAPPING_DB_PASSWORD
+        - name: judicial-topic-primary-send-listen-shared-access-key
+          alias: AMQP_JRD_SHARED_ACCESS_KEY_VALUE
   environment:
     IDAM_S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     IDAM_USER_URL: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -47,6 +47,8 @@ security:
 spring:
   application:
     name: Organisation Role Mapping Service
+  config:
+    import: "optional:configtree:/mnt/secrets/am/"
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
@@ -1,16 +1,2 @@
-spring:
-  cloud:
-    propertiesvolume:
-      paths: /mnt/secrets/am
-      prefixed: false
-      aliases:
-        am-org-role-mapping-service-s2s-secret: AM_ORG_ROLE_MAPPING_SERVICE_SECRET
-        role-assignment-service-LD-SDK-KEY: LD_SDK_KEY
-        orm-IDAM-CLIENT-ID: ORM_IDAM_CLIENT_ID
-        orm-IDAM-CLIENT-SECRET: ORG_ROLE_MAPPING_IDAM_CLIENT_SECRET
-        orm-IDAM-ADMIN-SECRET: ORG_ROLE_MAPPING_IDAM_ADMIN_PASSWORD
-        caseworker-topic-primary-send-listen-shared-access-key: AMQP_CRD_SHARED_ACCESS_KEY_VALUE
-        judicial-topic-primary-send-listen-shared-access-key: AMQP_JRD_SHARED_ACCESS_KEY_VALUE
-        org-role-mapping-service-POSTGRES-PASS: ORG_ROLE_MAPPING_DB_PASSWORD
-        app-insights-connection-string: app-insights-connection-string
+