From 14cca9d1b5cd2e89b3dbde721a1a52fbfe4f7c0a Mon Sep 17 00:00:00 2001 From: Julio Diez Date: Thu, 2 Nov 2023 12:22:18 +0100 Subject: [PATCH] Rename to ip_configs to follow same naming --- blueprints/serverless/cloud-run-microservices/psc.tf | 2 +- .../serverless/cloud-run-microservices/variables.tf | 2 +- blueprints/serverless/cloud-run-microservices/vpc.tf | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/blueprints/serverless/cloud-run-microservices/psc.tf b/blueprints/serverless/cloud-run-microservices/psc.tf index 15d9ca260..7a1e97e48 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.psc_addr + address = var.ip_configs.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 b0d43b7ed..af333e203 100644 --- a/blueprints/serverless/cloud-run-microservices/variables.tf +++ b/blueprints/serverless/cloud-run-microservices/variables.tf @@ -29,7 +29,7 @@ variable "image_configs" { nullable = false } -variable "ip_ranges" { +variable "ip_configs" { description = "IP ranges or IPs used by the VPC." type = map(string) default = { diff --git a/blueprints/serverless/cloud-run-microservices/vpc.tf b/blueprints/serverless/cloud-run-microservices/vpc.tf index 7f2487a52..b6a3b6d70 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.subnet_main + ip_cidr_range = var.ip_configs.subnet_main name = "subnet-main" region = var.region }, { # subnet for VPC access connector - ip_cidr_range = var.ip_ranges.subnet_vpc_access + ip_cidr_range = var.ip_configs.subnet_vpc_access name = "subnet-vpc-access" region = var.region }, { # subnet for Direct VPC Egress - ip_cidr_range = var.ip_ranges.subnet_vpc_direct + ip_cidr_range = var.ip_configs.subnet_vpc_direct name = "subnet-vpc-direct" region = var.region } ] subnets_proxy_only = [ { # subnet for internal ALB - ip_cidr_range = var.ip_ranges.subnet_proxy + ip_cidr_range = var.ip_configs.subnet_proxy name = "subnet-proxy" region = var.region active = true