fix psa peering routes, split files (#586)
This commit is contained in:
Ludovico Magnocavallo
GitHub
parent
78664f3ba4
commit
9a05aed0e8
|
|
@ -52,22 +52,7 @@ locals {
|
|||
secondary_ip_range = try(v.secondary_ip_range, {})
|
||||
}
|
||||
}
|
||||
_iam = var.iam == null ? {} : var.iam
|
||||
_routes = var.routes == null ? {} : var.routes
|
||||
_subnet_flow_logs = {
|
||||
for k, v in var.subnet_flow_logs : k => merge(
|
||||
var.log_config_defaults, try(var.log_configs[k], {})
|
||||
)
|
||||
}
|
||||
_subnet_iam_members = flatten([
|
||||
for subnet, roles in local._iam : [
|
||||
for role, members in roles : {
|
||||
members = members
|
||||
role = role
|
||||
subnet = subnet
|
||||
}
|
||||
]
|
||||
])
|
||||
_iam = var.iam == null ? {} : var.iam
|
||||
network = (
|
||||
var.vpc_create
|
||||
? try(google_compute_network.network.0, null)
|
||||
|
|
@ -78,38 +63,6 @@ locals {
|
|||
? null
|
||||
: element(reverse(split("/", var.peering_config.peer_vpc_self_link)), 0)
|
||||
)
|
||||
psa_config = (
|
||||
var.psa_config == null
|
||||
? { ranges = {}, routes = null }
|
||||
: var.psa_config
|
||||
)
|
||||
routes = {
|
||||
gateway = { for k, v in local._routes : k => v if v.next_hop_type == "gateway" }
|
||||
ilb = { for k, v in local._routes : k => v if v.next_hop_type == "ilb" }
|
||||
instance = { for k, v in local._routes : k => v if v.next_hop_type == "instance" }
|
||||
ip = { for k, v in local._routes : k => v if v.next_hop_type == "ip" }
|
||||
vpn_tunnel = { for k, v in local._routes : k => v if v.next_hop_type == "vpn_tunnel" }
|
||||
}
|
||||
subnet_descriptions = merge(
|
||||
local._factory_descriptions, var.subnet_descriptions
|
||||
)
|
||||
subnet_iam_members = concat(
|
||||
local._factory_iam_members, local._subnet_iam_members
|
||||
)
|
||||
subnet_flow_logs = merge(
|
||||
local._factory_flow_logs, local._subnet_flow_logs
|
||||
)
|
||||
subnet_private_access = merge(
|
||||
local._factory_private_access, var.subnet_private_access
|
||||
)
|
||||
subnets = merge(
|
||||
{ for subnet in var.subnets : "${subnet.region}/${subnet.name}" => subnet },
|
||||
local._factory_subnets
|
||||
)
|
||||
subnets_l7ilb = {
|
||||
for subnet in var.subnets_l7ilb :
|
||||
"${subnet.region}/${subnet.name}" => subnet
|
||||
}
|
||||
}
|
||||
|
||||
data "google_compute_network" "network" {
|
||||
|
|
@ -169,131 +122,6 @@ resource "google_compute_shared_vpc_service_project" "service_projects" {
|
|||
depends_on = [google_compute_shared_vpc_host_project.shared_vpc_host]
|
||||
}
|
||||
|
||||
resource "google_compute_subnetwork" "subnetwork" {
|
||||
for_each = local.subnets
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
region = each.value.region
|
||||
name = each.value.name
|
||||
ip_cidr_range = each.value.ip_cidr_range
|
||||
secondary_ip_range = each.value.secondary_ip_range == null ? [] : [
|
||||
for name, range in each.value.secondary_ip_range :
|
||||
{ range_name = name, ip_cidr_range = range }
|
||||
]
|
||||
description = lookup(
|
||||
local.subnet_descriptions, each.key, "Terraform-managed."
|
||||
)
|
||||
private_ip_google_access = lookup(
|
||||
local.subnet_private_access, each.key, true
|
||||
)
|
||||
dynamic "log_config" {
|
||||
for_each = toset(
|
||||
try(local.subnet_flow_logs[each.key], {}) != {}
|
||||
? [local.subnet_flow_logs[each.key]]
|
||||
: []
|
||||
)
|
||||
iterator = config
|
||||
content {
|
||||
aggregation_interval = config.value.aggregation_interval
|
||||
flow_sampling = config.value.flow_sampling
|
||||
metadata = config.value.metadata
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "google_compute_subnetwork" "l7ilb" {
|
||||
provider = google-beta
|
||||
for_each = local.subnets_l7ilb
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
region = each.value.region
|
||||
name = each.value.name
|
||||
ip_cidr_range = each.value.ip_cidr_range
|
||||
purpose = "INTERNAL_HTTPS_LOAD_BALANCER"
|
||||
role = (
|
||||
each.value.active || each.value.active == null ? "ACTIVE" : "BACKUP"
|
||||
)
|
||||
description = lookup(
|
||||
local.subnet_descriptions,
|
||||
"${each.value.region}/${each.value.name}",
|
||||
"Terraform-managed."
|
||||
)
|
||||
}
|
||||
|
||||
resource "google_compute_subnetwork_iam_binding" "binding" {
|
||||
for_each = {
|
||||
for binding in local.subnet_iam_members :
|
||||
"${binding.subnet}.${binding.role}" => binding
|
||||
}
|
||||
project = var.project_id
|
||||
subnetwork = google_compute_subnetwork.subnetwork[each.value.subnet].name
|
||||
region = google_compute_subnetwork.subnetwork[each.value.subnet].region
|
||||
role = each.value.role
|
||||
members = each.value.members
|
||||
}
|
||||
|
||||
resource "google_compute_route" "gateway" {
|
||||
for_each = local.routes.gateway
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_gateway = each.value.next_hop
|
||||
}
|
||||
|
||||
resource "google_compute_route" "ilb" {
|
||||
for_each = local.routes.ilb
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_ilb = each.value.next_hop
|
||||
}
|
||||
|
||||
resource "google_compute_route" "instance" {
|
||||
for_each = local.routes.instance
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_instance = each.value.next_hop
|
||||
# not setting the instance zone will trigger a refresh
|
||||
next_hop_instance_zone = regex("zones/([^/]+)/", each.value.next_hop)[0]
|
||||
}
|
||||
|
||||
resource "google_compute_route" "ip" {
|
||||
for_each = local.routes.ip
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_ip = each.value.next_hop
|
||||
}
|
||||
|
||||
resource "google_compute_route" "vpn_tunnel" {
|
||||
for_each = local.routes.vpn_tunnel
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_vpn_tunnel = each.value.next_hop
|
||||
}
|
||||
|
||||
resource "google_dns_policy" "default" {
|
||||
count = var.dns_policy == null ? 0 : 1
|
||||
enable_inbound_forwarding = var.dns_policy.inbound
|
||||
|
|
@ -325,32 +153,3 @@ resource "google_dns_policy" "default" {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "google_compute_global_address" "psa_ranges" {
|
||||
for_each = local.psa_config.ranges
|
||||
project = var.project_id
|
||||
name = each.key
|
||||
purpose = "VPC_PEERING"
|
||||
address_type = "INTERNAL"
|
||||
address = split("/", each.value)[0]
|
||||
prefix_length = split("/", each.value)[1]
|
||||
network = local.network.id
|
||||
}
|
||||
|
||||
resource "google_service_networking_connection" "psa_connection" {
|
||||
for_each = var.psa_config == null ? {} : { 1 = 1 }
|
||||
network = local.network.id
|
||||
service = "servicenetworking.googleapis.com"
|
||||
reserved_peering_ranges = [
|
||||
for k, v in google_compute_global_address.psa_ranges : v.name
|
||||
]
|
||||
}
|
||||
|
||||
resource "google_compute_network_peering_routes_config" "psa_routes" {
|
||||
for_each = var.psa_config == null ? {} : { 1 = 1 }
|
||||
project = var.project_id
|
||||
peering = google_service_networking_connection.psa_connection["1"].peering
|
||||
network = local.network.id
|
||||
export_custom_routes = try(var.psa_config.routes.export, false)
|
||||
import_custom_routes = try(var.psa_config.routes.import, false)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
/**
|
||||
* Copyright 2022 Google LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
# tfdoc:file:description Private Service Access resources.
|
||||
|
||||
locals {
|
||||
psa_config = (
|
||||
var.psa_config == null
|
||||
? { ranges = {}, routes = null }
|
||||
: var.psa_config
|
||||
)
|
||||
}
|
||||
|
||||
resource "google_compute_global_address" "psa_ranges" {
|
||||
for_each = local.psa_config.ranges
|
||||
project = var.project_id
|
||||
name = each.key
|
||||
purpose = "VPC_PEERING"
|
||||
address_type = "INTERNAL"
|
||||
address = split("/", each.value)[0]
|
||||
prefix_length = split("/", each.value)[1]
|
||||
network = local.network.id
|
||||
}
|
||||
|
||||
resource "google_service_networking_connection" "psa_connection" {
|
||||
for_each = var.psa_config == null ? {} : { 1 = 1 }
|
||||
network = local.network.id
|
||||
service = "servicenetworking.googleapis.com"
|
||||
reserved_peering_ranges = [
|
||||
for k, v in google_compute_global_address.psa_ranges : v.name
|
||||
]
|
||||
}
|
||||
|
||||
resource "google_compute_network_peering_routes_config" "psa_routes" {
|
||||
for_each = var.psa_config == null ? {} : { 1 = 1 }
|
||||
project = var.project_id
|
||||
peering = google_service_networking_connection.psa_connection["1"].peering
|
||||
network = local.network.name
|
||||
export_custom_routes = try(var.psa_config.routes.export, false)
|
||||
import_custom_routes = try(var.psa_config.routes.import, false)
|
||||
}
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
/**
|
||||
* Copyright 2022 Google LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
# tfdoc:file:description Route resources.
|
||||
|
||||
locals {
|
||||
_routes = var.routes == null ? {} : var.routes
|
||||
routes = {
|
||||
gateway = { for k, v in local._routes : k => v if v.next_hop_type == "gateway" }
|
||||
ilb = { for k, v in local._routes : k => v if v.next_hop_type == "ilb" }
|
||||
instance = { for k, v in local._routes : k => v if v.next_hop_type == "instance" }
|
||||
ip = { for k, v in local._routes : k => v if v.next_hop_type == "ip" }
|
||||
vpn_tunnel = { for k, v in local._routes : k => v if v.next_hop_type == "vpn_tunnel" }
|
||||
}
|
||||
}
|
||||
|
||||
resource "google_compute_route" "gateway" {
|
||||
for_each = local.routes.gateway
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_gateway = each.value.next_hop
|
||||
}
|
||||
|
||||
resource "google_compute_route" "ilb" {
|
||||
for_each = local.routes.ilb
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_ilb = each.value.next_hop
|
||||
}
|
||||
|
||||
resource "google_compute_route" "instance" {
|
||||
for_each = local.routes.instance
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_instance = each.value.next_hop
|
||||
# not setting the instance zone will trigger a refresh
|
||||
next_hop_instance_zone = regex("zones/([^/]+)/", each.value.next_hop)[0]
|
||||
}
|
||||
|
||||
resource "google_compute_route" "ip" {
|
||||
for_each = local.routes.ip
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_ip = each.value.next_hop
|
||||
}
|
||||
|
||||
resource "google_compute_route" "vpn_tunnel" {
|
||||
for_each = local.routes.vpn_tunnel
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
name = "${var.name}-${each.key}"
|
||||
description = "Terraform-managed."
|
||||
dest_range = each.value.dest_range
|
||||
priority = each.value.priority
|
||||
tags = each.value.tags
|
||||
next_hop_vpn_tunnel = each.value.next_hop
|
||||
}
|
||||
|
|
@ -0,0 +1,155 @@
|
|||
/**
|
||||
* Copyright 2022 Google LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
# tfdoc:file:description Subnet resources.
|
||||
|
||||
locals {
|
||||
_factory_data = var.data_folder == null ? tomap({}) : {
|
||||
for f in fileset(var.data_folder, "**/*.yaml") :
|
||||
trimsuffix(basename(f), ".yaml") => yamldecode(file("${var.data_folder}/${f}"))
|
||||
}
|
||||
_factory_descriptions = {
|
||||
for k, v in local._factory_data :
|
||||
"${v.region}/${k}" => try(v.description, null)
|
||||
}
|
||||
_factory_iam_members = [
|
||||
for k, v in local._factory_subnets : {
|
||||
subnet = k
|
||||
role = "roles/compute.networkUser"
|
||||
members = concat(
|
||||
formatlist("group:%s", try(v.iam_groups, [])),
|
||||
formatlist("user:%s", try(v.iam_users, [])),
|
||||
formatlist("serviceAccount:%s", try(v.iam_service_accounts, []))
|
||||
)
|
||||
}
|
||||
]
|
||||
_factory_flow_logs = {
|
||||
for k, v in local._factory_data : "${v.region}/${k}" => merge(
|
||||
var.log_config_defaults, try(v.flow_logs, {})
|
||||
) if try(v.flow_logs, false)
|
||||
}
|
||||
_factory_private_access = {
|
||||
for k, v in local._factory_data : "${v.region}/${k}" => try(
|
||||
v.private_ip_google_access, true
|
||||
)
|
||||
}
|
||||
_factory_subnets = {
|
||||
for k, v in local._factory_data : "${v.region}/${k}" => {
|
||||
ip_cidr_range = v.ip_cidr_range
|
||||
name = k
|
||||
region = v.region
|
||||
secondary_ip_range = try(v.secondary_ip_range, {})
|
||||
}
|
||||
}
|
||||
_iam = var.iam == null ? {} : var.iam
|
||||
_subnet_flow_logs = {
|
||||
for k, v in var.subnet_flow_logs : k => merge(
|
||||
var.log_config_defaults, try(var.log_configs[k], {})
|
||||
)
|
||||
}
|
||||
_subnet_iam_members = flatten([
|
||||
for subnet, roles in local._iam : [
|
||||
for role, members in roles : {
|
||||
members = members
|
||||
role = role
|
||||
subnet = subnet
|
||||
}
|
||||
]
|
||||
])
|
||||
subnet_descriptions = merge(
|
||||
local._factory_descriptions, var.subnet_descriptions
|
||||
)
|
||||
subnet_iam_members = concat(
|
||||
local._factory_iam_members, local._subnet_iam_members
|
||||
)
|
||||
subnet_flow_logs = merge(
|
||||
local._factory_flow_logs, local._subnet_flow_logs
|
||||
)
|
||||
subnet_private_access = merge(
|
||||
local._factory_private_access, var.subnet_private_access
|
||||
)
|
||||
subnets = merge(
|
||||
{ for subnet in var.subnets : "${subnet.region}/${subnet.name}" => subnet },
|
||||
local._factory_subnets
|
||||
)
|
||||
subnets_l7ilb = {
|
||||
for subnet in var.subnets_l7ilb :
|
||||
"${subnet.region}/${subnet.name}" => subnet
|
||||
}
|
||||
}
|
||||
|
||||
resource "google_compute_subnetwork" "subnetwork" {
|
||||
for_each = local.subnets
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
region = each.value.region
|
||||
name = each.value.name
|
||||
ip_cidr_range = each.value.ip_cidr_range
|
||||
secondary_ip_range = each.value.secondary_ip_range == null ? [] : [
|
||||
for name, range in each.value.secondary_ip_range :
|
||||
{ range_name = name, ip_cidr_range = range }
|
||||
]
|
||||
description = lookup(
|
||||
local.subnet_descriptions, each.key, "Terraform-managed."
|
||||
)
|
||||
private_ip_google_access = lookup(
|
||||
local.subnet_private_access, each.key, true
|
||||
)
|
||||
dynamic "log_config" {
|
||||
for_each = toset(
|
||||
try(local.subnet_flow_logs[each.key], {}) != {}
|
||||
? [local.subnet_flow_logs[each.key]]
|
||||
: []
|
||||
)
|
||||
iterator = config
|
||||
content {
|
||||
aggregation_interval = config.value.aggregation_interval
|
||||
flow_sampling = config.value.flow_sampling
|
||||
metadata = config.value.metadata
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "google_compute_subnetwork" "l7ilb" {
|
||||
provider = google-beta
|
||||
for_each = local.subnets_l7ilb
|
||||
project = var.project_id
|
||||
network = local.network.name
|
||||
region = each.value.region
|
||||
name = each.value.name
|
||||
ip_cidr_range = each.value.ip_cidr_range
|
||||
purpose = "INTERNAL_HTTPS_LOAD_BALANCER"
|
||||
role = (
|
||||
each.value.active || each.value.active == null ? "ACTIVE" : "BACKUP"
|
||||
)
|
||||
description = lookup(
|
||||
local.subnet_descriptions,
|
||||
"${each.value.region}/${each.value.name}",
|
||||
"Terraform-managed."
|
||||
)
|
||||
}
|
||||
|
||||
resource "google_compute_subnetwork_iam_binding" "binding" {
|
||||
for_each = {
|
||||
for binding in local.subnet_iam_members :
|
||||
"${binding.subnet}.${binding.role}" => binding
|
||||
}
|
||||
project = var.project_id
|
||||
subnetwork = google_compute_subnetwork.subnetwork[each.value.subnet].name
|
||||
region = google_compute_subnetwork.subnetwork[each.value.subnet].region
|
||||
role = each.value.role
|
||||
members = each.value.members
|
||||
}
|
||||
Loading…
Reference in New Issue