fix

terraform-modules · Apr 18, 2023 · 7f93454 · 7f93454
1 parent f7e3814
commit 7f93454
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/subnets/main.tf b/subnets/main.tf
@@ -80,11 +80,12 @@ locals {
 locals {
   _public_subnets = { for v in var.public_subnets : v.label =>
     {
-      base_cidr = v.base_cidr
-      label     = v.label
-      bits      = v.bits
-      private   = v.private
-      offset    = v.offset
+      base_cidr  = v.base_cidr
+      base_label = v.label
+      label      = v.label
+      bits       = v.bits
+      private    = v.private
+      offset     = v.offset
       #      subnets            = [for i in local.az_count_list : cidrsubnet(v.base_cidr, v.bits, v.offset + i)]
       #      labels             = [for az in local.availability_zones : format("%v-%v", v.label, az)]
       availability_zones = length(lookup(v, "availability_zones", [])) != 0 ? lookup(v, "availability_zones") : local.availability_zones
@@ -101,7 +102,7 @@ locals {
   public_map = flatten([for k, v in local.public_subnets :
     #  [for i in local.az_count_list : tomap({ "subnet" = v.subnets[i], "label" = v.labels[i], "availability_zone" = v.availability_zones[i], "tags" = v.tags })]])
     #  [for i in local.az_count_list : merge(tomap({ "subnet" = v.subnets[i], "label" = v.labels[i], "availability_zone" = v.availability_zones[i] }), { "tags" = v.tags })]])
-  [for i in v.az_count_list : merge(tomap({ "subnet" = v.subnets[i], "label" = v.labels[i], "availability_zone" = v.availability_zones[i] }), { "tags" = v.tags })]])
+  [for i in v.az_count_list : merge(tomap({ "subnet" = v.subnets[i], "base_label" = v.label, "label" = v.labels[i], "availability_zone" = v.availability_zones[i] }), { "tags" = v.tags })]])
 }
 
 
@@ -117,7 +118,7 @@ resource "aws_subnet" "public" {
     each.value.tags,
     {
       "Name"                 = format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label),
-      "boc:vpc:subnet_label" = each.value.label,
+      "boc:vpc:subnet_label" = each.value.base_label,
     }
   )
 }
@@ -129,11 +130,12 @@ resource "aws_subnet" "public" {
 locals {
   _private_subnets = { for v in var.private_subnets : v.label =>
     {
-      base_cidr = v.base_cidr
-      label     = v.label
-      bits      = v.bits
-      private   = v.private
-      offset    = v.offset
+      base_cidr  = v.base_cidr
+      base_label = v.label
+      label      = v.label
+      bits       = v.bits
+      private    = v.private
+      offset     = v.offset
       #      subnets            = [for i in local.az_count_list : cidrsubnet(v.base_cidr, v.bits, v.offset + i)]
       #      labels             = [for az in local.availability_zones : format("%v-%v", v.label, az)]
       availability_zones = length(lookup(v, "availability_zones", [])) != 0 ? lookup(v, "availability_zones") : local.availability_zones
@@ -152,7 +154,7 @@ locals {
     #  [for i in local.az_count_list : merge(v.tags, tomap({ "subnet" = v.subnets[i], "label" = v.labels[i], "availability_zone" = v.availability_zones[i] }))]])
     #  [for i in local.az_count_list : tomap({ "subnet" = v.subnets[i], "label" = v.labels[i], "availability_zone" = v.availability_zones[i], "tags" = v.tags })]])
     #  [for i in local.az_count_list : merge(tomap({ "subnet" = v.subnets[i], "label" = v.labels[i], "availability_zone" = v.availability_zones[i] }), { "tags" = v.tags })]])
-  [for i in v.az_count_list : merge(tomap({ "subnet" = v.subnets[i], "label" = v.labels[i], "availability_zone" = v.availability_zones[i] }), { "tags" = v.tags })]])
+  [for i in v.az_count_list : merge(tomap({ "subnet" = v.subnets[i], "base_label" = v.label, "label" = v.labels[i], "availability_zone" = v.availability_zones[i] }), { "tags" = v.tags })]])
 }
 
 resource "aws_subnet" "private" {
@@ -167,7 +169,7 @@ resource "aws_subnet" "private" {
     each.value.tags,
     {
       "Name"                 = format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label),
-      "boc:vpc:subnet_label" = each.value.label,
+      "boc:vpc:subnet_label" = each.value.base_label,
     }
   )
 }