FAST multitenant bootstrap and resource management, rename org-level FAST stages (#1052)
* rename stages
* remove support for external org billing, rename output files
* resman: make groups optional, align on new billing account variable
* bootstrap: multitenant outputs
* tenant bootstrap stage, untested
* fix folder name
* fix stage 0 output names
* optional creation for tag keys in organization module
* single tenant bootstrap minus tag
* rename output files, add tenant tag key
* fix organization module tag values output
* test skipping creation for tags in organization module
* single tenant bootstrap plan working
* multitenant bootstrap
* tfdoc
* fix check links error messages
* fix links
* tfdoc
* fix links
* rename fast tests, fix bootstrap tests
* multitenant stages have their own folder, simplify stage numbering
* stage renumbering
* wip
* rename tests
* exclude fast providers in fixture
* stage 0 tests
* stage 1 tests
* network stages tests
* stage tests
* tfdoc
* fix links
* tfdoc
* multitenant tests
* remove local files
* stage links command
* fix links script, TODO
* wip
* wip single tenant bootstrap
* working tenant bootstrap
* update gitignore
* remove local files
* tfdoc
* remove local files
* allow tests for tenant bootstrap stage
* tenant bootstrap proxies stage 1 tfvars
* stage 2 and 3 service accounts and IAM in tenant bootstrap
* wip
* wip
* wip
* drop multitenant bootstrap
* tfdoc
* add missing stage 2 SAs, fix org-level IAM condition
* wip
* wip
* optional tag value creation in organization module
* stage 1 working
* linting
* linting
* READMEs
* wip
* Make stage-links script work in old macos bash
* stage links command help
* fix output file names
* diagrams
* fix svg
* stage 0 skeleton and diagram
* test svg
* test svg
* test diagram
* diagram
* readme
* fix stage links script
* stage 0 readme
* README changes
* stage readmes
* fix outputs order
* fix link
* fix tests
* stage 1 test
* skip stage example
* boilerplate
* fix tftest skip
* default bootstrap stage log sinks to log buckets
* add logging to tenant bootstrap
* move iam variables out of tenant config
* fix cicd, reintroduce missing variable
* use optional in stage 1 cicd variable
* rename extras stage
* rename and move identity providers local, use optional for cicd variable
* tfdoc
* add support for wif pool and providers, ci/cd
* tfdoc
* fix links
* better handling of modules repository
* add missing role on logging project
* fix cicd pools in locals, test cicd
* fix workflow extension
* fix module source replacement
* allow tenant bootstrap cicd sa to impersonate resman sa
* tenant workflow templates fix for no providers file
* fix output files, push github workflow template to new repository
* remove try from outpout files
* align stage 1 cicd internals to stage 0
* tfdoc
* tests
* fix tests
* tests
* improve variable descriptions
* use optional in fast features
* actually create tenant log sinks, and allow the resman sa to do it
* test
* tests
* aaaand tests again
* fast features tenant override
* fast features tenant override
* fix wording
* add missing comment
* configure pf service accounts
* add missing comment
* tfdoc
* tests
* IAM docs
* update copyright
---------
Co-authored-by: Julio Castillo <jccb@google.com>
2023-02-04 06:00:45 -08:00
|
|
|
/**
|
|
|
|
* Copyright 2023 Google LLC
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
# tfdoc:file:description Tenant automation stage 2 and 3 service accounts.
|
|
|
|
|
|
|
|
locals {
|
|
|
|
branch_sas = {
|
|
|
|
dp-dev = {
|
|
|
|
condition = join(" && ", [
|
|
|
|
"resource.matchTag('${local.tag_keys.context}', 'data')",
|
|
|
|
"resource.matchTag('${local.tag_keys.environment}', 'development')"
|
|
|
|
])
|
|
|
|
description = "data platform dev"
|
|
|
|
flag = "data_platform"
|
|
|
|
}
|
|
|
|
dp-prod = {
|
|
|
|
condition = join(" && ", [
|
|
|
|
"resource.matchTag('${local.tag_keys.context}', 'data')",
|
|
|
|
"resource.matchTag('${local.tag_keys.environment}', 'production')"
|
|
|
|
])
|
|
|
|
description = "data platform prod"
|
|
|
|
flag = "data_platform"
|
|
|
|
}
|
|
|
|
gke-dev = {
|
|
|
|
condition = join(" && ", [
|
|
|
|
"resource.matchTag('${local.tag_keys.context}', 'gke')",
|
|
|
|
"resource.matchTag('${local.tag_keys.environment}', 'development')"
|
|
|
|
])
|
|
|
|
description = "GKE dev"
|
|
|
|
flag = "gke"
|
|
|
|
}
|
|
|
|
gke-prod = {
|
|
|
|
condition = join(" && ", [
|
|
|
|
"resource.matchTag('${local.tag_keys.context}', 'gke')",
|
|
|
|
"resource.matchTag('${local.tag_keys.environment}', 'production')"
|
|
|
|
])
|
|
|
|
description = "GKE prod"
|
|
|
|
flag = "gke"
|
|
|
|
}
|
|
|
|
networking = {
|
|
|
|
condition = "resource.matchTag('${local.tag_keys.context}', 'networking')"
|
|
|
|
description = "networking"
|
|
|
|
flag = "-"
|
|
|
|
}
|
|
|
|
pf-dev = {
|
|
|
|
condition = "resource.matchTag('${local.tag_keys.environment}', 'development')"
|
|
|
|
description = "project factory dev"
|
|
|
|
flag = "project_factory"
|
|
|
|
}
|
|
|
|
pf-prod = {
|
|
|
|
condition = "resource.matchTag('${local.tag_keys.environment}', 'production')"
|
|
|
|
description = "project factory prod"
|
|
|
|
flag = "project_factory"
|
|
|
|
}
|
|
|
|
sandbox = {
|
|
|
|
condition = "resource.matchTag('${local.tag_keys.context}', 'sandbox')"
|
|
|
|
description = "sandbox"
|
|
|
|
flag = "sandbox"
|
|
|
|
}
|
|
|
|
security = {
|
|
|
|
condition = "resource.matchTag('${local.tag_keys.context}', 'security')"
|
|
|
|
description = "security"
|
|
|
|
flag = "-"
|
|
|
|
}
|
|
|
|
teams = {
|
|
|
|
condition = "resource.matchTag('${local.tag_keys.context}', 'teams')"
|
|
|
|
description = "teams"
|
|
|
|
flag = "teams"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
module "automation-tf-resman-sa-stage2-3" {
|
|
|
|
source = "../../../modules/iam-service-account"
|
|
|
|
for_each = {
|
|
|
|
for k, v in local.branch_sas :
|
|
|
|
k => v if lookup(local.fast_features, v.flag, true)
|
|
|
|
}
|
|
|
|
project_id = module.automation-project.project_id
|
|
|
|
name = "${each.key}-0"
|
|
|
|
display_name = "Terraform ${each.value.description} service account."
|
|
|
|
prefix = local.prefix
|
2023-03-03 08:23:36 -08:00
|
|
|
iam_billing_roles = local.billing_mode == "resource" ? {
|
FAST multitenant bootstrap and resource management, rename org-level FAST stages (#1052)
* rename stages
* remove support for external org billing, rename output files
* resman: make groups optional, align on new billing account variable
* bootstrap: multitenant outputs
* tenant bootstrap stage, untested
* fix folder name
* fix stage 0 output names
* optional creation for tag keys in organization module
* single tenant bootstrap minus tag
* rename output files, add tenant tag key
* fix organization module tag values output
* test skipping creation for tags in organization module
* single tenant bootstrap plan working
* multitenant bootstrap
* tfdoc
* fix check links error messages
* fix links
* tfdoc
* fix links
* rename fast tests, fix bootstrap tests
* multitenant stages have their own folder, simplify stage numbering
* stage renumbering
* wip
* rename tests
* exclude fast providers in fixture
* stage 0 tests
* stage 1 tests
* network stages tests
* stage tests
* tfdoc
* fix links
* tfdoc
* multitenant tests
* remove local files
* stage links command
* fix links script, TODO
* wip
* wip single tenant bootstrap
* working tenant bootstrap
* update gitignore
* remove local files
* tfdoc
* remove local files
* allow tests for tenant bootstrap stage
* tenant bootstrap proxies stage 1 tfvars
* stage 2 and 3 service accounts and IAM in tenant bootstrap
* wip
* wip
* wip
* drop multitenant bootstrap
* tfdoc
* add missing stage 2 SAs, fix org-level IAM condition
* wip
* wip
* optional tag value creation in organization module
* stage 1 working
* linting
* linting
* READMEs
* wip
* Make stage-links script work in old macos bash
* stage links command help
* fix output file names
* diagrams
* fix svg
* stage 0 skeleton and diagram
* test svg
* test svg
* test diagram
* diagram
* readme
* fix stage links script
* stage 0 readme
* README changes
* stage readmes
* fix outputs order
* fix link
* fix tests
* stage 1 test
* skip stage example
* boilerplate
* fix tftest skip
* default bootstrap stage log sinks to log buckets
* add logging to tenant bootstrap
* move iam variables out of tenant config
* fix cicd, reintroduce missing variable
* use optional in stage 1 cicd variable
* rename extras stage
* rename and move identity providers local, use optional for cicd variable
* tfdoc
* add support for wif pool and providers, ci/cd
* tfdoc
* fix links
* better handling of modules repository
* add missing role on logging project
* fix cicd pools in locals, test cicd
* fix workflow extension
* fix module source replacement
* allow tenant bootstrap cicd sa to impersonate resman sa
* tenant workflow templates fix for no providers file
* fix output files, push github workflow template to new repository
* remove try from outpout files
* align stage 1 cicd internals to stage 0
* tfdoc
* tests
* fix tests
* tests
* improve variable descriptions
* use optional in fast features
* actually create tenant log sinks, and allow the resman sa to do it
* test
* tests
* aaaand tests again
* fast features tenant override
* fast features tenant override
* fix wording
* add missing comment
* configure pf service accounts
* add missing comment
* tfdoc
* tests
* IAM docs
* update copyright
---------
Co-authored-by: Julio Castillo <jccb@google.com>
2023-02-04 06:00:45 -08:00
|
|
|
(var.billing_account.id) = [
|
|
|
|
"roles/billing.user", "roles/billing.costsManager"
|
|
|
|
]
|
|
|
|
} : {}
|
2023-03-03 08:23:36 -08:00
|
|
|
iam_organization_roles = local.billing_mode == "org" ? {
|
FAST multitenant bootstrap and resource management, rename org-level FAST stages (#1052)
* rename stages
* remove support for external org billing, rename output files
* resman: make groups optional, align on new billing account variable
* bootstrap: multitenant outputs
* tenant bootstrap stage, untested
* fix folder name
* fix stage 0 output names
* optional creation for tag keys in organization module
* single tenant bootstrap minus tag
* rename output files, add tenant tag key
* fix organization module tag values output
* test skipping creation for tags in organization module
* single tenant bootstrap plan working
* multitenant bootstrap
* tfdoc
* fix check links error messages
* fix links
* tfdoc
* fix links
* rename fast tests, fix bootstrap tests
* multitenant stages have their own folder, simplify stage numbering
* stage renumbering
* wip
* rename tests
* exclude fast providers in fixture
* stage 0 tests
* stage 1 tests
* network stages tests
* stage tests
* tfdoc
* fix links
* tfdoc
* multitenant tests
* remove local files
* stage links command
* fix links script, TODO
* wip
* wip single tenant bootstrap
* working tenant bootstrap
* update gitignore
* remove local files
* tfdoc
* remove local files
* allow tests for tenant bootstrap stage
* tenant bootstrap proxies stage 1 tfvars
* stage 2 and 3 service accounts and IAM in tenant bootstrap
* wip
* wip
* wip
* drop multitenant bootstrap
* tfdoc
* add missing stage 2 SAs, fix org-level IAM condition
* wip
* wip
* optional tag value creation in organization module
* stage 1 working
* linting
* linting
* READMEs
* wip
* Make stage-links script work in old macos bash
* stage links command help
* fix output file names
* diagrams
* fix svg
* stage 0 skeleton and diagram
* test svg
* test svg
* test diagram
* diagram
* readme
* fix stage links script
* stage 0 readme
* README changes
* stage readmes
* fix outputs order
* fix link
* fix tests
* stage 1 test
* skip stage example
* boilerplate
* fix tftest skip
* default bootstrap stage log sinks to log buckets
* add logging to tenant bootstrap
* move iam variables out of tenant config
* fix cicd, reintroduce missing variable
* use optional in stage 1 cicd variable
* rename extras stage
* rename and move identity providers local, use optional for cicd variable
* tfdoc
* add support for wif pool and providers, ci/cd
* tfdoc
* fix links
* better handling of modules repository
* add missing role on logging project
* fix cicd pools in locals, test cicd
* fix workflow extension
* fix module source replacement
* allow tenant bootstrap cicd sa to impersonate resman sa
* tenant workflow templates fix for no providers file
* fix output files, push github workflow template to new repository
* remove try from outpout files
* align stage 1 cicd internals to stage 0
* tfdoc
* tests
* fix tests
* tests
* improve variable descriptions
* use optional in fast features
* actually create tenant log sinks, and allow the resman sa to do it
* test
* tests
* aaaand tests again
* fast features tenant override
* fast features tenant override
* fix wording
* add missing comment
* configure pf service accounts
* add missing comment
* tfdoc
* tests
* IAM docs
* update copyright
---------
Co-authored-by: Julio Castillo <jccb@google.com>
2023-02-04 06:00:45 -08:00
|
|
|
(var.organization.id) = [
|
|
|
|
"roles/billing.user", "roles/billing.costsManager"
|
|
|
|
]
|
|
|
|
} : {}
|
|
|
|
}
|
|
|
|
|
|
|
|
# assign org policy admin with a tag-based condition to stage 2 and 3 SAs
|
2023-08-20 00:44:20 -07:00
|
|
|
# TODO: move to new iam_bindings_additive in the organization module
|
FAST multitenant bootstrap and resource management, rename org-level FAST stages (#1052)
* rename stages
* remove support for external org billing, rename output files
* resman: make groups optional, align on new billing account variable
* bootstrap: multitenant outputs
* tenant bootstrap stage, untested
* fix folder name
* fix stage 0 output names
* optional creation for tag keys in organization module
* single tenant bootstrap minus tag
* rename output files, add tenant tag key
* fix organization module tag values output
* test skipping creation for tags in organization module
* single tenant bootstrap plan working
* multitenant bootstrap
* tfdoc
* fix check links error messages
* fix links
* tfdoc
* fix links
* rename fast tests, fix bootstrap tests
* multitenant stages have their own folder, simplify stage numbering
* stage renumbering
* wip
* rename tests
* exclude fast providers in fixture
* stage 0 tests
* stage 1 tests
* network stages tests
* stage tests
* tfdoc
* fix links
* tfdoc
* multitenant tests
* remove local files
* stage links command
* fix links script, TODO
* wip
* wip single tenant bootstrap
* working tenant bootstrap
* update gitignore
* remove local files
* tfdoc
* remove local files
* allow tests for tenant bootstrap stage
* tenant bootstrap proxies stage 1 tfvars
* stage 2 and 3 service accounts and IAM in tenant bootstrap
* wip
* wip
* wip
* drop multitenant bootstrap
* tfdoc
* add missing stage 2 SAs, fix org-level IAM condition
* wip
* wip
* optional tag value creation in organization module
* stage 1 working
* linting
* linting
* READMEs
* wip
* Make stage-links script work in old macos bash
* stage links command help
* fix output file names
* diagrams
* fix svg
* stage 0 skeleton and diagram
* test svg
* test svg
* test diagram
* diagram
* readme
* fix stage links script
* stage 0 readme
* README changes
* stage readmes
* fix outputs order
* fix link
* fix tests
* stage 1 test
* skip stage example
* boilerplate
* fix tftest skip
* default bootstrap stage log sinks to log buckets
* add logging to tenant bootstrap
* move iam variables out of tenant config
* fix cicd, reintroduce missing variable
* use optional in stage 1 cicd variable
* rename extras stage
* rename and move identity providers local, use optional for cicd variable
* tfdoc
* add support for wif pool and providers, ci/cd
* tfdoc
* fix links
* better handling of modules repository
* add missing role on logging project
* fix cicd pools in locals, test cicd
* fix workflow extension
* fix module source replacement
* allow tenant bootstrap cicd sa to impersonate resman sa
* tenant workflow templates fix for no providers file
* fix output files, push github workflow template to new repository
* remove try from outpout files
* align stage 1 cicd internals to stage 0
* tfdoc
* tests
* fix tests
* tests
* improve variable descriptions
* use optional in fast features
* actually create tenant log sinks, and allow the resman sa to do it
* test
* tests
* aaaand tests again
* fast features tenant override
* fast features tenant override
* fix wording
* add missing comment
* configure pf service accounts
* add missing comment
* tfdoc
* tests
* IAM docs
* update copyright
---------
Co-authored-by: Julio Castillo <jccb@google.com>
2023-02-04 06:00:45 -08:00
|
|
|
|
|
|
|
resource "google_organization_iam_member" "org_policy_admin_stage2_3" {
|
|
|
|
for_each = {
|
|
|
|
for k, v in module.automation-tf-resman-sa-stage2-3 : k => v.iam_email
|
|
|
|
}
|
|
|
|
org_id = var.organization.id
|
|
|
|
role = "roles/orgpolicy.policyAdmin"
|
|
|
|
member = each.value
|
|
|
|
condition {
|
|
|
|
title = "org_policy_tag_${var.tenant_config.short_name}_${each.key}_scoped"
|
|
|
|
description = join("", [
|
|
|
|
"Org policy tag scoped grant for tenant ${var.tenant_config.short_name} ",
|
|
|
|
local.branch_sas[each.key].description
|
|
|
|
])
|
|
|
|
expression = join(" && ", [
|
|
|
|
local.iam_tenant_condition, local.branch_sas[each.key].condition
|
|
|
|
])
|
|
|
|
}
|
|
|
|
}
|
2023-02-08 00:59:43 -08:00
|
|
|
|
|
|
|
# assign custom tenant network admin role to networking SA
|
|
|
|
|
|
|
|
resource "google_organization_iam_member" "tenant_network_admin" {
|
|
|
|
org_id = var.organization.id
|
|
|
|
role = var.custom_roles.tenant_network_admin
|
|
|
|
member = module.automation-tf-resman-sa-stage2-3["networking"].iam_email
|
|
|
|
}
|