fix: fix outputs for VPC and Subnets to support new or existing (#688)

Author: toddgiguere

README.md

@@ -191,7 +191,7 @@ To attach access management tags to resources in this module, you need the follo
 | <a name="output_subnet_ids"></a> [subnet\_ids](#output\_subnet\_ids) | The IDs of the subnets |
 | <a name="output_subnet_zone_list"></a> [subnet\_zone\_list](#output\_subnet\_zone\_list) | A list containing subnet IDs and subnet zones |
 | <a name="output_vpc_crn"></a> [vpc\_crn](#output\_vpc\_crn) | CRN of VPC created |
-| <a name="output_vpc_data"></a> [vpc\_data](#output\_vpc\_data) | Data of the VPC created. |
+| <a name="output_vpc_data"></a> [vpc\_data](#output\_vpc\_data) | Data of the VPC used in this module, created or existing. |
 | <a name="output_vpc_flow_logs"></a> [vpc\_flow\_logs](#output\_vpc\_flow\_logs) | Details of VPC flow logs collector |
 | <a name="output_vpc_id"></a> [vpc\_id](#output\_vpc\_id) | ID of VPC created |
 | <a name="output_vpc_name"></a> [vpc\_name](#output\_vpc\_name) | Name of VPC created |

examples/default/outputs.tf

@@ -12,6 +12,16 @@ output "vpc_crn" {
   description = "VPC crn"
 }
 
+output "vpc_name" {
+  value       = module.slz_vpc.vpc_data.name
+  description = "VPC name property taken from the larger data element"
+}
+
+output "subnet_ids" {
+  value       = module.slz_vpc.subnet_ids
+  description = "list of VPC subnet ids created"
+}
+
 output "vpc_flow_logs_collector" {
   value       = module.slz_vpc.vpc_flow_logs
   description = "VPC flow logs collector"

main.tf

@@ -122,7 +122,8 @@ data "ibm_is_vpc" "vpc" {
 }
 
 locals {
-  vpc_id = var.create_vpc ? ibm_is_vpc.vpc[0].id : var.existing_vpc_id
+  vpc_id   = var.create_vpc ? ibm_is_vpc.vpc[0].id : var.existing_vpc_id
+  vpc_data = var.create_vpc ? ibm_is_vpc.vpc[0] : data.ibm_is_vpc.vpc[0]
 }
 
 # Configure custom resolver on the hub vpc

outputs.tf

@@ -4,7 +4,7 @@
 
 output "vpc_name" {
   description = "Name of VPC created"
-  value       = var.create_vpc == true ? ibm_is_vpc.vpc[0].name : data.ibm_is_vpc.vpc[0].name
+  value       = local.vpc_data.name
 }
 
 output "vpc_id" {
@@ -14,7 +14,7 @@ output "vpc_id" {
 
 output "vpc_crn" {
   description = "CRN of VPC created"
-  value       = var.create_vpc == true ? ibm_is_vpc.vpc[0].crn : data.ibm_is_vpc.vpc[0].crn
+  value       = local.vpc_data.crn
 }
 
 ##############################################################################
@@ -44,7 +44,7 @@ output "public_gateways" {
 output "subnet_ids" {
   description = "The IDs of the subnets"
   value = [
-    for subnet in ibm_is_subnet.subnet :
+    for subnet in local.subnets :
     subnet.id
   ]
 }
@@ -53,11 +53,11 @@ output "subnet_detail_list" {
   description = "A list of subnets containing names, CIDR blocks, and zones."
   value = {
     for zone_name in distinct([
-      for subnet in ibm_is_subnet.subnet :
+      for subnet in local.subnets :
       subnet.zone
     ]) :
     zone_name => {
-      for subnet in ibm_is_subnet.subnet :
+      for subnet in local.subnets :
       subnet.name => {
         id   = subnet.id
         cidr = subnet.ipv4_cidr_block
@@ -70,7 +70,7 @@ output "subnet_detail_list" {
 output "subnet_zone_list" {
   description = "A list containing subnet IDs and subnet zones"
   value = [
-    for subnet in ibm_is_subnet.subnet : {
+    for subnet in local.subnets : {
       name = subnet.name
       id   = subnet.id
       zone = subnet.zone
@@ -84,11 +84,11 @@ output "subnet_detail_map" {
   description = "A map of subnets containing IDs, CIDR blocks, and zones"
   value = {
     for zone_name in distinct([
-      for subnet in ibm_is_subnet.subnet :
+      for subnet in local.subnets :
       subnet.zone
     ]) :
     "zone-${substr(zone_name, -1, length(zone_name))}" => [
-      for subnet in ibm_is_subnet.subnet :
+      for subnet in local.subnets :
       {
         id         = subnet.id
         zone       = subnet.zone
@@ -143,8 +143,8 @@ output "cidr_blocks" {
 }
 
 output "vpc_data" {
-  description = "Data of the VPC created."
-  value       = ibm_is_vpc.vpc
+  description = "Data of the VPC used in this module, created or existing."
+  value       = local.vpc_data
 }
 
 ##############################################################################