Add deletion_policy to project module (#2502)

* Replace skip_delete with deletion_policy * Fix blueprints * Update apigee blueprint readme * Remove skip_delete from test inventories
GoogleCloudPlatform · Aug 16, 2024 · 0420dec · 0420dec
1 parent 3cf8889
commit 0420dec
Show file tree

Hide file tree

Showing 128 changed files with 283 additions and 264 deletions.
diff --git a/blueprints/apigee/apigee-x-foundations/README.md b/blueprints/apigee/apigee-x-foundations/README.md
diff --git a/blueprints/apigee/apigee-x-foundations/main.tf b/blueprints/apigee/apigee-x-foundations/main.tf
@@ -20,6 +20,7 @@ module "project" {
   compute_metadata        = var.project_config.compute_metadata
   custom_roles            = var.project_config.custom_roles
   default_service_account = var.project_config.default_service_account
+  deletion_policy         = var.project_config.deletion_policy
   iam                     = var.project_config.iam
   iam_bindings            = var.project_config.iam_bindings
   iam_bindings_additive   = var.project_config.iam_bindings_additive
@@ -51,7 +52,6 @@ module "project" {
   ] : []))
 
   shared_vpc_service_config = var.project_config.shared_vpc_service_config
-  skip_delete               = var.project_config.skip_delete
   tag_bindings              = var.project_config.tag_bindings
 }
 

diff --git a/blueprints/apigee/apigee-x-foundations/variables.tf b/blueprints/apigee/apigee-x-foundations/variables.tf
@@ -305,6 +305,7 @@ variable "project_config" {
     contacts                = optional(map(list(string)), {})
     custom_roles            = optional(map(list(string)), {})
     default_service_account = optional(string, "keep")
+    deletion_policy         = optional(string)
     descriptive_name        = optional(string)
     iam                     = optional(map(list(string)), {})
     group_iam               = optional(map(list(string)), {})
@@ -382,7 +383,6 @@ variable "project_config" {
       service_agent_iam  = optional(map(list(string)), {})
       service_iam_grants = optional(list(string), [])
     }))
-    skip_delete  = optional(bool, false)
     tag_bindings = optional(map(string))
   })
 }

diff --git a/blueprints/gke/patterns/autopilot-cluster/versions.tf b/blueprints/gke/patterns/autopilot-cluster/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/batch/versions.tf b/blueprints/gke/patterns/batch/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/kafka/versions.tf b/blueprints/gke/patterns/kafka/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/kong-cloudrun/main.tf b/blueprints/gke/patterns/kong-cloudrun/main.tf
@@ -28,5 +28,4 @@ module "service-project" {
   shared_vpc_service_config = {
     host_project = var.project_id
   }
-  skip_delete = true
-}
+}
diff --git a/blueprints/gke/patterns/kong-cloudrun/versions.tf b/blueprints/gke/patterns/kong-cloudrun/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/mysql/versions.tf b/blueprints/gke/patterns/mysql/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/redis-cluster/versions.tf b/blueprints/gke/patterns/redis-cluster/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/serverless/cloud-run-corporate/main.tf b/blueprints/serverless/cloud-run-corporate/main.tf
@@ -60,7 +60,6 @@ module "project_main" {
     "cloudresourcemanager.googleapis.com",
     "accesscontextmanager.googleapis.com"
   ]
-  skip_delete = true
 }
 
 # Simulated onprem environment
@@ -75,7 +74,6 @@ module "project_onprem" {
     "compute.googleapis.com",
     "dns.googleapis.com"
   ]
-  skip_delete = true
 }
 
 # Project 1
@@ -90,7 +88,6 @@ module "project_prj1" {
     "compute.googleapis.com",
     "dns.googleapis.com"
   ]
-  skip_delete = true
 }
 
 # Service Project 1
@@ -118,7 +115,6 @@ module "project_svc1" {
     "run.googleapis.com",
     "vpcaccess.googleapis.com"
   ]
-  skip_delete = true
 }
 
 ###############################################################################

diff --git a/blueprints/serverless/cloud-run-microservices/main.tf b/blueprints/serverless/cloud-run-microservices/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,6 @@ module "main-project" {
     "dns.googleapis.com",
     "vpcaccess.googleapis.com"
   ]
-  skip_delete = true
 }
 
 module "service-project" {
@@ -60,5 +59,4 @@ module "service-project" {
     "compute.googleapis.com",
     "run.googleapis.com",
   ]
-  skip_delete = true
 }
diff --git a/default-versions.tf b/default-versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }
diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.40.0, < 6.0.0" # tftest
+      version = ">= 5.41.0, < 6.0.0" # tftest
     }
   }
 }