Skip to content

fix: fix propagation issues in bootstrap on retry #1437

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 3 commits into from
Oct 6, 2025
Merged

fix: fix propagation issues in bootstrap on retry #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c274c6
fix: add depends on the CI/CD module to prevent error granting roles
daniel-cit Oct 3, 2025
2b990a2
Merge remote-tracking branch 'origin/main' into fix-bootstrap-propaga…
daniel-cit Oct 3, 2025
d813ff8
fix error Service 'alpha-documentai.googleapis.com' is not supported …
daniel-cit Oct 6, 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
6 changes: 6 additions & 0 deletions 0-bootstrap/cb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ module "tf_private_pool" {
vpn_configuration = {
enable_vpn = false
}

depends_on = [module.tf_source]
}

module "tf_cloud_builder" {
Expand Down Expand Up @@ -264,6 +266,8 @@ resource "google_artifact_registry_repository_iam_member" "terraform_sa_artifact
repository = local.gar_repository
role = "roles/artifactregistry.reader"
member = "serviceAccount:${google_service_account.terraform-env-sa[each.key].email}"

depends_on = [module.tf_source]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For better dependency clarity and robustness, it's recommended to make this dependency more specific. This resource grants permissions on an Artifact Registry repository, which is created by module.tf_cloud_builder. While module.tf_cloud_builder depends on module.tf_source, explicitly depending on module.tf_cloud_builder ensures that the repository is fully created before attempting to modify its IAM policy. This makes the configuration more resilient to potential race conditions related to the repository's creation.

  depends_on = [module.tf_cloud_builder]

}

resource "google_sourcerepo_repository_iam_member" "member" {
Expand All @@ -273,4 +277,6 @@ resource "google_sourcerepo_repository_iam_member" "member" {
repository = module.tf_source.csr_repos["gcp-policies"].name
role = "roles/viewer"
member = "serviceAccount:${google_service_account.terraform-env-sa[each.key].email}"

depends_on = [module.tf_source]
}
1 change: 0 additions & 1 deletion 3-networks-hub-and-spoke/envs/shared/net-hubs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ locals {
"adsdatahub.googleapis.com",
"aiplatform.googleapis.com",
"alloydb.googleapis.com",
"alpha-documentai.googleapis.com",
"analyticshub.googleapis.com",
"apigee.googleapis.com",
"apigeeconnect.googleapis.com",
Expand Down
1 change: 0 additions & 1 deletion 3-networks-hub-and-spoke/modules/base_env/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ locals {
"adsdatahub.googleapis.com",
"aiplatform.googleapis.com",
"alloydb.googleapis.com",
"alpha-documentai.googleapis.com",
"analyticshub.googleapis.com",
"apigee.googleapis.com",
"apigeeconnect.googleapis.com",
Expand Down