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

Rationalize location defaults across project factory module and FAST stages (#3392)

Browse Source 
* group default/overrides locations in a single object in pf module

* org setup

* project factory stage

* fix defaults

* pf defaults

* security stage defaults
This commit is contained in:
Ludovico Magnocavallo
2025-10-08 09:12:15 +02:00
committed by GitHub
parent 3b3efd57bd
commit d3c80ce18b
34 changed files with 765 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
modules/logging-bucket/main.tf
View File

@@ -27,6 +27,9 @@ locals {
}
}
ctx_p = "$"
location = lookup(
local.ctx.locations, var.location, var.location
)
parent_id = (
var.parent_type == "project"
? lookup(local.ctx.project_ids, var.parent, var.parent)
@@ -40,11 +43,9 @@ locals {
}
resource "google_logging_project_bucket_config" "bucket" {
count = var.parent_type == "project" ? 1 : 0
project = local.parent_id
location = lookup(
local.ctx.locations, var.location, var.location
)
count = var.parent_type == "project" ? 1 : 0
project = local.parent_id
location = local.location
retention_days = var.retention
bucket_id = var.name
description = var.description
@@ -58,11 +59,9 @@ resource "google_logging_project_bucket_config" "bucket" {
}
resource "google_logging_folder_bucket_config" "bucket" {
count = var.parent_type == "folder" ? 1 : 0
folder = local.parent_id
location = lookup(
local.ctx.locations, var.location, var.location
)
count = var.parent_type == "folder" ? 1 : 0
folder = local.parent_id
location = local.location
retention_days = var.retention
bucket_id = var.name
description = var.description
@@ -73,16 +72,14 @@ resource "google_logging_linked_dataset" "dataset" {
link_id = var.log_analytics.dataset_link_id
parent = "projects/${google_logging_project_bucket_config.bucket[0].project}"
bucket = google_logging_project_bucket_config.bucket[0].id
location = var.location
location = local.location
description = var.log_analytics.description
}
resource "google_logging_organization_bucket_config" "bucket" {
count = var.parent_type == "organization" ? 1 : 0
organization = local.parent_id
location = lookup(
local.ctx.locations, var.location, var.location
)
count = var.parent_type == "organization" ? 1 : 0
organization = local.parent_id
location = local.location
retention_days = var.retention
bucket_id = var.name
description = var.description
@@ -91,12 +88,10 @@ resource "google_logging_organization_bucket_config" "bucket" {
resource "google_logging_billing_account_bucket_config" "bucket" {
count = var.parent_type == "billing_account" ? 1 : 0
billing_account = local.parent_id
location = lookup(
local.ctx.locations, var.location, var.location
)
retention_days = var.retention
bucket_id = var.name
description = var.description
location = local.location
retention_days = var.retention
bucket_id = var.name
description = var.description
}
resource "google_logging_log_view" "views" {