fix(deps): Update terraform-google-modules/project-factory v17 (#246)

GoogleCloudPlatform · Sep 26, 2024 · fe09967 · fe09967
1 parent 8131e86
commit fe09967
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/2-multitenant/modules/env_baseline/main.tf b/2-multitenant/modules/env_baseline/main.tf
@@ -29,7 +29,7 @@ locals {
 // Create cluster project
 module "eab_cluster_project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 16.0"
+  version = "~> 17.0"
 
   count = var.create_cluster_project ? 1 : 0
 
@@ -41,6 +41,7 @@ module "eab_cluster_project" {
   billing_account          = var.billing_account
   svpc_host_project_id     = var.network_project_id
   shared_vpc_subnets       = var.cluster_subnetworks
+  deletion_policy          = "DELETE"
 
   // Skip disabling APIs for gkehub.googleapis.com
   // https://cloud.google.com/anthos/fleet-management/docs/troubleshooting#error_when_disabling_the_fleet_api

diff --git a/4-appfactory/modules/app-group-baseline/main.tf b/4-appfactory/modules/app-group-baseline/main.tf
@@ -24,14 +24,15 @@ locals {
 // Create admin project
 module "app_admin_project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 16.0"
+  version = "~> 17.0"
 
   random_project_id        = true
   random_project_id_length = 4
   billing_account          = var.billing_account
   name                     = substr("${var.acronym}-${var.service_name}-admin", 0, 25) # max length 30 chars
   org_id                   = var.org_id
   folder_id                = var.folder_id
+  deletion_policy          = "DELETE"
   activate_apis = [
     "iam.googleapis.com",
     "cloudresourcemanager.googleapis.com",
@@ -74,7 +75,7 @@ module "tf_cloudbuild_workspace" {
 // Create env project
 module "app_env_project" {
   source   = "terraform-google-modules/project-factory/google"
-  version  = "~> 16.0"
+  version  = "~> 17.0"
   for_each = var.create_env_projects ? var.envs : {}
 
   random_project_id        = true
@@ -84,4 +85,5 @@ module "app_env_project" {
   org_id                   = each.value.org_id
   folder_id                = each.value.folder_id
   activate_apis            = var.env_project_apis
+  deletion_policy          = "DELETE"
 }
diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -54,14 +54,15 @@ resource "random_string" "prefix" {
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 16.0"
+  version = "~> 17.0"
 
   name                     = "ci-enterprise-application"
   random_project_id        = "true"
   random_project_id_length = 4
   org_id                   = var.org_id
   folder_id                = var.folder_id
   billing_account          = var.billing_account
+  deletion_policy          = "DELETE"
 
   activate_apis = [
     "cloudbuild.googleapis.com",
@@ -117,14 +118,15 @@ resource "google_folder_iam_member" "common_folder_iam" {
 module "vpc_project" {
   for_each = module.folders.ids
   source   = "terraform-google-modules/project-factory/google"
-  version  = "~> 16.0"
+  version  = "~> 17.0"
 
   name                     = "eab-vpc-${each.key}"
   random_project_id        = "true"
   random_project_id_length = 4
   org_id                   = var.org_id
   folder_id                = each.value
   billing_account          = var.billing_account
+  deletion_policy          = "DELETE"
 
   activate_apis = [
     "cloudresourcemanager.googleapis.com",