feat!: adds settings.deletion_protection_enabled to modules (#404)

KelvinVenancio · apeabody · web-flow · commit af48cd39b510 · 2023-01-13T19:26:34.000-06:00
Co-authored-by: Andrew Peabody &lt;andrewpeabody@google.com&gt;
diff --git a/modules/mssql/README.md b/modules/mssql/README.md
@@ -23,6 +23,7 @@ The following dependency must be available for SQL Server module:
 | db\_name | The name of the default database to create | `string` | `"default"` | no |
 | delete\_timeout | The optional timeout that is applied to limit long database deletes. | `string` | `"30m"` | no |
 | deletion\_protection | Used to block Terraform from deleting a SQL Instance. | `bool` | `true` | no |
+| deletion\_protection\_enabled | Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform). | `bool` | `false` | no |
 | deny\_maintenance\_period | The Deny Maintenance Period fields to prevent automatic maintenance from occurring during a 90-day time period. See [more details](https://cloud.google.com/sql/docs/sqlserver/maintenance) | <pre>list(object({<br>    end_date   = string<br>    start_date = string<br>    time       = string<br>  }))</pre> | `[]` | no |
 | disk\_autoresize | Configuration to increase storage size. | `bool` | `true` | no |
 | disk\_autoresize\_limit | The maximum size to which storage can be auto increased. | `number` | `0` | no |
diff --git a/modules/mssql/main.tf b/modules/mssql/main.tf
@@ -51,9 +51,10 @@ resource "google_sql_database_instance" "default" {
   deletion_protection = var.deletion_protection
 
   settings {
-    tier              = var.tier
-    activation_policy = var.activation_policy
-    availability_type = var.availability_type
+    tier                        = var.tier
+    activation_policy           = var.activation_policy
+    availability_type           = var.availability_type
+    deletion_protection_enabled = var.deletion_protection_enabled
     dynamic "backup_configuration" {
       for_each = var.backup_configuration.enabled ? [var.backup_configuration] : []
       content {
diff --git a/modules/mssql/variables.tf b/modules/mssql/variables.tf
@@ -80,6 +80,12 @@ variable "availability_type" {
   default     = "ZONAL"
 }
 
+variable "deletion_protection_enabled" {
+  description = "Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform)."
+  type        = bool
+  default     = false
+}
+
 variable "disk_autoresize" {
   description = "Configuration to increase storage size."
   type        = bool
diff --git a/modules/mssql/versions.tf b/modules/mssql/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.45.0, < 5.0"
+      version = ">= 4.48.0, < 5.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.45.0, < 5.0"
+      version = ">= 4.48.0, < 5.0"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/modules/mysql/README.md b/modules/mysql/README.md
@@ -20,6 +20,7 @@ Note: CloudSQL provides [disk autoresize](https://cloud.google.com/sql/docs/mysq
 | db\_name | The name of the default database to create | `string` | `"default"` | no |
 | delete\_timeout | The optional timout that is applied to limit long database deletes. | `string` | `"10m"` | no |
 | deletion\_protection | Used to block Terraform from deleting a SQL Instance. | `bool` | `true` | no |
+| deletion\_protection\_enabled | Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform). | `bool` | `false` | no |
 | deny\_maintenance\_period | The Deny Maintenance Period fields to prevent automatic maintenance from occurring during a 90-day time period. See [more details](https://cloud.google.com/sql/docs/mysql/maintenance) | <pre>list(object({<br>    end_date   = string<br>    start_date = string<br>    time       = string<br>  }))</pre> | `[]` | no |
 | disk\_autoresize | Configuration to increase storage size | `bool` | `true` | no |
 | disk\_autoresize\_limit | The maximum size to which storage can be auto increased. | `number` | `0` | no |
diff --git a/modules/mysql/main.tf b/modules/mysql/main.tf
@@ -50,9 +50,10 @@ resource "google_sql_database_instance" "default" {
   deletion_protection = var.deletion_protection
 
   settings {
-    tier              = var.tier
-    activation_policy = var.activation_policy
-    availability_type = var.availability_type
+    tier                        = var.tier
+    activation_policy           = var.activation_policy
+    availability_type           = var.availability_type
+    deletion_protection_enabled = var.deletion_protection_enabled
     dynamic "backup_configuration" {
       for_each = [var.backup_configuration]
       content {
diff --git a/modules/mysql/variables.tf b/modules/mysql/variables.tf
@@ -85,6 +85,12 @@ variable "availability_type" {
   default     = "REGIONAL"
 }
 
+variable "deletion_protection_enabled" {
+  description = "Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform)."
+  type        = bool
+  default     = false
+}
+
 variable "disk_autoresize" {
   description = "Configuration to increase storage size"
   type        = bool
diff --git a/modules/mysql/versions.tf b/modules/mysql/versions.tf
@@ -27,11 +27,11 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.45.0, < 5.0"
+      version = ">= 4.48.0, < 5.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.45.0, < 5.0"
+      version = ">= 4.48.0, < 5.0"
     }
   }
 
diff --git a/modules/postgresql/README.md b/modules/postgresql/README.md
@@ -21,6 +21,7 @@ Note: CloudSQL provides [disk autoresize](https://cloud.google.com/sql/docs/mysq
 | db\_name | The name of the default database to create | `string` | `"default"` | no |
 | delete\_timeout | The optional timout that is applied to limit long database deletes. | `string` | `"15m"` | no |
 | deletion\_protection | Used to block Terraform from deleting a SQL Instance. | `bool` | `true` | no |
+| deletion\_protection\_enabled | Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform). | `bool` | `false` | no |
 | deny\_maintenance\_period | The Deny Maintenance Period fields to prevent automatic maintenance from occurring during a 90-day time period. See [more details](https://cloud.google.com/sql/docs/postgres/maintenance) | <pre>list(object({<br>    end_date   = string<br>    start_date = string<br>    time       = string<br>  }))</pre> | `[]` | no |
 | disk\_autoresize | Configuration to increase storage size. | `bool` | `true` | no |
 | disk\_autoresize\_limit | The maximum size to which storage can be auto increased. | `number` | `0` | no |
diff --git a/modules/postgresql/main.tf b/modules/postgresql/main.tf
@@ -55,9 +55,10 @@ resource "google_sql_database_instance" "default" {
   deletion_protection = var.deletion_protection
 
   settings {
-    tier              = var.tier
-    activation_policy = var.activation_policy
-    availability_type = var.availability_type
+    tier                        = var.tier
+    activation_policy           = var.activation_policy
+    availability_type           = var.availability_type
+    deletion_protection_enabled = var.deletion_protection_enabled
 
     dynamic "backup_configuration" {
       for_each = [var.backup_configuration]
diff --git a/modules/postgresql/variables.tf b/modules/postgresql/variables.tf
@@ -83,6 +83,12 @@ variable "availability_type" {
   default     = "ZONAL"
 }
 
+variable "deletion_protection_enabled" {
+  description = "Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform)."
+  type        = bool
+  default     = false
+}
+
 variable "disk_autoresize" {
   description = "Configuration to increase storage size."
   type        = bool
diff --git a/modules/postgresql/versions.tf b/modules/postgresql/versions.tf
@@ -27,11 +27,11 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.45.0, < 5.0"
+      version = ">= 4.48.0, < 5.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.45.0, < 5.0"
+      version = ">= 4.48.0, < 5.0"
     }
   }
 
diff --git a/modules/safer_mysql/README.md b/modules/safer_mysql/README.md
@@ -179,6 +179,7 @@ mysql -S $HOME/mysql_sockets/myproject:region:instance -u user -p
 | db\_name | The name of the default database to create | `string` | `"default"` | no |
 | delete\_timeout | The optional timout that is applied to limit long database deletes. | `string` | `"15m"` | no |
 | deletion\_protection | Used to block Terraform from deleting a SQL Instance. | `bool` | `true` | no |
+| deletion\_protection\_enabled | Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform). | `bool` | `false` | no |
 | deny\_maintenance\_period | The Deny Maintenance Period fields to prevent automatic maintenance from occurring during a 90-day time period. See [more details](https://cloud.google.com/sql/docs/mysql/maintenance) | <pre>list(object({<br>    end_date   = string<br>    start_date = string<br>    time       = string<br>  }))</pre> | `[]` | no |
 | disk\_autoresize | Configuration to increase storage size | `bool` | `true` | no |
 | disk\_autoresize\_limit | The maximum size to which storage can be auto increased. | `number` | `0` | no |
diff --git a/modules/safer_mysql/main.tf b/modules/safer_mysql/main.tf
@@ -27,6 +27,7 @@ module "safer_mysql" {
   tier                            = var.tier
   activation_policy               = var.activation_policy
   availability_type               = var.availability_type
+  deletion_protection_enabled     = var.deletion_protection_enabled
   disk_autoresize                 = var.disk_autoresize
   disk_autoresize_limit           = var.disk_autoresize_limit
   disk_size                       = var.disk_size
diff --git a/modules/safer_mysql/variables.tf b/modules/safer_mysql/variables.tf
@@ -90,6 +90,12 @@ variable "availability_type" {
   default     = "REGIONAL"
 }
 
+variable "deletion_protection_enabled" {
+  description = "Enables protection of an instance from accidental deletion protection across all surfaces (API, gcloud, Cloud Console and Terraform)."
+  type        = bool
+  default     = false
+}
+
 variable "disk_autoresize" {
   description = "Configuration to increase storage size"
   type        = bool
diff --git a/modules/safer_mysql/versions.tf b/modules/safer_mysql/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.45.0, < 5.0"
+      version = ">= 4.48.0, < 5.0"
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ terraform {`
`20`	`20`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = ">= 4.45.0, < 5.0"`
	`23`	`+ version = ">= 4.48.0, < 5.0"`
`24`	`24`	`}`
`25`	`25`	`google-beta = {`
`26`	`26`	`source = "hashicorp/google-beta"`
`27`		`- version = ">= 4.45.0, < 5.0"`
	`27`	`+ version = ">= 4.48.0, < 5.0"`
`28`	`28`	`}`
`29`	`29`	`random = {`
`30`	`30`	`source = "hashicorp/random"`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ terraform {`
`27`	`27`	`}`
`28`	`28`	`google = {`
`29`	`29`	`source = "hashicorp/google"`
`30`		`- version = ">= 4.45.0, < 5.0"`
	`30`	`+ version = ">= 4.48.0, < 5.0"`
`31`	`31`	`}`
`32`	`32`	`google-beta = {`
`33`	`33`	`source = "hashicorp/google-beta"`
`34`		`- version = ">= 4.45.0, < 5.0"`
	`34`	`+ version = ">= 4.48.0, < 5.0"`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`