update use of PG* vars

instead of DB_ nonstandard vars
pubpub · Feb 20, 2024 · c4b4908 · c4b4908
1 parent 2be6cc3
commit c4b4908
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/core/.env.docker b/core/.env.docker
@@ -1 +1 @@
-DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_DATABASE}?sslmode=require
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}:${PGPORT}/${PGDATABASE}?sslmode=require
diff --git a/infrastructure/terraform/aws/main.tf b/infrastructure/terraform/aws/main.tf
@@ -57,10 +57,10 @@ module "service_core" {
     container_port = 3000
     environment = [
       # { name = "DATABASE_URL", value = module.core_dependency_services.rds_connection_string_sans_password },
-      { name = "DB_USER", value = module.core_dependency_services.rds_connection_components.user },
-      { name = "DB_DATABASE", value = module.core_dependency_services.rds_connection_components.database },
-      { name = "DB_HOST", value = module.core_dependency_services.rds_connection_components.host },
-      { name = "DB_PORT", value = module.core_dependency_services.rds_connection_components.port },
+      { 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 },
+      { name = "PGPORT", value = module.core_dependency_services.rds_connection_components.port },
       { name = "ASSETS_REGION", value = var.region },
       { name = "ASSETS_BUCKET_NAME", value = var.ASSETS_BUCKET_NAME },
       { name = "ASSETS_UPLOAD_KEY", value = var.ASSETS_UPLOAD_KEY },
@@ -71,7 +71,7 @@ module "service_core" {
     ]
 
     secrets = [
-      { name = "DB_PASSWORD", valueFrom = module.core_dependency_services.secrets.rds_db_password },
+      { name = "PGPASSWORD", valueFrom = module.core_dependency_services.secrets.rds_db_password },
       { name = "API_KEY", valueFrom = module.core_dependency_services.secrets.api_key },
       { name = "JWT_SECRET", valueFrom = module.core_dependency_services.secrets.jwt_secret },
       { name = "SENTRY_AUTH_TOKEN", valueFrom = module.core_dependency_services.secrets.sentry_auth_token },
@@ -93,14 +93,14 @@ module "service_flock" {
     container_port = 3000
     environment = [
       { name = "PUBPUB_URL", value = var.pubpub_url },
-      { name = "DB_USER", value = module.core_dependency_services.rds_connection_components.user },
-      { name = "DB_DATABASE", value = module.core_dependency_services.rds_connection_components.database },
-      { name = "DB_HOST", value = module.core_dependency_services.rds_connection_components.host },
-      { name = "DB_PORT", value = module.core_dependency_services.rds_connection_components.port },
+      { 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 },
+      { name = "PGPORT", value = module.core_dependency_services.rds_connection_components.port },
     ]
 
     secrets = [
-      { name = "DB_PASSWORD", valueFrom = module.core_dependency_services.secrets.rds_db_password },
+      { name = "PGPASSWORD", valueFrom = module.core_dependency_services.secrets.rds_db_password },
       { name = "API_KEY", valueFrom = module.core_dependency_services.secrets.api_key },
     ]
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_DATABASE}?sslmode=require
		DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}:${PGPORT}/${PGDATABASE}?sslmode=require