Fixes handling of address_prefixes (#28)

- Updates condition for ipv4_cidr_provided flag to include a greater than zero test
- Reorders resources according to execution
- Updates output dependencies to wait for address prefixes to be provisioned and the default flag to be set

Signed-off-by: Sean Sundberg <[email protected]>

Author: Sean Sundberg

main.tf

@@ -9,9 +9,8 @@ locals {
   security_group_id = data.ibm_is_vpc.vpc.default_security_group
   acl_id            = data.ibm_is_vpc.vpc.default_network_acl
   crn               = data.ibm_is_vpc.vpc.resource_crn
-  ipv4_cidr_provided = length(var.address_prefixes) >= var.address_prefix_count
+  ipv4_cidr_provided = var.address_prefix_count > 0 && length(var.address_prefixes) >= var.address_prefix_count
   ipv4_cidr_block    = local.ipv4_cidr_provided ? var.address_prefixes : [ for val in range(var.address_prefix_count): "" ]
-  address_prefix_management = local.ipv4_cidr_provided ? "manual" : "auto"
   provision_cidr     = var.provision && local.ipv4_cidr_provided
 }
 
@@ -24,34 +23,40 @@ resource null_resource print_values {
   }
 }
 
-resource ibm_is_vpc_address_prefix cidr_prefix {
-  count = local.provision_cidr ? var.address_prefix_count : 0
-
-  name  = "${local.vpc_name}-cidr-${format("%02s", count.index)}"
-  zone  = local.vpc_zone_names[count.index]
-  vpc   = data.ibm_is_vpc.vpc.id
-  cidr  = local.ipv4_cidr_block[count.index]
-}
-
 resource ibm_is_vpc vpc {
   count = var.provision ? 1 : 0
 
   name                        = local.vpc_name
   resource_group              = var.resource_group_id
-  address_prefix_management   = local.address_prefix_management
+  address_prefix_management   = local.ipv4_cidr_provided ? "manual" : "auto"
   default_security_group_name = "${local.vpc_name}-security-group"
   default_network_acl_name    = "${local.vpc_name}-acl"
   default_routing_table_name  = "${local.vpc_name}-routing"
 }
 
+data ibm_is_vpc vpc {
+  depends_on = [ibm_is_vpc.vpc]
+
+  name = local.vpc_name
+}
+
+resource ibm_is_vpc_address_prefix cidr_prefix {
+  count = local.provision_cidr ? var.address_prefix_count : 0
+
+  name  = "${local.vpc_name}-cidr-${format("%02s", count.index)}"
+  zone  = local.vpc_zone_names[count.index]
+  vpc   = data.ibm_is_vpc.vpc.id
+  cidr  = local.ipv4_cidr_block[count.index]
+}
+
 # Set the address prefixes as the default.  This will allow us to specify the number of ips required
 # in each subnet, instead of figuring out specific cidrs.
 # Note the "split" function call - this is because the id returned from creating the address
 # comes back as <vpc_id>/<address_range_id> and the update call wants these passed as separate
 # arguments.  I suspect this is actually a defect in what is returned from ibm_is_vpc_address_prefix
 # and it may one day be fixed and trip up this code.
 resource null_resource post_vpc_address_pfx_default {
-  count = local.provision_cidr ? var.address_prefix_count : 0
+  count = local.provision_cidr ? 1 : 0
   depends_on = [ibm_is_vpc_address_prefix.cidr_prefix]
 
   provisioner "local-exec" {
@@ -64,12 +69,6 @@ resource null_resource post_vpc_address_pfx_default {
   }
 }
 
-data ibm_is_vpc vpc {
-  depends_on = [ibm_is_vpc.vpc]
-
-  name = local.vpc_name
-}
-
 resource ibm_is_security_group_rule rule_icmp_ping {
   count = var.provision ? 1 : 0
 

outputs.tf

@@ -1,13 +1,13 @@
 
 output "name" {
   value       = local.vpc_name
-  depends_on  = [ibm_is_vpc.vpc]
+  depends_on  = [null_resource.post_vpc_address_pfx_default]
   description = "The name of the vpc instance"
 }
 
 output "id" {
   value       = local.vpc_id
-  depends_on  = [ibm_is_vpc.vpc]
+  depends_on  = [null_resource.post_vpc_address_pfx_default]
   description = "The id of the vpc instance"
 }
 
@@ -18,6 +18,6 @@ output "acl_id" {
 
 output "crn" {
   value       = local.crn
-  depends_on  = [ibm_is_vpc.vpc]
+  depends_on  = [null_resource.post_vpc_address_pfx_default]
   description = "The CRN for the vpc instance"
 }