fixes for PR review

Author: renato-rudnicki

0-bootstrap/cb.tf

@@ -84,7 +84,7 @@ module "gcp_projects_state_bucket" {
 
 module "tf_source" {
   source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_source"
-  version = "~> 11.0.1"
+  version = "~> 11.0"
 
   org_id                = var.org_id
   folder_id             = google_folder.bootstrap.id
@@ -164,7 +164,7 @@ module "tf_private_pool" {
 
 module "tf_cloud_builder" {
   source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
-  version = "~> 11.0.1"
+  version = "~> 11.0"
 
   project_id                   = module.tf_source.cloudbuild_project_id
   dockerfile_repo_uri          = module.tf_source.csr_repos[local.cloudbuilder_repo].url
@@ -218,7 +218,7 @@ module "build_terraform_image" {
 
 module "tf_workspace" {
   source   = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
-  version  = "~> 11.0.1"
+  version  = "~> 11.0"
   for_each = local.granular_sa
 
   project_id                = module.tf_source.cloudbuild_project_id

4-projects/business_unit_1/development/outputs.tf

@@ -99,7 +99,6 @@ output "confidential_space_project" {
   value       = module.env.confidential_space_project
 }
 
-
 output "confidential_space_project_number" {
   description = "Confidential Space project number."
   value       = module.env.confidential_space_project_number
@@ -109,4 +108,3 @@ output "confidential_space_workload_sa" {
   description = "Workload Service Account for confidential space from base_env"
   value       = module.env.confidential_space_workload_sa
 }
-

4-projects/business_unit_1/nonproduction/outputs.tf

@@ -99,7 +99,6 @@ output "confidential_space_project" {
   value       = module.env.confidential_space_project
 }
 
-
 output "confidential_space_project_number" {
   description = "Confidential Space project number."
   value       = module.env.confidential_space_project_number

4-projects/business_unit_1/production/outputs.tf

@@ -99,7 +99,6 @@ output "confidential_space_project" {
   value       = module.env.confidential_space_project
 }
 
-
 output "confidential_space_project_number" {
   description = "Confidential Space project number."
   value       = module.env.confidential_space_project_number

4-projects/business_unit_1/shared/example_infra_pipeline.tf

@@ -71,12 +71,6 @@ resource "google_storage_bucket_iam_member" "cloudbuild_sa_storage_admin" {
   member = "serviceAccount:tf-cb-builder-sa@${local.cloudbuild_project_id}.iam.gserviceaccount.com"
 }
 
-#resource "google_storage_bucket_iam_member" "cloudbuild_bucket_admin" {
-#  bucket = "${local.cloudbuild_project_id}_cloudbuild"
-#  role   = "roles/storage.admin"
-#  member = "serviceAccount:${module.app_infra_cloudbuild_project[0].sa}"
-#}
-
 module "app_infra_cloudbuild_project" {
   source = "../../modules/single_project"
   count  = local.enable_cloudbuild_deploy ? 1 : 0
@@ -133,13 +127,12 @@ resource "time_sleep" "wait_iam_propagation" {
     google_artifact_registry_repository_iam_member.builder_on_artifact_registry,
     google_project_iam_member.cloudbuild_logging,
     google_storage_bucket_iam_member.cloudbuild_sa_storage_admin,
-    #google_storage_bucket_iam_member.cloudbuild_bucket_admin,
   ]
 }
 
 module "build_confidential_space_image" {
   source            = "terraform-google-modules/gcloud/google"
-  version           = "~> 3.5"
+  version           = "~> 4.0"
   upgrade           = false
   module_depends_on = [time_sleep.wait_iam_propagation]
 

4-projects/modules/infra_pipelines/main.tf

@@ -55,7 +55,7 @@ resource "google_storage_bucket" "cloudbuild_bucket" {
 
 module "tf_workspace" {
   source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
-  version = "~> 11.0.1"
+  version = "~> 11.0"
 
   for_each = toset(var.app_infra_repos)