feat: adds stack_type and an option to set the router name

modules/vpn_ha/README.md

@@ -144,6 +144,7 @@ module "vpn_ha" {
 | router\_advertise\_config | Router custom advertisement configuration, ip\_ranges is a map of address ranges and descriptions. | <pre>object({<br>    groups    = list(string)<br>    ip_ranges = map(string)<br>    mode      = string<br>  })</pre> | `null` | no |
 | router\_asn | Router ASN used for auto-created router. | `number` | `64514` | no |
 | router\_name | Name of router, leave blank to create one. | `string` | `""` | no |
+| stack\_type | The IP stack type will apply to all the tunnels associated with this VPN gateway. | `string` | `"IPV4_ONLY"` | no |
 | tunnels | VPN tunnel configurations, bgp\_peer\_options is usually null. | <pre>map(object({<br>    bgp_peer = object({<br>      address = string<br>      asn     = number<br>    })<br>    bgp_session_name = optional(string)<br>    bgp_peer_options = object({<br>      ip_address          = string<br>      advertise_groups    = list(string)<br>      advertise_ip_ranges = map(string)<br>      advertise_mode      = string<br>      route_priority      = number<br>    })<br>    bgp_session_range               = string<br>    ike_version                     = number<br>    vpn_gateway_interface           = number<br>    peer_external_gateway_interface = number<br>    shared_secret                   = string<br>  }))</pre> | `{}` | no |
 | vpn\_gateway\_self\_link | self\_link of existing VPN gateway to be used for the vpn tunnel | `string` | `null` | no |
 

modules/vpn_ha/main.tf

@@ -36,12 +36,13 @@ locals {
 }
 
 resource "google_compute_ha_vpn_gateway" "ha_gateway" {
-  count    = var.create_vpn_gateway == true ? 1 : 0
-  provider = google-beta
-  name     = var.name
-  project  = var.project_id
-  region   = var.region
-  network  = var.network
+  count      = var.create_vpn_gateway == true ? 1 : 0
+  provider   = google-beta
+  name       = var.name
+  project    = var.project_id
+  region     = var.region
+  network    = var.network
+  stack_type = var.stack_type
 }
 
 resource "google_compute_external_vpn_gateway" "external_gateway" {
@@ -60,10 +61,17 @@ resource "google_compute_external_vpn_gateway" "external_gateway" {
   }
 }
 
+data "google_compute_router" "router" {
+  name    = var.router_name == null ? "" : var.router_name
+  network = var.network
+  project = var.project_id
+  region  = var.region
+}
+
 resource "google_compute_router" "router" {
   provider = google-beta
-  count    = var.router_name == "" ? 1 : 0
-  name     = "vpn-${var.name}"
+  count    = data.google_compute_router.router.name == null ? 1 : 0
+  name     = var.router_name != "" ? var.router_name : "vpn-${var.name}"
   project  = var.project_id
   region   = var.region
   network  = var.network

modules/vpn_ha/variables.tf

@@ -38,6 +38,12 @@ variable "name" {
   type        = string
 }
 
+variable "stack_type" {
+  description = "The IP stack type will apply to all the tunnels associated with this VPN gateway."
+  type        = string
+  default     = "IPV4_ONLY"
+}
+
 variable "network" {
   description = "VPC used for the gateway and routes."
   type        = string