feat(deps)!: Update Terraform Google Provider to v6 (#320)

Author: daniel-cit

README.md

@@ -63,6 +63,7 @@ For the cloudbuild submodule, see the README [cloudbuild](./modules/cloudbuild).
 | org\_id | GCP Organization ID | `string` | n/a | yes |
 | org\_project\_creators | Additional list of members to have project creator role accross the organization. Prefix of group: user: or serviceAccount: is required. | `list(string)` | `[]` | no |
 | parent\_folder | GCP parent folder ID in the form folders/{id} | `string` | `""` | no |
+| project\_deletion\_policy | The deletion policy for the project created. | `string` | `"PREVENT"` | no |
 | project\_id | Custom project ID to use for project created. If not supplied, the default id is {project\_prefix}-seed-{random suffix}. | `string` | `""` | no |
 | project\_labels | Labels to apply to the project. | `map(string)` | `{}` | no |
 | project\_prefix | Name prefix to use for projects created. | `string` | `"cft"` | no |

build/int.cloudbuild.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-timeout: 4200s
+timeout: 5400s
 steps:
 - id: swap-module-refs
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'

docs/upgrading_to_v9.0.md

@@ -40,3 +40,43 @@ The endpoint that is used to trigger a build was replaced with a new one that al
 ```
  # module.cloudbuilder.google_workflows_workflow.builder will be updated in-place
 ```
+
+## Google Cloud Provider Project deletion_policy
+
+The `deletion_policy` for [project-factory](https://github.com/terraform-google-modules/terraform-google-project-factory) module now defaults to `"PREVENT"` rather than `"DELETE"`.
+This aligns with the behavior in Google Cloud Platform Provider v6+.
+To maintain the old behavior in the projects created within the modules you can set the new variable `project_deletion_policy = "DELETE"`.
+
+### Bootstrap main module
+
+```diff
+module "bootstrap" {
+  source  = "terraform-google-modules/bootstrap/google"
+- version = "~> 8.0"
++ version = "~> 9.0"
+
++ project_deletion_policy = "DELETE"
+```
+
+### Cloud Build sub module
+
+```diff
+module "cloudbuild" {
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild"
+- version = "~> 8.0"
++ version = "~> 9.0"
+
++ project_deletion_policy = "DELETE"
+```
+
+
+### Cloud Build Source sub module
+
+```diff
+module "tf_cloudbuild_source" {
+  source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_source"
+- version = "~> 8.0"
++ version = "~> 9.0"
+
++ project_deletion_policy = "DELETE"
+```

examples/cloudbuild_enabled/README.md

@@ -14,6 +14,7 @@ This example combines the Organization bootstrap module with the Cloud Build sub
 | group\_org\_admins | Google Group for GCP Organization Administrators | `string` | n/a | yes |
 | org\_id | GCP Organization ID | `string` | n/a | yes |
 | org\_project\_creators | Additional list of members to have project creator role accross the organization. Prefix of group: user: or serviceAccount: is required. | `list(string)` | `[]` | no |
+| project\_deletion\_policy | The deletion policy for the project created. | `string` | `"PREVENT"` | no |
 | project\_prefix | Name prefix to use for projects created. | `string` | `"cft"` | no |
 
 ## Outputs

examples/cloudbuild_enabled/main.tf

@@ -31,6 +31,7 @@ module "seed_bootstrap" {
   sa_enable_impersonation = true
   project_prefix          = var.project_prefix
   force_destroy           = var.force_destroy
+  project_deletion_policy = var.project_deletion_policy
 }
 
 module "cloudbuild_bootstrap" {
@@ -47,4 +48,5 @@ module "cloudbuild_bootstrap" {
   terraform_state_bucket  = module.seed_bootstrap.gcs_bucket_tfstate
   project_prefix          = var.project_prefix
   force_destroy           = var.force_destroy
+  project_deletion_policy = var.project_deletion_policy
 }

examples/cloudbuild_enabled/variables.tf

@@ -57,3 +57,9 @@ variable "force_destroy" {
   type        = bool
   default     = false
 }
+
+variable "project_deletion_policy" {
+  description = "The deletion policy for the project created."
+  type        = string
+  default     = "PREVENT"
+}

examples/cloudbuild_repo_connection_github/main.tf

@@ -15,7 +15,7 @@
  */
 
 module "github_connection" {
-  source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
   version = "~> 9.0"
 
   project_id = var.project_id

examples/im_cloudbuild_workspace_github/apis.tf

@@ -16,7 +16,7 @@
 
 module "enabled_google_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 15.0"
+  version = "~> 17.0"
 
   project_id                  = var.project_id
   disable_services_on_destroy = false

examples/im_cloudbuild_workspace_gitlab/apis.tf

@@ -16,7 +16,7 @@
 
 module "enabled_google_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 15.0"
+  version = "~> 17.0"
 
   project_id                  = var.project_id
   disable_services_on_destroy = false

examples/simple-folder/README.md

@@ -14,6 +14,7 @@ This example demonstrates the simplest usage of the GCP organization bootstrap m
 | org\_id | GCP Organization ID | `string` | n/a | yes |
 | org\_project\_creators | Additional list of members to have project creator role accross the organization. Prefix of group: user: or serviceAccount: is required. | `list(string)` | `[]` | no |
 | parent | GCP parent folder id of form folders/{id} | `string` | n/a | yes |
+| project\_deletion\_policy | The deletion policy for the project created. | `string` | `"PREVENT"` | no |
 | project\_prefix | Name prefix to use for projects created. | `string` | `"cft"` | no |
 
 ## Outputs