From 33493b359723453011f01ecbcff62788e9e705ba Mon Sep 17 00:00:00 2001 From: Luca Prete Date: Tue, 20 May 2025 08:19:58 +0200 Subject: [PATCH] Make automation project in project factory module optional (#3091) --- modules/project-factory/automation.tf | 4 ++-- modules/project-factory/schemas/project.schema.json | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/project-factory/automation.tf b/modules/project-factory/automation.tf index ed124988c..61cf69c0f 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 = v.automation.project + automation_project = try(v.automation.project, "${v.prefix}-${v.name}") 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 = v.automation.project + automation_project = try(v.automation.project, "${v.prefix}-${v.name}") 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 eb9ad7021..f9ec48ccd 100644 --- a/modules/project-factory/schemas/project.schema.json +++ b/modules/project-factory/schemas/project.schema.json @@ -7,9 +7,6 @@ "automation": { "type": "object", "additionalProperties": false, - "required": [ - "project" - ], "properties": { "project": { "type": "string" @@ -662,4 +659,4 @@ } } } -} \ No newline at end of file +}