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

metric scopes context (#3828)

Browse Source
This commit is contained in:
Ludovico Magnocavallo
2026-04-01 13:47:38 +02:00
committed by GitHub
parent 956ada4ddd
commit 7b43c3e8cf
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/project-factory/projects.tf
View File

@@ -128,14 +128,11 @@ module "projects" {
labels = merge( labels = merge(
each.value.labels, var.data_merges.labels each.value.labels, var.data_merges.labels
) )
lien_reason = try(each.value.lien_reason, null) lien_reason = try(each.value.lien_reason, null)
log_scopes = try(each.value.log_scopes, null) log_scopes = try(each.value.log_scopes, null)
logging_exclusions = try(each.value.logging_exclusions, {}) logging_exclusions = try(each.value.logging_exclusions, {})
logging_metrics = try(each.value.logging_metrics, null) logging_metrics = try(each.value.logging_metrics, null)
logging_sinks = try(each.value.logging_sinks, {}) logging_sinks = try(each.value.logging_sinks, {})
metric_scopes = distinct(concat(
each.value.metric_scopes, var.data_merges.metric_scopes
))
notification_channels = try(each.value.notification_channels, null) notification_channels = try(each.value.notification_channels, null)
org_policies = each.value.org_policies org_policies = each.value.org_policies
quotas = each.value.quotas quotas = each.value.quotas
@@ -191,7 +188,10 @@ module "projects-iam" {
iam_by_principals_conditional = lookup(each.value, "iam_by_principals_conditional", {}) iam_by_principals_conditional = lookup(each.value, "iam_by_principals_conditional", {})
iam_by_principals_additive = lookup(each.value, "iam_by_principals_additive", {}) iam_by_principals_additive = lookup(each.value, "iam_by_principals_additive", {})
logging_data_access = lookup(each.value, "logging_data_access", {}) logging_data_access = lookup(each.value, "logging_data_access", {})
pam_entitlements = try(each.value.pam_entitlements, {}) metric_scopes = distinct(concat(
each.value.metric_scopes, var.data_merges.metric_scopes
))
pam_entitlements = try(each.value.pam_entitlements, {})
service_agents_config = { service_agents_config = {
create_primary_agents = false create_primary_agents = false
grant_default_roles = false grant_default_roles = false

2
modules/project/main.tf
View File

@@ -197,7 +197,7 @@ resource "google_essential_contacts_contact" "contact" {
resource "google_monitoring_monitored_project" "primary" { resource "google_monitoring_monitored_project" "primary" {
provider = google-beta provider = google-beta
for_each = toset(var.metric_scopes) for_each = toset(var.metric_scopes)
metrics_scope = each.value metrics_scope = lookup(local.ctx.project_ids, each.value, each.value)
name = local.project.project_id name = local.project.project_id
} }