From 4195c3a5affebcdb73b43a3f165d01562c16a0de Mon Sep 17 00:00:00 2001
From: Ludovico Magnocavallo <ludomagno@google.com>
Date: Wed, 21 May 2025 15:01:39 +0200
Subject: [PATCH] Revert "Make automation project in project factory module
 optional (#3091)" (#3106)

This reverts commit 33493b359723453011f01ecbcff62788e9e705ba.
---
 modules/project-factory/automation.tf               | 4 ++--
 modules/project-factory/schemas/project.schema.json | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/project-factory/automation.tf b/modules/project-factory/automation.tf
index 61cf69c0f..ed124988c 100644
--- a/modules/project-factory/automation.tf
+++ b/modules/project-factory/automation.tf
@@ -20,7 +20,7 @@ locals {
   automation_buckets = {
     for k, v in local.projects :
     k => merge(try(v.automation.bucket, {}), {
-      automation_project = try(v.automation.project, "${v.prefix}-${v.name}")
+      automation_project = v.automation.project
       prefix             = v.prefix
       project_name       = v.name
     }) if try(v.automation.bucket, null) != null
@@ -28,7 +28,7 @@ locals {
   automation_sa = flatten([
     for k, v in local.projects : [
       for ks, kv in try(v.automation.service_accounts, {}) : merge(kv, {
-        automation_project = try(v.automation.project, "${v.prefix}-${v.name}")
+        automation_project = v.automation.project
         name               = ks
         prefix             = v.prefix
         project            = k
diff --git a/modules/project-factory/schemas/project.schema.json b/modules/project-factory/schemas/project.schema.json
index f9ec48ccd..eb9ad7021 100644
--- a/modules/project-factory/schemas/project.schema.json
+++ b/modules/project-factory/schemas/project.schema.json
@@ -7,6 +7,9 @@
     "automation": {
       "type": "object",
       "additionalProperties": false,
+      "required": [
+        "project"
+      ],
       "properties": {
         "project": {
           "type": "string"
@@ -659,4 +662,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file