kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Logging folder settings folder (#3811)

Browse Source 
* Fix: google_logging_folder_settings takes a folder number not folder id

* chore(project-factory): Conditionally pass through logging_settings

Only pass through logging_settings to the folder module if any of the following are true:

- logging.storage_location      is not null
- logging.disable_default_sink  is not null
- logging.kms_key_name          is not null

Else we are triggering [1] when we don't want to.

[1] https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/blob/master/modules/folder/logging.tf#L59-L69
This commit is contained in:
Josh Myers
2026-03-26 05:56:08 +00:00
committed by GitHub
parent e33f2ba52d
commit 2c39df6453
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/folder/logging.tf
View File

@@ -58,7 +58,7 @@ locals {
resource "google_logging_folder_settings" "default" {
count = var.logging_settings != null ? 1 : 0
folder = local.folder_id
folder = local.folder_number
disable_default_sink = var.logging_settings.disable_default_sink
kms_key_name = (
var.logging_settings.kms_key_name == null