Small fixes to get the initial version working

Author: Mike McGirr

modules/subnets/main.tf

@@ -8,6 +8,17 @@
  *
  */
 
+# Turn something like
+# var.ipv6_cidr_block = 2600:1f14:929:5700::/56
+# into                  2600:1f14:929:5700::/64
+locals {
+  # TODO map this over each
+  # And generate one to match each ipv4 cidr block in the var.cidr_blocks list
+  # TODO fix. At the moment this only creates one ipv6 cidr block. And that will break if there is more
+  # than one ipv4 address
+  ipv6_cidrs = (var.vpc_ipv6_cidr_block == "" ? [] : ["${trimsuffix(var.vpc_ipv6_cidr_block, "56")}64"] )
+}
+
 resource "aws_subnet" "main" {
   count             = length(var.cidr_blocks)
   vpc_id            = var.vpc_id
@@ -22,6 +33,8 @@ resource "aws_subnet" "main" {
   map_public_ip_on_launch = var.public
 
   assign_ipv6_address_on_creation = var.assign_ipv6_address_on_creation
-  ipv6_cidr_block = var.ipv6_cidr_block
+
+  # TODO fix. This will only work with length(var.cidr_blocks) = 1 at the moment
+  ipv6_cidr_block  = local.ipv6_cidrs[count.index]
 }
 

modules/subnets/variables.tf

@@ -37,8 +37,14 @@ variable "assign_ipv6_address_on_creation" {
   default     = false
 }
 
-variable "ipv6_cidr_block" {
-  description = "The optional ipv6 cidr block for the subnet"
+variable "vpc_ipv6_cidr_block" {
+  description = "The possible ipv6 cidr block for the vpc"
   type        = string
   default     = ""
 }
+
+# variable "ipv6_cidr_blocks" {
+#   description = "The optional ipv6 cidr blocks for the subnet"
+#   type        = list(string)
+#   default     = []
+# }

modules/vpc/outputs.tf

@@ -18,5 +18,5 @@ output "dhcp_options_id" {
 # set to true
 output "ipv6_cidr_block" {
   value       =  (var.assign_generated_ipv6_cidr_block ? aws_vpc.main.ipv6_cidr_block : "")
-  description = "Optional IPv6 CIDR block output"
+  description = "Optional IPv6 CIDR block output for the VPC"
 }