From 047b2232f422b4401c9afef3a0e0177a5a1b03c6 Mon Sep 17 00:00:00 2001
From: "eve n.u" <eve@eatbigger.fish>
Date: Thu, 2 May 2024 14:37:02 -0700
Subject: [PATCH] fix: do not force sslmode at infrastructure level

---
 core/.env.docker                                            | 2 +-
 .../terraform/aws/modules/core-services/outputs.tf          | 6 ------
 infrastructure/terraform/aws/modules/deployment/main.tf     | 2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/.env.docker b/core/.env.docker
index b078bce2c..d7f38fe8c 100644
--- a/core/.env.docker
+++ b/core/.env.docker
@@ -1 +1 @@
-DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}:${PGPORT}/${PGDATABASE}?sslmode=require
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}:${PGPORT}/${PGDATABASE}
diff --git a/infrastructure/terraform/aws/modules/core-services/outputs.tf b/infrastructure/terraform/aws/modules/core-services/outputs.tf
index 123279536..e55d3ace2 100644
--- a/infrastructure/terraform/aws/modules/core-services/outputs.tf
+++ b/infrastructure/terraform/aws/modules/core-services/outputs.tf
@@ -2,7 +2,6 @@ locals {
   db_user = aws_db_instance.core_postgres.username
   db_name = aws_db_instance.core_postgres.db_name
   db_host = aws_db_instance.core_postgres.address
-  db_sslmode = "require"
 }
 
 output "secrets" {
@@ -23,17 +22,12 @@ output "asset_uploader_key_id" {
   value = aws_iam_access_key.asset_uploader.id
 }
 
-output "rds_connection_string_sans_password" {
-  value = "postgresql://${local.db_user}@${local.db_host}:5432/${local.db_name}?sslmode=${local.db_sslmode}"
-}
-
 output "rds_connection_components" {
   value = {
     user = local.db_user
     database = local.db_name
     host = local.db_host
     port = "5432"
-    sslmode = local.db_sslmode
     id = aws_db_instance.core_postgres.id
   }
 }
diff --git a/infrastructure/terraform/aws/modules/deployment/main.tf b/infrastructure/terraform/aws/modules/deployment/main.tf
index 3af3191d4..660d12c54 100644
--- a/infrastructure/terraform/aws/modules/deployment/main.tf
+++ b/infrastructure/terraform/aws/modules/deployment/main.tf
@@ -68,7 +68,6 @@ module "service_core" {
   configuration = {
     container_port = 3000
     environment = [
-      # { name = "DATABASE_URL", value = module.core_dependency_services.rds_connection_string_sans_password },
       { name = "PGUSER", value = module.core_dependency_services.rds_connection_components.user },
       { name = "PGDATABASE", value = module.core_dependency_services.rds_connection_components.database },
       { name = "PGHOST", value = module.core_dependency_services.rds_connection_components.host },
@@ -205,7 +204,6 @@ module "service_flock" {
 
    configuration = {
      environment = [
-       # { name = "DATABASE_URL", value = module.core_dependency_services.rds_connection_string_sans_password },
        { name = "PGUSER", value = module.core_dependency_services.rds_connection_components.user },
        { name = "PGDATABASE", value = module.core_dependency_services.rds_connection_components.database },
        { name = "PGHOST", value = module.core_dependency_services.rds_connection_components.host },