feat: add json string input to patterns, update rg logic (#39)

* feat: add json string input to patterns, update rg logic * feat: update virtual server module * feat: update virtual server module Co-authored-by: Adam Geiger <[email protected]> Co-authored-by: Vincent Burckhardt <[email protected]>
terraform-ibm-modules · Aug 15, 2022 · 77361ca · 77361ca
1 parent 893b3ae
commit 77361ca
Show file tree

Hide file tree

Showing 12 changed files with 237 additions and 178 deletions.
diff --git a/README.md b/README.md
@@ -935,15 +935,15 @@ Manage > Access (IAM) > Access groups > Access policies.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_bastion_host"></a> [bastion\_host](#module\_bastion\_host) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git | v1.0.4 |
+| <a name="module_bastion_host"></a> [bastion\_host](#module\_bastion\_host) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git | v1.1.0 |
 | <a name="module_dynamic_values"></a> [dynamic\_values](#module\_dynamic\_values) | ./dynamic_values | n/a |
-| <a name="module_f5_vsi"></a> [f5\_vsi](#module\_f5\_vsi) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git | v1.0.4 |
+| <a name="module_f5_vsi"></a> [f5\_vsi](#module\_f5\_vsi) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git | v1.1.0 |
 | <a name="module_key_management"></a> [key\_management](#module\_key\_management) | ./kms | n/a |
 | <a name="module_placement_group_map"></a> [placement\_group\_map](#module\_placement\_group\_map) | ./dynamic_values/config_modules/list_to_map | n/a |
 | <a name="module_ssh_keys"></a> [ssh\_keys](#module\_ssh\_keys) | ./ssh_key | n/a |
 | <a name="module_teleport_config"></a> [teleport\_config](#module\_teleport\_config) | ./teleport_config | n/a |
 | <a name="module_vpc"></a> [vpc](#module\_vpc) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc.git | v2.1.0 |
-| <a name="module_vsi"></a> [vsi](#module\_vsi) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git | v1.0.4 |
+| <a name="module_vsi"></a> [vsi](#module\_vsi) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git | v1.1.0 |
 
 ## Resources
 
@@ -1039,6 +1039,7 @@ Manage > Access (IAM) > Access groups > Access policies.
 | <a name="output_cos_key_names"></a> [cos\_key\_names](#output\_cos\_key\_names) | List of names for created COS keys |
 | <a name="output_cos_names"></a> [cos\_names](#output\_cos\_names) | List of Cloud Object Storage instance names |
 | <a name="output_f5_host_names"></a> [f5\_host\_names](#output\_f5\_host\_names) | List of bastion host names |
+| <a name="output_fip_vsi_data"></a> [fip\_vsi\_data](#output\_fip\_vsi\_data) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. This list only contains instances with a floating IP attached. |
 | <a name="output_resource_group_names"></a> [resource\_group\_names](#output\_resource\_group\_names) | List of resource groups names used within landing zone. |
 | <a name="output_secrets_manager_name"></a> [secrets\_manager\_name](#output\_secrets\_manager\_name) | Name of secrets manager instance |
 | <a name="output_security_group_names"></a> [security\_group\_names](#output\_security\_group\_names) | List of security group names |

diff --git a/bastion_host.tf b/bastion_host.tf
@@ -41,7 +41,7 @@ module "teleport_config" {
 ##############################################################################
 
 module "bastion_host" {
-  source                = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git?ref=v1.0.4"
+  source                = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git?ref=v1.1.0"
   for_each              = local.bastion_vsi_map
   resource_group_id     = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group]
   create_security_group = each.value.security_group == null ? false : true

diff --git a/f5_vsi.tf b/f5_vsi.tf
@@ -72,7 +72,7 @@ locals {
 ##############################################################################
 
 module "f5_vsi" {
-  source                      = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git?ref=v1.0.4"
+  source                      = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi.git?ref=v1.1.0"
   for_each                    = local.f5_vsi_map
   resource_group_id           = each.value.resource_group == null ? null : local.resource_groups[each.value.resource_group]
   create_security_group       = each.value.security_group == null ? false : true

diff --git a/outputs.tf b/outputs.tf
@@ -229,6 +229,24 @@ output "vsi_names" {
   ])
 }
 
+output "fip_vsi_data" {
+  description = "A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. This list only contains instances with a floating IP attached."
+  value = flatten([
+    [
+      for group in keys(local.vsi_map) :
+      [
+        for deployment in module.vsi[group].fip_list :
+        merge(deployment, {
+          vpc_name = [
+            for network in keys(local.vpc_map) :
+            module.vpc[network].vpc_name if module.vpc[network].vpc_id == deployment.vpc_id
+          ][0]
+        })
+      ]
+    ]
+  ])
+}
+
 ##############################################################################
 
 ##############################################################################