fix Cloud NAT module internal router name lookup

This commit is contained in:
Ludovico Magnocavallo 2020-04-22 15:47:33 +02:00
parent 152c172b55
commit 45a8bd841f
4 changed files with 12 additions and 5 deletions

View File

@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
## [Unreleased] ## [Unreleased]
- fix DNS module internal zone lookup - fix DNS module internal zone lookup
- fix Cloud NAT module internal router name lookup
## [1.3.0] - 2020-04-08 ## [1.3.0] - 2020-04-08

View File

@ -16,13 +16,15 @@
locals { locals {
router_name = ( router_name = (
var.router_create ? google_compute_router.router[0].name : var.router_name var.router_create
? try(google_compute_router.router[0].name, null)
: var.router_name
) )
} }
resource "google_compute_router" "router" { resource "google_compute_router" "router" {
count = var.router_create ? 1 : 0 count = var.router_create ? 1 : 0
name = var.router_name == "" ? "${var.name}-nat" : var.router_name name = var.router_name == null ? "${var.name}-nat" : var.router_name
project = var.project_id project = var.project_id
region = var.region region = var.region
network = var.router_network network = var.router_network

View File

@ -31,7 +31,11 @@ output "region" {
output "router" { output "router" {
description = "Cloud NAT router resources (if auto created)." description = "Cloud NAT router resources (if auto created)."
value = var.router_create ? google_compute_router.router[0] : null value = (
var.router_create
? try(google_compute_router.router[0], null)
: null
)
} }
output "router_name" { output "router_name" {

View File

@ -78,13 +78,13 @@ variable "router_create" {
variable "router_name" { variable "router_name" {
description = "Router name, leave blank if router will be created to use auto generated name." description = "Router name, leave blank if router will be created to use auto generated name."
type = string type = string
default = "" default = null
} }
variable "router_network" { variable "router_network" {
description = "Name of the VPC used for auto-created router." description = "Name of the VPC used for auto-created router."
type = string type = string
default = "" default = null
} }
variable "subnetworks" { variable "subnetworks" {