From 91bd44f5d546a06b5dcc722d6b0cf6828c779311 Mon Sep 17 00:00:00 2001 From: Julio Diez Date: Wed, 22 Feb 2023 15:54:03 +0100 Subject: [PATCH] Remove 'main' from naming for CR since it can be deployed in a svc project --- blueprints/serverless/cloud-run-corporate/main.tf | 4 ++-- blueprints/serverless/cloud-run-corporate/outputs.tf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/serverless/cloud-run-corporate/main.tf b/blueprints/serverless/cloud-run-corporate/main.tf index eab5008e..5b508408 100644 --- a/blueprints/serverless/cloud-run-corporate/main.tf +++ b/blueprints/serverless/cloud-run-corporate/main.tf @@ -16,7 +16,7 @@ locals { domain_cr_main = format("%s.", - trimprefix(module.cloud_run_main.service.status[0].url, "https://")) + trimprefix(module.cloud_run.service.status[0].url, "https://")) tf_id = (var.tf_identity == null ? null : length(regexall("iam.gserviceaccount.com", var.tf_identity)) > 0 ? "serviceAccount:${var.tf_identity}" : "user:${var.tf_identity}") @@ -104,7 +104,7 @@ module "project_svc1" { # Cloud Run service. Usually in the main project, but created in a service project # if the use case is using an L7ILB and custom domain -module "cloud_run_main" { +module "cloud_run" { source = "../../../modules/cloud-run" project_id = (var.custom_domain == null ? module.project_main.project_id : module.project_svc1[0].project_id) diff --git a/blueprints/serverless/cloud-run-corporate/outputs.tf b/blueprints/serverless/cloud-run-corporate/outputs.tf index 06ca9ebc..b0df2acd 100644 --- a/blueprints/serverless/cloud-run-corporate/outputs.tf +++ b/blueprints/serverless/cloud-run-corporate/outputs.tf @@ -16,5 +16,5 @@ output "default_URL" { description = "Cloud Run service default URL." - value = module.cloud_run_main.service.status[0].url + value = module.cloud_run.service.status[0].url }