fix: bump the version of the cloudbuild in the bootstrap step (terraform-google-modules#642)

* update the version of the cloudbuild in the bootstrap step

* test the old version of the code

* bums the version again'

* bums the version again

* bums to another version

* bumps the version of the cloudbuild and bootstrap

* bumps cloudbuild to 4.0 and bootstrap to 5.0

* Adapt the usage of cloudbuild to bump to 5.0:

- Remove the usage of kms key
- Bump terraform_validator_release to 0.6

Author: LuizSDCit

0-bootstrap/README.md

@@ -183,8 +183,6 @@ the following steps:
 | csr\_repos | List of Cloud Source Repos created by the module, linked to Cloud Build triggers. |
 | gcs\_bucket\_cloudbuild\_artifacts | Bucket used to store Cloud/Build artifacts in CloudBuild project. |
 | gcs\_bucket\_tfstate | Bucket used for storing terraform state for foundations pipelines in seed project. |
-| kms\_crypto\_key | KMS key created by the module. |
-| kms\_keyring | KMS Keyring created by the module. |
 | seed\_project\_id | Project where service accounts and core APIs will be enabled. |
 | terraform\_sa\_name | Fully qualified name for privileged service account for Terraform. |
 | terraform\_service\_account | Email for privileged service account for Terraform. |

0-bootstrap/main.tf

@@ -31,7 +31,7 @@ resource "google_folder" "bootstrap" {
 
 module "seed_bootstrap" {
   source                         = "terraform-google-modules/bootstrap/google"
-  version                        = "~> 4.0"
+  version                        = "~> 5.0"
   org_id                         = var.org_id
   folder_id                      = google_folder.bootstrap.id
   project_id                     = "${var.project_prefix}-b-seed"
@@ -102,7 +102,7 @@ resource "google_billing_account_iam_member" "tf_billing_admin" {
 // Comment-out the cloudbuild_bootstrap module and its outputs if you want to use Jenkins instead of Cloud Build
 module "cloudbuild_bootstrap" {
   source                      = "terraform-google-modules/bootstrap/google//modules/cloudbuild"
-  version                     = "~> 3.0"
+  version                     = "~> 5.0"
   org_id                      = var.org_id
   folder_id                   = google_folder.bootstrap.id
   project_id                  = "${var.project_prefix}-b-cicd"
@@ -117,7 +117,7 @@ module "cloudbuild_bootstrap" {
   cloudbuild_apply_filename   = "cloudbuild-tf-apply.yaml"
   project_prefix              = var.project_prefix
   cloud_source_repos          = var.cloud_source_repos
-  terraform_validator_release = "v0.4.0"
+  terraform_validator_release = "v0.6.0"
   terraform_version           = "0.13.7"
   terraform_version_sha256sum = "4a52886e019b4fdad2439da5ff43388bbcc6cce9784fde32c53dcd0e28ca9957"
 

0-bootstrap/outputs.tf

@@ -58,16 +58,6 @@ output "terraform_validator_policies_repo" {
   value       = google_sourcerepo_repository.gcp_policies
 }
 
-output "kms_keyring" {
-  description = "KMS Keyring created by the module."
-  value       = module.cloudbuild_bootstrap.kms_keyring
-}
-
-output "kms_crypto_key" {
-  description = "KMS key created by the module."
-  value       = module.cloudbuild_bootstrap.kms_crypto_key
-}
-
 /* ----------------------------------------
     Specific to jenkins_bootstrap module
    ---------------------------------------- */