Merge pull request #1772 from DFE-Digital/paas/fix_db_connection

Fix Database Connection
DFE-Digital · Jun 15, 2021 · 85b1ad0 · 85b1ad0
2 parents 93e945c + 1d5226b
commit 85b1ad0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/terraform/paas/application.tf b/terraform/paas/application.tf
@@ -1,10 +1,12 @@
 locals {
   environment_map = { REDIS_URL = local.redis-credentials.uri,
-    DB_DATABASE    = local.postgres-credentials.name 
-    DB_HOST        = local.postgres-credentials.host,
-    DB_USERNAME    = local.postgres-credentials.username,
-    DB_PASSWORD    = local.postgres-credentials.password,
-    SKIP_FORCE_SSL = true,
+    DB_DATABASE         = local.postgres-credentials.name 
+    DB_HOST             = local.postgres-credentials.host,
+    DB_USERNAME         = local.postgres-credentials.username,
+    DB_PASSWORD         = local.postgres-credentials.password,
+    SKIP_FORCE_SSL      = true,
+    SENTRY_CURRENT_ENV  = var.application_environment,
+    SLACK_ENV           = var.application_environment
   }
 }
 

diff --git a/terraform/paas/review.env.tfvars b/terraform/paas/review.env.tfvars
@@ -1,6 +1,7 @@
 paas_space                = "get-into-teaching"
 paas_database_common_name = "school-experience-dev-pg-common-svc"
 paas_redis_1_name         = "school-experience-dev-redis-svc"
+application_environment   = "dfe-school-experience-review"
 application_instances     = 1
 logging                   = 0
 databases                 = 0

diff --git a/terraform/paas/variables.tf b/terraform/paas/variables.tf
@@ -77,6 +77,10 @@ variable "postgres_service_key" {
   default = "postgres_service_key"
 }
 
+variable "application_environment" {
+  default = "dfe-school-experience-development"
+}
+
 variable "paas_application_name" {
   default = "dfe-school-experience-app"
 }