missing references when mount point not available (#248) (#249)

hmcts · Feb 26, 2020 · 98f701b · 98f701b
1 parent 2efbddb
commit 98f701b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/api/lib/appInsights.ts b/api/lib/appInsights.ts
@@ -1,6 +1,6 @@
 import * as applicationinsights from 'applicationinsights'
 import * as express from 'express'
-import {getConfigValue, getEnvironment} from '../configuration'
+import {getConfigValue} from '../configuration'
 import {APP_INSIGHTS_ENABLED, APP_INSIGHTS_KEY} from '../configuration/references'
 
 export let client

diff --git a/api/local.ts b/api/local.ts
@@ -9,6 +9,7 @@ import * as auth from './auth'
 import {environmentCheckText, getConfigValue, getEnvironment} from './configuration'
 import {ERROR_NODE_CONFIG_ENV} from './configuration/constants'
 import {
+  APP_INSIGHTS_KEY,
   COOKIE_TOKEN,
   COOKIES_USERID,
   IDAM_CLIENT,
@@ -42,6 +43,8 @@ if (!getEnvironment()) {
  */
 console.log(environmentCheckText())
 
+console.log('APP_INSIGHTS:', getConfigValue(APP_INSIGHTS_KEY))
+
 // TODO: Testing that we can get the environment variables on AAT from the .yaml file
 console.log('COOKIE_TOKEN')
 console.log(getConfigValue(COOKIE_TOKEN))

diff --git a/charts/xui-ao-webapp/values.aat.template.yaml b/charts/xui-ao-webapp/values.aat.template.yaml
@@ -3,9 +3,6 @@ nodejs:
   ingressHost: ${SERVICE_FQDN}
   environment:
     NODE_TLS_REJECT_UNAUTHORIZED: 1
-    S2S_SECRET: ${S2S_SECRET}
-    IDAM_SECRET: ${IDAM_SECRET}
-    APPINSIGHTS_INSTRUMENTATIONKEY: ${APPINSIGHTS_INSTRUMENTATIONKEY}
     PUI_ENV: aat
     IDAM_API_SERVICE: https://idam-api.aat.platform.hmcts.net
     IDAM_WEB_SERVICE: https://idam-web-public.aat.platform.hmcts.net
diff --git a/charts/xui-ao-webapp/values.preview.template.yaml b/charts/xui-ao-webapp/values.preview.template.yaml
@@ -3,9 +3,6 @@ nodejs:
   ingressHost: ${SERVICE_FQDN}
   environment:
     NODE_TLS_REJECT_UNAUTHORIZED: 0
-    S2S_SECRET: ${S2S_SECRET}
-    IDAM_SECRET: ${IDAM_SECRET}
-    APPINSIGHTS_INSTRUMENTATIONKEY: ${APPINSIGHTS_INSTRUMENTATIONKEY}
     PUI_ENV: preview
     IDAM_API_SERVICE: https://idam-api.aat.platform.hmcts.net
     IDAM_WEB_SERVICE: https://idam-web-public.aat.platform.hmcts.net
diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -26,6 +26,13 @@
     "s2s": "S2S_SERVICE"
   },
   "sessionSecret": "SESSION_SECRET",
-  "appInsightsEnabled": "APP_INSIGHTS_ENABLED"
+  "appInsightsEnabled": "APP_INSIGHTS_ENABLED",
+  "secrets": {
+    "rpx": {
+      "AppInsightsInstrumentationKey": "APPINSIGHTS_INSTRUMENTATIONKEY",
+      "ao-s2s-client-secret": "S2S_SECRET",
+      "ao-idam-client-secret": "IDAM_SECRET"
+    }
+  }
 }