interpolate vpc name in routes

This commit is contained in:
Ludovico Magnocavallo
2020-06-12 12:07:28 +02:00
parent 9d7f5570e0
commit ae2e4dc3ad
4 changed files with 9 additions and 6 deletions

1
.gitignore vendored
View File

@@ -11,3 +11,4 @@ backend.tf
backend-config.hcl
credentials.json
key.json
terraform-ls.tf

View File

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
- **incompatible change** routes in the `net-vpc` module now interpolate the VPC name to ensure uniqueness, upgrading from a previous version will drop and recreate routes
## [2.0.0] - 2020-06-11
- new `data-solutions` section and `cmek-via-centralized-kms` example

View File

@@ -154,7 +154,7 @@ resource "google_compute_route" "gateway" {
for_each = local.routes_gateway
project = var.project_id
network = google_compute_network.network.name
name = each.key
name = "${var.name}-${each.key}"
description = "Terraform-managed."
dest_range = each.value.dest_range
priority = each.value.priority
@@ -166,7 +166,7 @@ resource "google_compute_route" "ilb" {
for_each = local.routes_ilb
project = var.project_id
network = google_compute_network.network.name
name = each.key
name = "${var.name}-${each.key}"
description = "Terraform-managed."
dest_range = each.value.dest_range
priority = each.value.priority
@@ -178,7 +178,7 @@ resource "google_compute_route" "instance" {
for_each = local.routes_instance
project = var.project_id
network = google_compute_network.network.name
name = each.key
name = "${var.name}-${each.key}"
description = "Terraform-managed."
dest_range = each.value.dest_range
priority = each.value.priority
@@ -192,7 +192,7 @@ resource "google_compute_route" "ip" {
for_each = local.routes_ip
project = var.project_id
network = google_compute_network.network.name
name = each.key
name = "${var.name}-${each.key}"
description = "Terraform-managed."
dest_range = each.value.dest_range
priority = each.value.priority
@@ -204,7 +204,7 @@ resource "google_compute_route" "vpn_tunnel" {
for_each = local.routes_vpn_tunnel
project = var.project_id
network = google_compute_network.network.name
name = each.key
name = "${var.name}-${each.key}"
description = "Terraform-managed."
dest_range = each.value.dest_range
priority = each.value.priority

View File

@@ -86,5 +86,5 @@ def test_vpc_routes(plan_runner):
_, resources = plan_runner(FIXTURES_DIR, routes=_var_routes)
assert len(resources) == 3
resource = [r for r in resources if r['values']
['name'] == 'next-hop-test'][0]
['name'] == 'my-vpc-next-hop-test'][0]
assert resource['values']['next_hop_%s' % next_hop_type]