Merge remote-tracking branch 'origin/master' into fast-dev
This commit is contained in:
@@ -178,7 +178,8 @@ module "projects-iam" {
|
||||
# other automation service account (project/automation/rw)
|
||||
local.context.iam_principals[vv],
|
||||
# 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
|
||||
(
|
||||
strcontains(vv, ":")
|
||||
@@ -206,7 +207,8 @@ module "projects-iam" {
|
||||
# other automation service account (project/automation/rw)
|
||||
local.context.iam_principals[v.member],
|
||||
# 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
|
||||
(
|
||||
strcontains(v.member, ":")
|
||||
@@ -271,7 +273,8 @@ module "projects-iam" {
|
||||
# other automation service account (project/automation/rw)
|
||||
local.context.iam_principals[v.member],
|
||||
# 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
|
||||
(
|
||||
strcontains(v.member, ":")
|
||||
|
||||
@@ -128,5 +128,5 @@ resource "google_monitoring_monitored_project" "primary" {
|
||||
resource "google_compute_project_default_network_tier" "default_network_tier" {
|
||||
count = var.default_network_tier == null ? 0 : 1
|
||||
network_tier = var.default_network_tier
|
||||
project = google_project.project[0].id
|
||||
project = local.project.project_id
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user