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

Fix Database Connection

terraform/paas/application.tf

@@ -1,7 +1,6 @@
 locals {
   environment_map = { REDIS_URL = local.redis-credentials.uri,
-    DATABASE_URL   = local.postgres-credentials.uri,
-    DB_DATABASE    = "schools-experience",
+    DB_DATABASE    = local.postgres-credentials.name 
     DB_HOST        = local.postgres-credentials.host,
     DB_USERNAME    = local.postgres-credentials.username,
     DB_PASSWORD    = local.postgres-credentials.password,
@@ -27,22 +26,6 @@ resource "cloudfoundry_app" "application" {
     route = cloudfoundry_route.route_internal.id
   }
 
-  # For Review Apps find existing Resources
-  dynamic "service_binding" {
-    for_each = concat(data.cloudfoundry_service_instance.redis, data.cloudfoundry_service_instance.redis)
-    content {
-      service_instance = service_binding.value["id"]
-    }
-  }
-
-  # For Dev/Test/Production Apps use created Resources
-  dynamic "service_binding" {
-    for_each = concat(cloudfoundry_service_instance.redis, cloudfoundry_service_instance.postgres, cloudfoundry_user_provided_service.logging)
-    content {
-      service_instance = service_binding.value["id"]
-    }
-  }
-
   environment = merge(local.application_secrets, local.environment_map)
 
 }