add example to test

terraform-google-modules · Jun 6, 2024 · 06c45ea · 06c45ea
1 parent 8c67e92
commit 06c45ea
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -186,6 +186,29 @@ module "service-project-c" {
   grant_network_role          = false
 }
 
+/******************************************
+  Fourth Service Project Creation
+  To test shared_vpc_deletion_policy
+ *****************************************/
+module "service-project-d" {
+  source  = "terraform-google-modules/project-factory/google//modules/svpc_service_project"
+  version = "~> 15.0"
+
+  name              = "d-${var.service_project_name}"
+  random_project_id = false
+
+  org_id          = var.organization_id
+  folder_id       = var.folder_id
+  billing_account = var.billing_account
+
+  shared_vpc         = module.host-project.project_id
+  shared_vpc_subnets = module.vpc.subnets_self_links
+
+  svpc_deletion_policy = "ABANDON"
+
+  disable_services_on_destroy = false
+}
+
 /******************************************
   Example dependency on service-project
  *****************************************/

diff --git a/modules/svpc_service_project/README.md b/modules/svpc_service_project/README.md
@@ -64,6 +64,7 @@ module "service-project" {
 | sa\_role | A role to give the default Service Account for the project (defaults to none) | `string` | `""` | no |
 | shared\_vpc | The ID of the host project which hosts the shared VPC | `string` | `""` | no |
 | shared\_vpc\_subnets | List of subnets fully qualified subnet IDs (ie. projects/$project\_id/regions/$region/subnetworks/$subnet\_id) | `list(string)` | `[]` | no |
+| svpc\_deletion\_policy | The deletion policy for the service project shared VPC. Setting ABANDON allows the resource to be abandoned rather than deleted. Possible values are: null, "ABANDON". | `string` | `null` | no |
 | usage\_bucket\_name | Name of a GCS bucket to store GCE usage reports in (optional) | `string` | `""` | no |
 | usage\_bucket\_prefix | Prefix in the GCS bucket to store GCE usage reports in (optional) | `string` | `""` | no |
 

diff --git a/modules/svpc_service_project/main.tf b/modules/svpc_service_project/main.tf
@@ -38,6 +38,7 @@ module "project-factory" {
   project_id                        = var.project_id
   shared_vpc                        = var.shared_vpc
   enable_shared_vpc_service_project = true
+  shared_vpc_deletion_policy        = var.svpc_deletion_policy
   grant_network_role                = var.grant_network_role
   billing_account                   = var.billing_account
   folder_id                         = var.folder_id

diff --git a/modules/svpc_service_project/variables.tf b/modules/svpc_service_project/variables.tf
@@ -228,3 +228,9 @@ variable "default_network_tier" {
   type        = string
   default     = ""
 }
+
+variable "svpc_deletion_policy" {
+  description = "The deletion policy for the service project shared VPC. Setting ABANDON allows the resource to be abandoned rather than deleted. Possible values are: null, \"ABANDON\"."
+  type        = string
+  default     = null
+}