diff --git a/fast/stages/2-networking-a-peering/landing.tf b/fast/stages/2-networking-a-peering/landing.tf index 995a652ae..db40b3f13 100644 --- a/fast/stages/2-networking-a-peering/landing.tf +++ b/fast/stages/2-networking-a-peering/landing.tf @@ -51,7 +51,7 @@ module "landing-vpc" { inbound = true } # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-a-peering/spoke-dev.tf b/fast/stages/2-networking-a-peering/spoke-dev.tf index 0c51b12e9..2256926f9 100644 --- a/fast/stages/2-networking-a-peering/spoke-dev.tf +++ b/fast/stages/2-networking-a-peering/spoke-dev.tf @@ -53,7 +53,7 @@ module "dev-spoke-vpc" { data_folder = "${var.factories_config.data_dir}/subnets/dev" psa_config = try(var.psa_ranges.dev, null) # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-a-peering/spoke-prod.tf b/fast/stages/2-networking-a-peering/spoke-prod.tf index 42986ab82..b7e3abcb1 100644 --- a/fast/stages/2-networking-a-peering/spoke-prod.tf +++ b/fast/stages/2-networking-a-peering/spoke-prod.tf @@ -52,7 +52,7 @@ module "prod-spoke-vpc" { data_folder = "${var.factories_config.data_dir}/subnets/prod" psa_config = try(var.psa_ranges.prod, null) # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-b-vpn/landing.tf b/fast/stages/2-networking-b-vpn/landing.tf index 995a652ae..db40b3f13 100644 --- a/fast/stages/2-networking-b-vpn/landing.tf +++ b/fast/stages/2-networking-b-vpn/landing.tf @@ -51,7 +51,7 @@ module "landing-vpc" { inbound = true } # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-b-vpn/spoke-dev.tf b/fast/stages/2-networking-b-vpn/spoke-dev.tf index 0c51b12e9..2256926f9 100644 --- a/fast/stages/2-networking-b-vpn/spoke-dev.tf +++ b/fast/stages/2-networking-b-vpn/spoke-dev.tf @@ -53,7 +53,7 @@ module "dev-spoke-vpc" { data_folder = "${var.factories_config.data_dir}/subnets/dev" psa_config = try(var.psa_ranges.dev, null) # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-b-vpn/spoke-prod.tf b/fast/stages/2-networking-b-vpn/spoke-prod.tf index 42986ab82..b7e3abcb1 100644 --- a/fast/stages/2-networking-b-vpn/spoke-prod.tf +++ b/fast/stages/2-networking-b-vpn/spoke-prod.tf @@ -52,7 +52,7 @@ module "prod-spoke-vpc" { data_folder = "${var.factories_config.data_dir}/subnets/prod" psa_config = try(var.psa_ranges.prod, null) # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-c-nva/landing.tf b/fast/stages/2-networking-c-nva/landing.tf index 855f882bd..21d3406cf 100644 --- a/fast/stages/2-networking-c-nva/landing.tf +++ b/fast/stages/2-networking-c-nva/landing.tf @@ -116,7 +116,7 @@ module "landing-trusted-vpc" { inbound = true } # Set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-c-nva/spoke-dev.tf b/fast/stages/2-networking-c-nva/spoke-dev.tf index 5af5ed5a4..a90d25aa3 100644 --- a/fast/stages/2-networking-c-nva/spoke-dev.tf +++ b/fast/stages/2-networking-c-nva/spoke-dev.tf @@ -53,7 +53,7 @@ module "dev-spoke-vpc" { delete_default_routes_on_create = true psa_config = try(var.psa_ranges.dev, null) # Set explicit routes for googleapis; send everything else to NVAs - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-c-nva/spoke-prod.tf b/fast/stages/2-networking-c-nva/spoke-prod.tf index de829b319..8dd5af441 100644 --- a/fast/stages/2-networking-c-nva/spoke-prod.tf +++ b/fast/stages/2-networking-c-nva/spoke-prod.tf @@ -52,7 +52,7 @@ module "prod-spoke-vpc" { delete_default_routes_on_create = true psa_config = try(var.psa_ranges.prod, null) # Set explicit routes for googleapis; send everything else to NVAs - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-d-separate-envs/spoke-dev.tf b/fast/stages/2-networking-d-separate-envs/spoke-dev.tf index 3c1c8c2c0..fd15e26c3 100644 --- a/fast/stages/2-networking-d-separate-envs/spoke-dev.tf +++ b/fast/stages/2-networking-d-separate-envs/spoke-dev.tf @@ -53,7 +53,7 @@ module "dev-spoke-vpc" { data_folder = "${var.factories_config.data_dir}/subnets/dev" psa_config = try(var.psa_ranges.dev, null) # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-d-separate-envs/spoke-prod.tf b/fast/stages/2-networking-d-separate-envs/spoke-prod.tf index 8a91bb42b..c8d8a69c8 100644 --- a/fast/stages/2-networking-d-separate-envs/spoke-prod.tf +++ b/fast/stages/2-networking-d-separate-envs/spoke-prod.tf @@ -52,7 +52,7 @@ module "prod-spoke-vpc" { data_folder = "${var.factories_config.data_dir}/subnets/prod" psa_config = try(var.psa_ranges.prod, null) # set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-e-nva-bgp/landing.tf b/fast/stages/2-networking-e-nva-bgp/landing.tf index 9d4938c38..d5b44e287 100644 --- a/fast/stages/2-networking-e-nva-bgp/landing.tf +++ b/fast/stages/2-networking-e-nva-bgp/landing.tf @@ -117,7 +117,7 @@ module "landing-trusted-vpc" { inbound = true } # Set explicit routes for googleapis in case the default route is deleted - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-e-nva-bgp/spoke-dev.tf b/fast/stages/2-networking-e-nva-bgp/spoke-dev.tf index 4b8c33160..56568ec9a 100644 --- a/fast/stages/2-networking-e-nva-bgp/spoke-dev.tf +++ b/fast/stages/2-networking-e-nva-bgp/spoke-dev.tf @@ -53,7 +53,7 @@ module "dev-spoke-vpc" { delete_default_routes_on_create = true psa_config = try(var.psa_ranges.dev, null) # Set explicit routes for googleapis; send everything else to NVAs - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/fast/stages/2-networking-e-nva-bgp/spoke-prod.tf b/fast/stages/2-networking-e-nva-bgp/spoke-prod.tf index 890855f1e..b62519541 100644 --- a/fast/stages/2-networking-e-nva-bgp/spoke-prod.tf +++ b/fast/stages/2-networking-e-nva-bgp/spoke-prod.tf @@ -52,7 +52,7 @@ module "prod-spoke-vpc" { delete_default_routes_on_create = true psa_config = try(var.psa_ranges.prod, null) # Set explicit routes for googleapis; send everything else to NVAs - create_default_routes = { + create_googleapis_routes = { private = true restricted = true } diff --git a/modules/net-vpc/README.md b/modules/net-vpc/README.md index 1256a49e1..f2810445f 100644 --- a/modules/net-vpc/README.md +++ b/modules/net-vpc/README.md @@ -422,7 +422,7 @@ module "vpc" { next_hop = "global/gateways/default-internet-gateway" } } - create_default_routes = { + create_googleapis_routes = { restricted = false restricted-6 = false private = false @@ -434,14 +434,14 @@ module "vpc" { ### Private Google Access routes -By default the VPC module creates IPv4 routes for the [Private Google Access ranges](https://cloud.google.com/vpc/docs/configure-private-google-access#config-routing). This behavior can be controlled through the `create_default_routes` variable: +By default the VPC module creates IPv4 routes for the [Private Google Access ranges](https://cloud.google.com/vpc/docs/configure-private-google-access#config-routing). This behavior can be controlled through the `create_googleapis_routes` variable: ```hcl module "vpc" { source = "./fabric/modules/net-vpc" project_id = "my-project" name = "my-vpc" - create_default_routes = { + create_googleapis_routes = { restricted = false restricted-6 = true private = false @@ -488,7 +488,7 @@ module "vpc" { | [name](variables.tf#L84) | The name of the network being created. | string | ✓ | | | [project_id](variables.tf#L100) | The ID of the project where this VPC will be created. | string | ✓ | | | [auto_create_subnetworks](variables.tf#L17) | Set to true to create an auto mode subnet, defaults to custom mode. | bool | | false | -| [create_default_routes](variables.tf#L23) | Toggle creation of googleapis private/restricted routes. | object({…}) | | {} | +| [create_googleapis_routes](variables.tf#L23) | Toggle creation of googleapis private/restricted routes. | object({…}) | | {} | | [data_folder](variables.tf#L35) | An optional folder containing the subnet configurations in YaML format. | string | | null | | [delete_default_routes_on_create](variables.tf#L41) | Set to true to delete the default routes at creation time. | bool | | false | | [description](variables.tf#L47) | An optional description of this resource (triggers recreation on change). | string | | "Terraform-managed." | diff --git a/modules/net-vpc/routes.tf b/modules/net-vpc/routes.tf index 65a310abd..493b248bd 100644 --- a/modules/net-vpc/routes.tf +++ b/modules/net-vpc/routes.tf @@ -31,7 +31,7 @@ locals { priority = 1000 tags = null } - if var.create_default_routes[k] + if var.create_googleapis_routes[k] } _routes = merge(local._googleapis_routes, coalesce(var.routes, {})) routes = { diff --git a/modules/net-vpc/variables.tf b/modules/net-vpc/variables.tf index ba9dcc405..2cb1cdbf6 100644 --- a/modules/net-vpc/variables.tf +++ b/modules/net-vpc/variables.tf @@ -20,7 +20,7 @@ variable "auto_create_subnetworks" { default = false } -variable "create_default_routes" { +variable "create_googleapis_routes" { description = "Toggle creation of googleapis private/restricted routes." type = object({ private = optional(bool, true)