Merge pull request #141 from tablexi/va-support-blacklisted_names-for-subnets

Support blacklisted_names in //aws/vpc/subnets

Author: vandrijevik

aws/vpc/subnets/main.tf

@@ -1,35 +1,12 @@
 # Find the available availability zones
 data "aws_availability_zones" "available" {
+  blacklisted_names = var.blacklisted_names
 }
 
 data "aws_vpc" "current" {
   id = var.vpc_id
 }
 
-locals {
-  default_az_to_netnum = {
-    a = 1
-    b = 2
-    c = 3
-    d = 4
-    e = 5
-    f = 6
-  }
-}
-
-data "template_file" "az_to_netnum" {
-  count    = length(data.aws_availability_zones.available.names)
-  template = "$${netnum}"
-
-  vars = {
-    netnum = local.default_az_to_netnum[substr(
-      element(data.aws_availability_zones.available.names, count.index),
-      -1,
-      1,
-    )]
-  }
-}
-
 resource "aws_route_table" "mod" {
   tags   = var.tags
   vpc_id = var.vpc_id
@@ -48,7 +25,7 @@ resource "aws_subnet" "mod" {
   cidr_block = cidrsubnet(
     data.aws_vpc.current.cidr_block,
     var.newbits,
-    var.netnum_offset + element(data.template_file.az_to_netnum[*].rendered, count.index),
+    var.netnum_offset + count.index + 1,
   )
   map_public_ip_on_launch = var.public
   tags                    = var.tags

aws/vpc/subnets/variables.tf

@@ -21,6 +21,11 @@ variable "netnum_offset" {
   description = "Offset the subnets netnum by a specific amount."
 }
 
+variable "blacklisted_names" {
+  default     = []
+  description = "(Optional) List of blacklisted Availability Zone names."
+}
+
 variable "tags" {
   description = "(Optional) A mapping of tags to assign to the resources"
   type        = map(string)