Repository navigation
fix(stages): configure Stage 0 and Stage 1 state bucket CMEK, tenant IAM, and CI templates - #349
aghassemlouei wants to merge 1 commit into
Conversation
1acf4ce to
816160f
Compare
|
This PR deletes That's the Private Services Access producer folder. Your review on #352 (#352 (review)) lists it for Cloud SQL, AlloyDB, Memorystore, Filestore, Vertex AI and Cloud Build private pools, so deleting it blocks PSA peering in every deployment. #351 and #352 started with the same deletion, and digitalresistor showed why it breaks PSA. #352 keeps the folder as the default of |
816160f to
65a819e
Compare
|
Thank you @WandLZhang for the catch on This branch has been updated to restore |
…IAM, and CI templates
- Configure `encryption_key` and `force_destroy` on `module.automation-tf-checklist-gcs` in `0-bootstrap/checklist.tf` and across the 11 optional Stage 1 branch state buckets in `1-resman/branch-*.tf` so all state and checklist buckets satisfy `constraints/gcp.restrictNonCmekServices` under `IL5` and `FEDRAMP_HIGH`.
- Use `.exists(range, range == '0.0.0.0/0' || range == '::/0')` on `custom.restrictFirewallRanges` in `0-bootstrap/data/custom-constraint-policies/networking.yaml` so multi-CIDR ingress rules containing `0.0.0.0/0` or `::/0` cannot bypass the check.
- Remove `storage.objects.create` from `0-bootstrap/data/custom-roles/storage_viewer.yaml`.
- Use `${tf_providers_files.apply}` and `${tf_providers_files.plan}` in `0-bootstrap/templates/workflow-gitlab.yaml` and `1-resman/templates/workflow-gitlab.yaml`.
- Fix `local.tenant_iam[each.key]` lookup and consolidate overlapping authoritative `google_folder_iam_binding` resources on `module.tenant-top-folders[each.key].id` in `1-resman/branch-tenants.tf`.
- Populate `service_accounts`, `tf_providers_files`, and `audiences` in `local.team_cicd_workflow_attrs` and `local.team_cicd_workflows` in `1-resman/outputs.tf` and sync `1-resman/README.md`.
65a819e to
35373ac
Compare
|
Rebased onto |
Description
Configures CMEK encryption and
force_destroyon the Stage 0 checklist bucket and optional Stage 1 branch state buckets, fixes Stage 0 custom constraint and custom role definitions, and resolves Stage 1 tenant IAM and CI/CD workflow template bugs:encryption_key = module.gcs-kms.keys.gcs.id,force_destroy = var.force_destroy, anddepends_on = [module.organization, module.gcs-kms]onmodule.automation-tf-checklist-gcsinfast/stages-aw/0-bootstrap/checklist.tf, and configureencryption_keyandforce_destroyacross the 11 optional Stage 1 branch state buckets infast/stages-aw/1-resman/branch-{data-platform,gcve,gke,project-factory,sandbox,teams}.tfso every state and checklist bucket complies withconstraints/gcp.restrictNonCmekServicesunderIL5andFEDRAMP_HIGH.resource.sourceRanges.exists(range, range == '0.0.0.0/0' || range == '::/0')oncustom.restrictFirewallRangesinfast/stages-aw/0-bootstrap/data/custom-constraint-policies/networking.yamlso multi-CIDR ingress rules containing0.0.0.0/0or::/0cannot bypass the.all(...)check.storage.objects.createfrom the read-only custom role infast/stages-aw/0-bootstrap/data/custom-roles/storage_viewer.yaml.0-bootstrap-providers.tfand0-bootstrap-r-providers.tffilenames with${tf_providers_files.apply}and${tf_providers_files.plan}infast/stages-aw/0-bootstrap/templates/workflow-gitlab.yamlandfast/stages-aw/1-resman/templates/workflow-gitlab.yaml.local.tenant_iam[each.key]lookup and merge overlapping authoritativegoogle_folder_iam_bindingmaps onmodule.tenant-top-folders[each.key].idinfast/stages-aw/1-resman/branch-tenants.tf.service_accounts,tf_providers_files, andaudiencesinlocal.team_cicd_workflow_attrsandlocal.team_cicd_workflowsinfast/stages-aw/1-resman/outputs.tfand syncfast/stages-aw/1-resman/README.md.Type of Change
Deployment & Compliance Impact
Checklist
terraform fmt,tflint,ruff).README.mdviatfdoc) where applicable.Testing Performed
bash tools/lint.shacross boilerplate,terraform fmt,tflint(137 directories),tfdocREADME checks, andruff.tests/test_bootstrap_logging_order.pyand verified all tests pass viapytest.