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

fix permadiff in bootstrap stage (#2656)

Browse Source
This commit is contained in:
Ludovico Magnocavallo
2024-11-01 15:56:07 +01:00
committed by GitHub
parent b851d100e2
commit d0c8ffaddb
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fast/stages/0-bootstrap/organization.tf
View File

@@ -141,10 +141,6 @@ module "organization" {
# delegated role grant for resource manager service account # delegated role grant for resource manager service account
iam_bindings = merge( iam_bindings = merge(
{ {
organization_ngfw_enterprise_admin = {
members = [local.principals.gcp-network-admins]
role = module.organization.custom_role_id["ngfw_enterprise_admin"]
}
organization_iam_admin_conditional = { organization_iam_admin_conditional = {
members = [module.automation-tf-resman-sa.iam_email] members = [module.automation-tf-resman-sa.iam_email]
role = module.organization.custom_role_id["organization_iam_admin"] role = module.organization.custom_role_id["organization_iam_admin"]

4
tests/fast/stages/s0_bootstrap/simple.yaml
View File

@@ -20,7 +20,7 @@ counts:
google_logging_organization_sink: 4 google_logging_organization_sink: 4
google_logging_project_bucket_config: 4 google_logging_project_bucket_config: 4
google_org_policy_policy: 24 google_org_policy_policy: 24
google_organization_iam_binding: 28 google_organization_iam_binding: 27
google_organization_iam_custom_role: 12 google_organization_iam_custom_role: 12
google_organization_iam_member: 29 google_organization_iam_member: 29
google_project: 3 google_project: 3
@@ -41,7 +41,7 @@ counts:
google_tags_tag_value: 2 google_tags_tag_value: 2
local_file: 10 local_file: 10
modules: 20 modules: 20
resources: 235 resources: 234
outputs: outputs:
automation: __missing__ automation: __missing__