From 2ab471d236da8fbf08a4bc69e2dc504b8f278359 Mon Sep 17 00:00:00 2001
From: Ludovico Magnocavallo <ludomagno@google.com>
Date: Thu, 9 Oct 2025 13:37:47 +0200
Subject: [PATCH] pf changes (#3398)

---
 fast/stages/2-project-factory/output-files.tf | 4 ++--
 modules/project-factory/automation.tf         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fast/stages/2-project-factory/output-files.tf b/fast/stages/2-project-factory/output-files.tf
index f4de1a921..db3ecce62 100644
--- a/fast/stages/2-project-factory/output-files.tf
+++ b/fast/stages/2-project-factory/output-files.tf
@@ -124,7 +124,7 @@ resource "local_file" "providers" {
   for_each        = local.of_paths.local == null ? {} : local.of_providers
   file_permission = "0644"
   filename = (
-    "${local.of_paths.local}/providers/${each.value.filename}.tf"
+    "${local.of_paths.local}/providers/${each.value.filename}-providers.tf"
   )
   content = templatestring(local.of_template, {
     bucket = lookup(
@@ -151,7 +151,7 @@ resource "local_file" "tfvars" {
 resource "google_storage_bucket_object" "providers" {
   for_each = local.of_storage_bucket == null ? {} : local.of_providers
   bucket   = local.of_storage_bucket
-  name     = "providers/${each.value.filename}.tf"
+  name     = "providers/${each.value.filename}-providers.tf"
   content = templatestring(local.of_template, {
     bucket = lookup(
       local.of_storage_buckets,
diff --git a/modules/project-factory/automation.tf b/modules/project-factory/automation.tf
index e503e6310..be92bfb9a 100644
--- a/modules/project-factory/automation.tf
+++ b/modules/project-factory/automation.tf
@@ -24,7 +24,7 @@ locals {
         prefix           = coalesce(try(v.automation.prefix, null), v.prefix)
         project          = try(v.automation.project, null)
         service_accounts = try(v.automation.service_accounts, {})
-      } if try(v.automation.bucket, null) != null
+      } if try(v.automation.bucket, null) != null || try(v.automation.service_accounts, null) != null
     },
     {
       for k, v in local.projects_input : k => {
@@ -34,7 +34,7 @@ locals {
         prefix           = coalesce(try(v.automation.prefix, null), v.prefix)
         project          = try(v.automation.project, null)
         service_accounts = try(v.automation.service_accounts, {})
-      } if try(v.automation.bucket, null) != null
+      } if try(v.automation.bucket, null) != null || try(v.automation.service_accounts, null) != null
     }
   )
   _automation_buckets = {
@@ -48,7 +48,7 @@ locals {
         v.prefix,
         local.data_defaults.defaults.prefix
       ), null)
-    })
+    }) if v.bucket != null
   }
   _automation_sas = flatten(concat([
     for k, v in local._automation : [
@@ -58,7 +58,7 @@ locals {
         parent             = k
         parent_name        = v.parent_name
       })
-    ]
+    ] if v.service_accounts != null
   ]))
   automation_buckets = {
     for k, v in local._automation_buckets :