PIC-3530 read secretss from k8s secrets

ministryofjustice · Dec 11, 2023 · d202c55 · d202c55
1 parent d6e3aa6
commit d202c55
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/config.js b/config.js
@@ -29,6 +29,7 @@ module.exports = {
     casesTotalDays: get('CASES_TOTAL_DAYS', 13),
     casesPastDays: get('CASES_PAST_DAYS', 6),
     caseTrackingPrePilotUsers: getCsvParamAsArray('CASE_TRACKING_PRE_PILOT_USERS'),
+    liverpoolPrePilotUsers: getCsvParamAsArray('LIVERPOOL_PRE_PILOT_USERS'),
     caseSearchUsers: getCsvParamAsArray('CASE_SEARCH_USERS'),
     pacEnvironment: get('PAC_ENV', 'UNKNOWN'),
     enablePastCasesNavigation: getBooleanParam('ENABLE_PAST_CASES_NAVIGATION'),

diff --git a/helm_deploy/prepare-a-case/templates/_envs.tpl b/helm_deploy/prepare-a-case/templates/_envs.tpl
@@ -43,9 +43,21 @@ env:
   - name: NOTIFICATION_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: prepare-a-case
+        name: case-tracking-pre-pilot-users
         key: NOTIFICATION_PASSWORD
 
+  - name: CASE_TRACKING_PRE_PILOT_USERS
+    valueFrom:
+      secretKeyRef:
+        name: liverpool-pre-pilot-users
+        key: CASE_TRACKING_PRE_PILOT_USERS
+
+  - name: LIVERPOOL_PRE_PILOT_USERS
+    valueFrom:
+      secretKeyRef:
+        name: case-tracking-pre-pilot-users
+        key: LIVERPOOL_PRE_PILOT_USERS
+
   - name: NOMIS_AUTH_URL
     value: {{ .Values.env.NOMIS_AUTH_URL | quote }}
 

diff --git a/helm_deploy/values-preprod.yaml b/helm_deploy/values-preprod.yaml
@@ -28,7 +28,6 @@ env:
   ENABLE_CASE_PROGRESS: true
   ENABLE_APP_INSIGHTS: true
   ENABLE_HEARING_OUTCOMES: true
-  CASE_TRACKING_PRE_PILOT_USERS: joana.aguia,tony.howard,tfe58u,ravishankar.challapalli
   CASE_SEARCH_USERS: all
   ENABLE_SERVERSIDE_PAGING: true
 

diff --git a/helm_deploy/values-prod.yaml b/helm_deploy/values-prod.yaml
@@ -29,7 +29,6 @@ env:
   ENABLE_CASE_PROGRESS: true
   ENABLE_APP_INSIGHTS: true
   ENABLE_HEARING_OUTCOMES: true
-  CASE_TRACKING_PRE_PILOT_USERS: ZAP37S,BEVERLEYWILLMOTTNPS,ZRX14Y,wyi97r,mdy87w,sarahclarkenps,bethanylilleynps,jenniferrawlingsnps,maxholgatenps,wjf65j,xzu68s,CZE89A,serenacannannps,qgd46q,santoshchakrabartnps
   CASE_SEARCH_USERS: all
   ENABLE_SERVERSIDE_PAGING: true
 

diff --git a/server/utils/features.js b/server/utils/features.js
@@ -3,10 +3,7 @@ const {
 } = require('./featureTogglePredicates')
 const { settings } = require('../../config')
 
-const LIVERPOOL_PRE_PILOT_USERS = ['TaylorColinoNPS', 'debbieleenps', 'emmacaddicknps', 'qml95k', 'brn63n']
-
 const PLYMOUTH_MAGS_COURT_CODE = 'B50KH'
-
 const PILOT_COURTS = ['B20EB', 'B23HS']
 
 const features = {
@@ -33,7 +30,7 @@ const features = {
         ),
         allOf(
           enabledForCourts('B05PK'),
-          enabledForUsers(...settings.caseTrackingPrePilotUsers, ...LIVERPOOL_PRE_PILOT_USERS)
+          enabledForUsers(...settings.caseTrackingPrePilotUsers, ...settings.liverpoolPrePilotUsers)
         ),
         enabledForCourts(...PILOT_COURTS)
       )