fix: added new input field (#585)

Author: Daisyprakash

modules/instance_template/README.md

@@ -16,6 +16,7 @@ See the [simple](../../examples/instance_template/simple) for a usage example.
 | access\_config | Access configurations, i.e. IPs via which the VM instance can be accessed via the Internet. | <pre>list(object({<br>    nat_ip       = optional(string)<br>    network_tier = string<br>  }))</pre> | `[]` | no |
 | additional\_disks | List of maps of additional disks. See https://www.terraform.io/docs/providers/google/r/compute_instance_template#disk_name | <pre>list(object({<br>    auto_delete     = optional(bool, true)<br>    boot            = optional(bool, false)<br>    device_name     = optional(string)<br>    disk_name       = optional(string)<br>    disk_size_gb    = optional(number)<br>    disk_type       = optional(string)<br>    disk_labels     = optional(map(string), {})<br>    interface       = optional(string)<br>    mode            = optional(string)<br>    source          = optional(string)<br>    source_image    = optional(string)<br>    source_snapshot = optional(string)<br>  }))</pre> | `[]` | no |
 | additional\_networks | Additional network interface details for GCE, if any. | <pre>list(object({<br>    network            = optional(string)<br>    subnetwork         = optional(string)<br>    subnetwork_project = optional(string)<br>    network_ip         = optional(string)<br>    nic_type           = optional(string)<br>    stack_type         = optional(string)<br><br>    # New Fields<br>    queue_count        = optional(number) # Multi-queue count (Rx/Tx)<br>    network_attachment = optional(string) # Consumer link for PSC-I<br>    vlan               = optional(number) # VLAN tag (2-255)<br><br>    # Access Config (External IPv4)<br>    access_config = optional(list(object({<br>      nat_ip       = optional(string)<br>      network_tier = optional(string) # PREMIUM or STANDARD<br>    })), [])<br><br>    # IPv6 Access Config (External IPv6)<br>    ipv6_access_config = optional(list(object({<br>      network_tier = string # Always PREMIUM for IPv6<br>    })), [])<br><br>    # Alias IP Ranges (Secondary ranges)<br>    alias_ip_range = optional(list(object({<br>      ip_cidr_range         = string<br>      subnetwork_range_name = optional(string)<br>    })), [])<br>  }))</pre> | `[]` | no |
+| additional\_networks\_str | Additional network interface details for GCE provided as a JSON-encoded string. Expected format: '[{"network":"vpc-1","subnetwork":"sub-1"}]'. | `string` | `"[]"` | no |
 | alias\_ip\_range | An array of alias IP ranges for this network interface. Can only be specified for network interfaces on subnet-mode networks.<br>ip\_cidr\_range: The IP CIDR range represented by this alias IP range. This IP CIDR range must belong to the specified subnetwork and cannot contain IP addresses reserved by system or used by other network interfaces. At the time of writing only a netmask (e.g. /24) may be supplied, with a CIDR format resulting in an API error.<br>subnetwork\_range\_name: The subnetwork secondary range name specifying the secondary range from which to allocate the IP CIDR range for this alias IP range. If left unspecified, the primary range of the subnetwork will be used. | <pre>object({<br>    ip_cidr_range         = string<br>    subnetwork_range_name = string<br>  })</pre> | `null` | no |
 | auto\_delete | Whether or not the boot disk should be auto-deleted | `string` | `"true"` | no |
 | automatic\_restart | (Optional) Specifies whether the instance should be automatically restarted if it is terminated by Compute Engine (not terminated by a user). | `bool` | `true` | no |

modules/instance_template/main.tf

@@ -81,6 +81,12 @@ locals {
     email  = google_service_account.sa[0].email,
     member = google_service_account.sa[0].member
   } : {}
+
+  final_additional_networks = concat(
+    var.additional_networks,
+    try(jsondecode(var.additional_networks_str), [])
+  )
+
 }
 
 # Service account
@@ -198,35 +204,35 @@ resource "google_compute_instance_template" "tpl" {
   }
 
   dynamic "network_interface" {
-    for_each = var.additional_networks
+    for_each = local.final_additional_networks
     content {
-      network            = network_interface.value.network
-      subnetwork         = network_interface.value.subnetwork
-      subnetwork_project = network_interface.value.subnetwork_project
+      network            = try(network_interface.value.network, null)
+      subnetwork         = try(network_interface.value.subnetwork, null)
+      subnetwork_project = try(network_interface.value.subnetwork_project, null)
       network_ip         = try(length(network_interface.value.network_ip), 0) > 0 ? network_interface.value.network_ip : null
-      nic_type           = network_interface.value.nic_type
-      stack_type         = network_interface.value.stack_type
-      network_attachment = network_interface.value.network_attachment
-      vlan               = network_interface.value.vlan
-      queue_count        = network_interface.value.queue_count
+      nic_type           = try(network_interface.value.nic_type, null)
+      stack_type         = try(network_interface.value.stack_type, null)
+      network_attachment = try(network_interface.value.network_attachment, null)
+      vlan               = try(network_interface.value.vlan, null)
+      queue_count        = try(network_interface.value.queue_count, null)
       dynamic "access_config" {
-        for_each = network_interface.value.access_config
+        for_each = try(network_interface.value.access_config, [])
         content {
-          nat_ip       = access_config.value.nat_ip
-          network_tier = access_config.value.network_tier
+          nat_ip       = try(access_config.value.nat_ip, null)
+          network_tier = try(access_config.value.network_tier, null)
         }
       }
       dynamic "ipv6_access_config" {
-        for_each = network_interface.value.ipv6_access_config
+        for_each = try(network_interface.value.ipv6_access_config, [])
         content {
-          network_tier = ipv6_access_config.value.network_tier
+          network_tier = try(ipv6_access_config.value.network_tier, null)
         }
       }
       dynamic "alias_ip_range" {
-        for_each = network_interface.value.alias_ip_range
+        for_each = try(network_interface.value.alias_ip_range, [])
         content {
-          ip_cidr_range         = alias_ip_range.value.ip_cidr_range
-          subnetwork_range_name = alias_ip_range.value.subnetwork_range_name
+          ip_cidr_range         = try(alias_ip_range.value.ip_cidr_range, null)
+          subnetwork_range_name = try(alias_ip_range.value.subnetwork_range_name, null)
         }
       }
     }

modules/instance_template/metadata.display.yaml

@@ -152,6 +152,9 @@ spec:
               title: Subnetwork
               regexValidation: ^(?:[a-z0-9-]{1,63}|(?:projects/[a-z0-9-]+/)?(?:regions/[a-z0-9-]+/)?subnetworks/[a-z0-9-]{1,63})$
               validation: Invalid subnetwork format. Must be a subnetwork name or a self link.
+        additional_networks_str:
+          name: additional_networks_str
+          title: Additional Networks Str
         alias_ip_range:
           name: alias_ip_range
           title: Alias Ip Range

modules/instance_template/metadata.yaml

@@ -263,6 +263,10 @@ spec:
       - name: stack_type
         description: The stack type for this network interface to identify whether the IPv6 feature is enabled or not. Values are `IPV4_IPV6` or `IPV4_ONLY`. Default behavior is equivalent to IPV4_ONLY.
         varType: string
+      - name: additional_networks_str
+        description: "Additional network interface details for GCE provided as a JSON-encoded string. Expected format: '[{\"network\":\"vpc-1\",\"subnetwork\":\"sub-1\"}]'."
+        varType: string
+        defaultValue: "[]"
       - name: additional_networks
         description: Additional network interface details for GCE, if any.
         varType: |-

modules/instance_template/variables.tf

@@ -282,6 +282,12 @@ variable "stack_type" {
   default     = null
 }
 
+variable "additional_networks_str" {
+  description = "Additional network interface details for GCE provided as a JSON-encoded string. Expected format: '[{\"network\":\"vpc-1\",\"subnetwork\":\"sub-1\"}]'."
+  type        = string
+  default     = "[]"
+}
+
 variable "additional_networks" {
   description = "Additional network interface details for GCE, if any."
   default     = []