Pull request #4: Fix environment variables

Merge in DCF/mold_cost_calculator from Fix-environment-variables to master

* commit '5f4973ed116d4a503bd7a69d0712f616924d3196':
  add secret key
  Adding secret key to the env

Jenkinsfile

@@ -21,6 +21,13 @@ def mccDatabasePassword = [
   'prd': 'MCC_PRD_DATABASE_PASSWORD',
 ]
 
+def mccSecretKey = [
+  'poc': 'MCC_SECRET_KEY',
+  'dev': 'MCC_SECRET_KEY',
+  'uat': 'MCC_SECRET_KEY',
+  'prd': 'MCC_SECRET_KEY',
+]
+
 def mccDatabase = [
   'poc': 'devmccmccdb-devmccmccdbwriterfe3d6e74-nzeetdanw6sx.c8uwkt51amck.eu-west-1.rds.amazonaws.com/mccdb',
   'dev': 'dev-mld-mccdb.cluster-c8uwkt51amck.eu-west-1.rds.amazonaws.com/mccdb',
@@ -48,8 +55,8 @@ pipeline {
     POSTGRES_PASSWORD_ENV = "${mccDatabasePassword[DEPLOY_ENV]}"
     FLASK_APP = 'run.py'
     FLASK_ENV = 'production'
-    DATABASE_URL = "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${mccDatabase[DEPLOY_ENV]}"
     HOST_ENV = 'AWS'
+    SECRET_KEY_ENV = "${mccSecretKey[DEPLOY_ENV]}"
   }
 
   agent {
@@ -77,8 +84,12 @@ pipeline {
         dir('infra') {
             withCredentials([
               string(credentialsId: "${POSTGRES_PASSWORD_ENV}", variable: 'POSTGRES_PASSWORD'),
+              string(credentialsId: "${SECRET_KEY_ENV}", variable: 'SECRET_KEY'),
               aws(credentialsId: credentialsIDs[env.DEPLOY_ENV], accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY')
               ]) {
+              script {
+                env.DATABASE_URL = "postgresql://${env.POSTGRES_USER}:${env.POSTGRES_PASSWORD}@${mccDatabase[env.DEPLOY_ENV]}"
+              }
               withNvm {
                 sh 'npm install'
                 sh "npx aws-cdk@2.1019.1 bootstrap aws://${env.CDK_DEPLOY_ACCOUNT}/${env.CDK_DEPLOY_REGION} --context config=${env.DEPLOY_ENV} --toolkit-stack-name ${env.DEPLOY_ENV}${env.STACK_NAME} --change-set-name changeset-${env.DEPLOY_ENV}-${currentBuild.number} --qualifier ${env.CDK_QUALIFIER}"

infra/bin/apiStack.ts

@@ -72,6 +72,7 @@ export class MccAPIInfraStack extends Stack {
                 FLASK_ENV: process.env.FLASK_ENV!,
                 DATABASE_URL: process.env.DATABASE_URL!,
                 HOST_ENV: process.env.HOST_ENV!,
+                SECRET_KEY: process.env.SECRET_KEY!,
             },
         });