Skip to content

Support new style service account principalsets in project factory #3181

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

Merged
merged 2 commits into from
Jun 20, 2025
Merged

Support new style service account principalsets in project factory #3181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88151a7
add support for service account principalsets to project factory
ludoo Jun 20, 2025
da77f57
Merge branch 'fast-dev' into ludo/pf-iam-sa-principalset
ludoo Jun 20, 2025
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
3 changes: 3 additions & 0 deletions modules/project-factory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,19 @@ The following table lists the available context interpolations. External context
| | | | IaC service accounts |
| | | | other project service accounts |
| | | | other project IaC service accounts |
| | | | project number in principals |
| project | tag bindings | `tag_values` | |
| project | IAM principals | `iam_principals` | project service accounts |
| | | | IaC service accounts |
| | | | other project service accounts |
| | | | other project service agents |
| | | | other project IaC service accounts |
| | | | project number in principals |
| bucket | IAM principals | `iam_principals` | project service accounts |
| | | | IaC service accounts |
| | | | other project service accounts |
| | | | other project IaC service accounts |
| | | | project number in principals |
| service account | IAM projects | `vpc_host_projects` | |
| service account | `iam_sa_roles` | | service accounts in the same project |
| IaC bucket | IAM principals | `iam_principals` | IaC service accounts |
Expand Down
36 changes: 27 additions & 9 deletions modules/project-factory/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ module "projects-iam" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(vv, ":")
? vv
? templatestring(
vv, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${vv}' in project '${each.key}'")
)
)
Expand All @@ -180,7 +182,9 @@ module "projects-iam" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(vv, ":")
? vv
? templatestring(
vv, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${vv}' in project '${each.key}'")
)
)
Expand All @@ -206,7 +210,9 @@ module "projects-iam" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(v.member, ":")
? v.member
? templatestring(
v.member, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${v.member}' in project '${each.key}'")
)
)
Expand All @@ -231,7 +237,9 @@ module "projects-iam" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(k, ":")
? k
? templatestring(
k, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${k}' in project '${each.key}'")
)
) => [
Expand Down Expand Up @@ -267,7 +275,9 @@ module "projects-iam" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(v.member, ":")
? v.member
? templatestring(
v.member, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${v.member}' in project '${each.key}'")
)
)
Expand All @@ -290,7 +300,9 @@ module "projects-iam" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(vv, ":")
? vv
? templatestring(
vv, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${vv}' in project '${each.key}'")
)
)
Expand Down Expand Up @@ -329,7 +341,9 @@ module "buckets" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(vv, ":")
? vv
? templatestring(
vv, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${vv}' in project '${each.value.project_key}'")
)
)
Expand All @@ -352,7 +366,9 @@ module "buckets" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(vv, ":")
? vv
? templatestring(
vv, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${vv}' in project '${each.value.project}'")
)
)
Expand All @@ -375,7 +391,9 @@ module "buckets" {
# passthrough + error handling using tonumber until Terraform gets fail/raise function
(
strcontains(v.member, ":")
? v.member
? templatestring(
v.member, { project_number = module.projects[each.key].number }
)
: tonumber("[Error] Invalid member: '${v.member}' in project '${each.value.project}'")
)
)
Expand Down