From 2fb387bd8b017c27b483e5714bf10c475c7c861a Mon Sep 17 00:00:00 2001 From: Julio Diez Date: Tue, 31 Oct 2023 15:31:19 +0100 Subject: [PATCH] Simplify ip_ranges structure --- .../serverless/cloud-run-microservices/psc.tf | 2 +- .../cloud-run-microservices/variables.tf | 16 +++++++--------- .../serverless/cloud-run-microservices/vpc.tf | 8 ++++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/blueprints/serverless/cloud-run-microservices/psc.tf b/blueprints/serverless/cloud-run-microservices/psc.tf index 032f1e179..15d9ca260 100644 --- a/blueprints/serverless/cloud-run-microservices/psc.tf +++ b/blueprints/serverless/cloud-run-microservices/psc.tf @@ -23,7 +23,7 @@ module "psc-addr-main" { project_id = module.main-project.project_id psc_addresses = { psc-addr = { - address = var.ip_ranges["main"].psc_addr + address = var.ip_ranges.psc_addr network = module.vpc-main.self_link } } diff --git a/blueprints/serverless/cloud-run-microservices/variables.tf b/blueprints/serverless/cloud-run-microservices/variables.tf index 9ae9cd773..a17fe9e3c 100644 --- a/blueprints/serverless/cloud-run-microservices/variables.tf +++ b/blueprints/serverless/cloud-run-microservices/variables.tf @@ -21,16 +21,14 @@ variable "custom_domain" { } variable "ip_ranges" { - description = "IPs or IP ranges used by the VPC." - type = map(map(string)) + description = "IP ranges or IPs used by the VPC." + type = map(string) default = { - main = { - subnet_main = "10.0.1.0/24" - subnet_proxy = "10.10.0.0/24" - subnet_vpc_access = "10.10.10.0/28" - subnet_vpc_direct = "10.8.0.0/26" - psc_addr = "10.0.0.100" - } + subnet_main = "10.0.1.0/24" + subnet_proxy = "10.10.0.0/24" + subnet_vpc_access = "10.10.10.0/28" + subnet_vpc_direct = "10.8.0.0/26" + psc_addr = "10.0.0.100" } } diff --git a/blueprints/serverless/cloud-run-microservices/vpc.tf b/blueprints/serverless/cloud-run-microservices/vpc.tf index 469906639..7f2487a52 100644 --- a/blueprints/serverless/cloud-run-microservices/vpc.tf +++ b/blueprints/serverless/cloud-run-microservices/vpc.tf @@ -23,24 +23,24 @@ module "vpc-main" { name = "vpc-main" subnets = [ { # regular subnet - ip_cidr_range = var.ip_ranges["main"].subnet_main + ip_cidr_range = var.ip_ranges.subnet_main name = "subnet-main" region = var.region }, { # subnet for VPC access connector - ip_cidr_range = var.ip_ranges["main"].subnet_vpc_access + ip_cidr_range = var.ip_ranges.subnet_vpc_access name = "subnet-vpc-access" region = var.region }, { # subnet for Direct VPC Egress - ip_cidr_range = var.ip_ranges["main"].subnet_vpc_direct + ip_cidr_range = var.ip_ranges.subnet_vpc_direct name = "subnet-vpc-direct" region = var.region } ] subnets_proxy_only = [ { # subnet for internal ALB - ip_cidr_range = var.ip_ranges["main"].subnet_proxy + ip_cidr_range = var.ip_ranges.subnet_proxy name = "subnet-proxy" region = var.region active = true