multiple minor fixes

thunderbird · May 12, 2024 · d73dcaf · d73dcaf
1 parent 8a6b29e
commit d73dcaf
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 31 deletions.
diff --git a/tofu/environments/stage/data-store/cache/.terraform.lock.hcl b/tofu/environments/stage/data-store/cache/.terraform.lock.hcl
diff --git a/tofu/environments/stage/data-store/database/terragrunt.hcl b/tofu/environments/stage/data-store/database/terragrunt.hcl
@@ -19,6 +19,7 @@ dependency "vpc" {
   mock_outputs = {
     vpc_id                = "mock_vpc_id"
     database_subnet_group = "mock_subnet_group"
+    database_subnets = []
 
   }
 }
@@ -56,7 +57,8 @@ inputs = {
   name_prefix                = local.name_prefix
   region                     = local.region
   vpc                        = dependency.vpc.outputs.vpc_id
-  subnet_group               = dependency.vpc.outputs.database_subnet_group
+  subnet_group               = local.name_prefix //dependency.vpc.outputs.database_subnet_group
+  database_subnets = dependency.vpc.outputs.database_subnets
   elasticache_security_group = dependency.cache.outputs.security_group_id
   backend_security_group     = dependency.backend.outputs.security_group_id
   database_secret            = "arn:aws:secretsmanager:us-east-1:768512802988:secret:tb-apmt-stage-db-secret-V0syHj"

diff --git a/tofu/environments/stage/services/frontend/.terraform.lock.hcl b/tofu/environments/stage/services/frontend/.terraform.lock.hcl
diff --git a/tofu/modules/data-store/database/main.tf b/tofu/modules/data-store/database/main.tf
@@ -32,6 +32,9 @@ module "db" {
 
   enabled_cloudwatch_logs_exports = ["audit", "error", "general", "slowquery"]
 
+  create_db_subnet_group = true
+  subnet_ids = var.database_subnets
+
   # DB parameter group
   family = "mysql8.0"
 

diff --git a/tofu/modules/data-store/database/variables.tf b/tofu/modules/data-store/database/variables.tf
@@ -28,6 +28,11 @@ variable "subnet_group" {
   type        = string
 }
 
+variable "database_subnets" {
+  description = "DB subnets ids"
+  type = list
+}
+
 variable "elasticache_security_group" {
   description = "Elasticache security group"
   type        = string

diff --git a/tofu/modules/network/vpc/main.tf b/tofu/modules/network/vpc/main.tf
@@ -16,7 +16,7 @@ module "vpc" {
   public_subnets   = [for k, v in local.azs : cidrsubnet("${var.vpc_cidr}", 8, k + 254)]
   database_subnets = [for k, v in local.azs : cidrsubnet("${var.vpc_cidr}", 8, k + 2)]
 
-  create_database_subnet_group  = true
+  create_database_subnet_group  = false
   manage_default_network_acl    = false
   manage_default_route_table    = false
   manage_default_security_group = false

diff --git a/tofu/modules/services/frontend/main.tf b/tofu/modules/services/frontend/main.tf
@@ -129,7 +129,7 @@ resource "aws_cloudfront_distribution" "appointment" {
 
     function_association {
       event_type   = "viewer-request"
-      function_arn = aws_cloudfront_function.rewrite_api.arn
+      function_arn = aws_cloudfront_function.rewrite.arn
     }
 
     viewer_protocol_policy = "redirect-to-https"
@@ -146,7 +146,7 @@ resource "aws_cloudfront_distribution" "appointment" {
 
     function_association {
       event_type   = "viewer-request"
-      function_arn = aws_cloudfront_function.rewrite_api.arn
+      function_arn = aws_cloudfront_function.rewrite.arn
     }
 
     viewer_protocol_policy = "redirect-to-https"
@@ -164,7 +164,7 @@ resource "aws_cloudfront_distribution" "appointment" {
 
     function_association {
       event_type   = "viewer-request"
-      function_arn = aws_cloudfront_function.rewrite_api.arn
+      function_arn = aws_cloudfront_function.rewrite.arn
     }
 
     viewer_protocol_policy = "redirect-to-https"
@@ -192,8 +192,8 @@ resource "aws_cloudfront_origin_access_control" "oac" {
   signing_protocol                  = "sigv4"
 }
 
-resource "aws_cloudfront_function" "rewrite_api" {
-  name    = "${var.name_prefix}-rewrite-api"
+resource "aws_cloudfront_function" "rewrite" {
+  name    = "${var.name_prefix}-rewrite"
   runtime = "cloudfront-js-2.0"
   code    = <<EOT
   async function handler(event) {