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

fix parent id lookup for networking and security stages (#2744)

Browse Source
This commit is contained in:
Ludovico Magnocavallo
2024-12-04 21:08:31 +01:00
committed by GitHub
parent 24b9049299
commit 1a1886c551
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fast/stages/1-resman/stage-2-networking.tf
View File

@@ -39,7 +39,7 @@ module "net-folder" {
var.fast_stage_2.networking.folder_config.parent_id == null
? local.root_node
: try(
local.top_level_folder_ids[var.fast_stage_2.networking.folder_config],
local.top_level_folder_ids[var.fast_stage_2.networking.folder_config.parent_id],
var.fast_stage_2.networking.folder_config.parent_id
)
)

2
fast/stages/1-resman/stage-2-security.tf
View File

@@ -38,7 +38,7 @@ module "sec-folder" {
var.fast_stage_2.security.folder_config.parent_id == null
? local.root_node
: try(
local.top_level_folder_ids[var.fast_stage_2.security.folder_config],
local.top_level_folder_ids[var.fast_stage_2.security.folder_config.parent_id],
var.fast_stage_2.security.folder_config.parent_id
)
)

9
tests/fast/stages/s1_resman/simple.tfvars
View File

@@ -92,6 +92,9 @@ fast_stage_2 = {
type = "github"
}
}
folder_config = {
parent_id = "shared"
}
}
security = {
cicd_config = {
@@ -141,4 +144,10 @@ top_level_folders = {
}
iam_by_principals = {}
}
shared = {
name = "Shared Infrastructure"
automation = {
enable = false
}
}
}

25
tests/fast/stages/s1_resman/simple.yaml
View File

@@ -224,7 +224,6 @@ values:
module.net-folder[0].google_folder.folder[0]:
deletion_protection: false
display_name: Networking
parent: organizations/123456789012
timeouts: null
? module.net-folder[0].google_folder_iam_binding.authoritative["organizations/123456789012/roles/networkFirewallPoliciesAdmin"]
: condition: []
@@ -1778,23 +1777,23 @@ values:
role: roles/storage.objectAdmin
counts:
google_folder: 13
google_folder: 14
google_folder_iam_binding: 75
google_org_policy_policy: 2
google_organization_iam_member: 19
google_project_iam_member: 26
google_service_account: 26
google_service_account_iam_binding: 26
google_storage_bucket: 12
google_storage_bucket_iam_binding: 24
google_storage_bucket_iam_member: 26
google_storage_bucket_object: 25
google_tags_tag_binding: 13
google_project_iam_member: 27
google_service_account: 27
google_service_account_iam_binding: 27
google_storage_bucket: 13
google_storage_bucket_iam_binding: 26
google_storage_bucket_iam_member: 27
google_storage_bucket_object: 26
google_tags_tag_binding: 14
google_tags_tag_key: 2
google_tags_tag_value: 12
google_tags_tag_value: 13
google_tags_tag_value_iam_binding: 4
modules: 52
resources: 305
modules: 55
resources: 316
outputs:
cicd_repositories: