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

Merge remote-tracking branch 'origin/master' into fast-dev

Browse Source
This commit is contained in:
Ludo
2025-07-04 08:55:38 +02:00
parent f07e4f64e9 272658c778
commit 2cb166389f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/project-factory/main.tf
View File

@@ -178,7 +178,8 @@ module "projects-iam" {
# other automation service account (project/automation/rw) # other automation service account (project/automation/rw)
local.context.iam_principals[vv], local.context.iam_principals[vv],
# project's service identities # project's service identities
local.service_agents_email[each.key][vv], local.service_agents_email["${each.key}/${vv}"],
local.service_agents_email[vv],
# passthrough + error handling using tonumber until Terraform gets fail/raise function # passthrough + error handling using tonumber until Terraform gets fail/raise function
( (
strcontains(vv, ":") strcontains(vv, ":")
@@ -206,7 +207,8 @@ module "projects-iam" {
# other automation service account (project/automation/rw) # other automation service account (project/automation/rw)
local.context.iam_principals[v.member], local.context.iam_principals[v.member],
# project's service identities # project's service identities
local.service_agents_email[each.key][v.member], local.service_agents_email["${each.key}/${v.member}"],
local.service_agents_email[v.member],
# passthrough + error handling using tonumber until Terraform gets fail/raise function # passthrough + error handling using tonumber until Terraform gets fail/raise function
( (
strcontains(v.member, ":") strcontains(v.member, ":")
@@ -271,7 +273,8 @@ module "projects-iam" {
# other automation service account (project/automation/rw) # other automation service account (project/automation/rw)
local.context.iam_principals[v.member], local.context.iam_principals[v.member],
# project's service identities # project's service identities
local.service_agents_email[each.key][v.member], local.service_agents_email["${each.key}/${v.member}"],
local.service_agents_email[v.member],
# passthrough + error handling using tonumber until Terraform gets fail/raise function # passthrough + error handling using tonumber until Terraform gets fail/raise function
( (
strcontains(v.member, ":") strcontains(v.member, ":")

2
modules/project/main.tf
View File

@@ -128,5 +128,5 @@ resource "google_monitoring_monitored_project" "primary" {
resource "google_compute_project_default_network_tier" "default_network_tier" { resource "google_compute_project_default_network_tier" "default_network_tier" {
count = var.default_network_tier == null ? 0 : 1 count = var.default_network_tier == null ? 0 : 1
network_tier = var.default_network_tier network_tier = var.default_network_tier
project = google_project.project[0].id project = local.project.project_id
} }