app: Update template-infra:app to version 0.15.1.post7.dev0+3aa617f

navapbc · Jan 18, 2025 · a9b10f0 · a9b10f0
1 parent e424b73
commit a9b10f0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 41 deletions.
diff --git a/.template-infra/app-app.yml b/.template-infra/app-app.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: v0.15.1-6-g063e063
+_commit: v0.15.1-7-g3aa617f
 _src_path: ../template-infra
 app_has_dev_env_setup: true
 app_local_port: 3000

diff --git a/infra/app/app-config/env-config/database.tf b/infra/app/app-config/env-config/database.tf
@@ -1,12 +1,7 @@
 locals {
   database_config = var.has_database ? {
-    region                      = var.default_region
-    cluster_name                = "${var.app_name}-${var.environment}"
-    app_username                = "app"
-    migrator_username           = "migrator"
-    schema_name                 = "app"
-    app_access_policy_name      = "${var.app_name}-${var.environment}-app-access"
-    migrator_access_policy_name = "${var.app_name}-${var.environment}-migrator-access"
+    region       = var.default_region
+    cluster_name = "${var.app_name}-${var.environment}"
 
     # Enable extensions that require the rds_superuser role to be created here
     # See docs/infra/set-up-database.md for more information

diff --git a/infra/app/database/main.tf b/infra/app/database/main.tf
@@ -47,17 +47,8 @@ module "app_config" {
 }
 
 module "database" {
-  source = "../../modules/database"
-
-  name                        = "${local.prefix}${local.database_config.cluster_name}"
-  app_access_policy_name      = "${local.prefix}${local.database_config.app_access_policy_name}"
-  migrator_access_policy_name = "${local.prefix}${local.database_config.migrator_access_policy_name}"
-
-  # The following are not AWS infra resources and therefore do not need to be
-  # isolated via the terraform workspace prefix
-  app_username      = local.database_config.app_username
-  migrator_username = local.database_config.migrator_username
-  schema_name       = local.database_config.schema_name
+  source = "../../modules/database/resources"
+  name   = "${local.prefix}${local.database_config.cluster_name}"
 
   vpc_id                         = module.network.vpc_id
   database_subnet_group_name     = module.network.database_subnet_group_name

diff --git a/infra/app/service/database.tf b/infra/app/service/database.tf
@@ -2,18 +2,8 @@ locals {
   database_config = local.environment_config.database_config
 }
 
-data "aws_rds_cluster" "db_cluster" {
-  count              = module.app_config.has_database ? 1 : 0
-  cluster_identifier = local.database_config.cluster_name
+module "database" {
+  count  = module.app_config.has_database ? 1 : 0
+  source = "../../modules/database/data"
+  name   = local.database_config.cluster_name
 }
-
-data "aws_iam_policy" "app_db_access_policy" {
-  count = module.app_config.has_database ? 1 : 0
-  name  = local.database_config.app_access_policy_name
-}
-
-data "aws_iam_policy" "migrator_db_access_policy" {
-  count = module.app_config.has_database ? 1 : 0
-  name  = local.database_config.migrator_access_policy_name
-}
-
diff --git a/infra/app/service/main.tf b/infra/app/service/main.tf
@@ -81,15 +81,15 @@ module "service" {
   scheduled_jobs   = local.environment_config.scheduled_jobs
 
   db_vars = module.app_config.has_database ? {
-    security_group_ids         = data.aws_rds_cluster.db_cluster[0].vpc_security_group_ids
-    app_access_policy_arn      = data.aws_iam_policy.app_db_access_policy[0].arn
-    migrator_access_policy_arn = data.aws_iam_policy.migrator_db_access_policy[0].arn
+    security_group_ids         = module.database[0].security_group_ids
+    app_access_policy_arn      = module.database[0].app_access_policy_arn
+    migrator_access_policy_arn = module.database[0].migrator_access_policy_arn
     connection_info = {
-      host        = data.aws_rds_cluster.db_cluster[0].endpoint
-      port        = data.aws_rds_cluster.db_cluster[0].port
-      user        = local.database_config.app_username
-      db_name     = data.aws_rds_cluster.db_cluster[0].database_name
-      schema_name = local.database_config.schema_name
+      host        = module.database[0].host
+      port        = module.database[0].port
+      user        = module.database[0].app_username
+      db_name     = module.database[0].db_name
+      schema_name = module.database[0].schema_name
     }
   } : null