diff --git a/.template-infra/app-app.yml b/.template-infra/app-app.yml index 6c3d352..1a86b06 100644 --- 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.2-10-g50da2c8 +_commit: v0.15.2-11-geddae5c _src_path: https://github.com/navapbc/template-infra app_has_dev_env_setup: true app_local_port: 3000 diff --git a/infra/app/database/main.tf b/infra/app/database/main.tf index 7268a2a..d35dd37 100644 --- a/infra/app/database/main.tf +++ b/infra/app/database/main.tf @@ -50,9 +50,7 @@ module "database" { 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 - private_subnet_ids = module.network.database_subnet_ids - aws_services_security_group_id = module.network.aws_services_security_group_id - is_temporary = local.is_temporary + network_name = local.environment_config.network_name + project_name = module.project_config.project_name + is_temporary = local.is_temporary } diff --git a/infra/app/service/main.tf b/infra/app/service/main.tf index 665d401..ffa4c61 100644 --- a/infra/app/service/main.tf +++ b/infra/app/service/main.tf @@ -63,10 +63,8 @@ module "service" { image_tag = local.image_tag - vpc_id = module.network.vpc_id - public_subnet_ids = module.network.public_subnet_ids - private_subnet_ids = module.network.private_subnet_ids - aws_services_security_group_id = module.network.aws_services_security_group_id + network_name = local.environment_config.network_name + project_name = module.project_config.project_name domain_name = module.domain.domain_name hosted_zone_id = module.domain.hosted_zone_id diff --git a/infra/app/service/network.tf b/infra/app/service/network.tf deleted file mode 100644 index a70a15b..0000000 --- a/infra/app/service/network.tf +++ /dev/null @@ -1,5 +0,0 @@ -module "network" { - source = "../../modules/network/data" - project_name = module.project_config.project_name - name = local.environment_config.network_name -}