Skip to content

Fix AW Folder reference when creating common services folder #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmpugh wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −6
Open

Fix AW Folder reference when creating common services folder #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions fast/stages-aw/0-bootstrap/budgets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ module "billing-account-budget" {
]
filter = {
resource_ancestors = [
var.assured_workloads.regime != "COMPLIANCE_REGIME_UNSPECIFIED"
? "folders/${google_assured_workloads_workload.primary[0].resources[0].resource_id}"
: module.no-compliance-folder[0].folder.id
local.assured_workloads_folder
]
}
}
Expand Down
14 changes: 14 additions & 0 deletions fast/stages-aw/0-bootstrap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,18 @@ locals {
}
# naming: environment used in most resource names
prefix = join("-", compact([var.prefix, "prod"]))
assured_workloads_folder = (
var.assured_workloads.regime != "COMPLIANCE_REGIME_UNSPECIFIED"
? format("folders/%s", try(
coalesce(
one([
for r in try(google_assured_workloads_workload.primary[0].resources, []) :
tostring(r.resource_id) if r.resource_type == "CONSUMER_FOLDER"
]),
try(tostring(google_assured_workloads_workload.primary[0].resources[0].resource_id), null)
),
""
))
: try(module.no-compliance-folder[0].id, null)
)
}
2 changes: 1 addition & 1 deletion fast/stages-aw/0-bootstrap/organization.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ module "no-compliance-folder" {

module "branch-common-services-folder" {
source = "../../../modules/folder"
parent = var.assured_workloads.regime != "COMPLIANCE_REGIME_UNSPECIFIED" ? "folders/${google_assured_workloads_workload.primary[0].resources[0].resource_id}" : "${module.no-compliance-folder[0].folder.id}"
parent = local.assured_workloads_folder
name = "${lookup(var.regime_mapping, var.assured_workloads.regime, var.assured_workloads.regime)} Common Services"
}

Expand Down
4 changes: 2 additions & 2 deletions fast/stages-aw/0-bootstrap/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ locals {
project_number = module.log-export-project.number
writer_identities = module.organization.sink_writer_identities
}
assured_workloads = merge(var.assured_workloads, { "folder" = var.assured_workloads.regime != "COMPLIANCE_REGIME_UNSPECIFIED" ? "folders/${google_assured_workloads_workload.primary[0].resources[0].resource_id}" : "${module.no-compliance-folder[0].folder.id}" })
assured_workloads = merge(var.assured_workloads, { "folder" = local.assured_workloads_folder })
common_services_folder = module.branch-common-services-folder.folder.name
regions = var.regions
}
Expand All @@ -128,7 +128,7 @@ output "alert_email" {

output "assured_workload" {
description = "Assured Workload folder for the deployment."
value = var.assured_workloads.regime != "COMPLIANCE_REGIME_UNSPECIFIED" ? "folders/${google_assured_workloads_workload.primary[0].resources[0].resource_id}" : "folders/${module.no-compliance-folder[0].folder.id}"
value = local.assured_workloads_folder
}

output "automation" {
Expand Down
Loading