From 29af0f3b313dcd5253bb7da3ce945862e069048e Mon Sep 17 00:00:00 2001
From: Julio Diez <jdiez@google.com>
Date: Wed, 22 Feb 2023 15:29:15 +0100
Subject: [PATCH] Deploy CR service in service project if use case is using ILB

---
 blueprints/serverless/cloud-run-corporate/main.tf | 15 +++++++++------
 .../serverless/cloud-run-corporate/variables.tf   |  6 ++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/blueprints/serverless/cloud-run-corporate/main.tf b/blueprints/serverless/cloud-run-corporate/main.tf
index cf016012..eab5008e 100644
--- a/blueprints/serverless/cloud-run-corporate/main.tf
+++ b/blueprints/serverless/cloud-run-corporate/main.tf
@@ -92,7 +92,8 @@ module "project_svc1" {
   }
   services = [
     "compute.googleapis.com",
-    "dns.googleapis.com"
+    "dns.googleapis.com",
+    "run.googleapis.com"
   ]
   skip_delete = true
 }
@@ -101,12 +102,14 @@ module "project_svc1" {
 #                                  Cloud Run                                  #
 ###############################################################################
 
-# Cloud Run service in main project
+# 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" {
-  source     = "../../../modules/cloud-run"
-  project_id = module.project_main.project_id
-  name       = var.run_svc_name
-  region     = var.region
+  source = "../../../modules/cloud-run"
+  project_id = (var.custom_domain == null ?
+  module.project_main.project_id : module.project_svc1[0].project_id)
+  name   = var.run_svc_name
+  region = var.region
   containers = [{
     image         = var.image
     options       = null
diff --git a/blueprints/serverless/cloud-run-corporate/variables.tf b/blueprints/serverless/cloud-run-corporate/variables.tf
index d1496e8f..ae2cf9b6 100644
--- a/blueprints/serverless/cloud-run-corporate/variables.tf
+++ b/blueprints/serverless/cloud-run-corporate/variables.tf
@@ -29,6 +29,12 @@ variable "access_policy_create" {
   default = null
 }
 
+variable "custom_domain" {
+  description = "Custom domain for the Load Balancer."
+  type        = string
+  default     = null
+}
+
 variable "image" {
   description = "Container image to deploy."
   type        = string