Missing defaults and add pass-through from byo-vpc to byo-db

fleetdm · Jun 22, 2024 · 0d1b9a9 · 0d1b9a9
1 parent c9f0eb5
commit 0d1b9a9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/terraform/byo-vpc/byo-db/variables.tf b/terraform/byo-vpc/byo-db/variables.tf
@@ -152,6 +152,12 @@ variable "fleet_config" {
       }), {
       subnets         = null
       security_groups = null
+      ingress_sources = {
+        cidr_blocks      = []
+        ipv6_cidr_blocks = []
+        security_groups  = []
+        prefix_list_ids  = []
+      }
     })
     autoscaling = optional(object({
       max_capacity                 = optional(number, 5)

diff --git a/terraform/byo-vpc/main.tf b/terraform/byo-vpc/main.tf
@@ -13,7 +13,9 @@ module "byo-db" {
       address = "${module.redis.endpoint}:${module.redis.port}"
     }
     networking = {
-      subnets = var.vpc_config.networking.subnets
+      subnets         = var.vpc_config.networking.subnets
+      security_groups = var.fleet_config.networking.security_groups
+      ingress_sources = var.fleet_config.networking.ingress_sources
     }
   })
   ecs_cluster      = var.ecs_cluster

diff --git a/terraform/byo-vpc/variables.tf b/terraform/byo-vpc/variables.tf
@@ -245,6 +245,12 @@ variable "fleet_config" {
       }), {
       subnets         = null
       security_groups = null
+      ingress_sources = {
+        cidr_blocks      = []
+        ipv6_cidr_blocks = []
+        security_groups  = []
+        prefix_list_ids  = []
+      }
     })
     autoscaling = optional(object({
       max_capacity                 = optional(number, 5)

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -293,6 +293,12 @@ variable "fleet_config" {
       }), {
       subnets         = null
       security_groups = null
+      ingress_sources = {
+        cidr_blocks      = []
+        ipv6_cidr_blocks = []
+        security_groups  = []
+        prefix_list_ids  = []
+      }
     })
     autoscaling = optional(object({
       max_capacity                 = optional(number, 5)