Add deletion_protection_enabled attribute to cloudsql-instance to enable the GCP native deletion protection flag (#1696)
This commit is contained in:
Jason Steenblik
@@ -187,11 +187,11 @@ module "db" {
|
||||
| name | description | type | required | default |
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [database_version](variables.tf#L71) | Database type and version to create. | <code>string</code> | ✓ | |
|
||||
| [name](variables.tf#L135) | Name of primary instance. | <code>string</code> | ✓ | |
|
||||
| [network](variables.tf#L140) | VPC self link where the instances will be deployed. Private Service Networking must be enabled and configured in this VPC. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L161) | The ID of the project where this instances will be created. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L166) | Region of the primary instance. | <code>string</code> | ✓ | |
|
||||
| [tier](variables.tf#L192) | The machine type to use for the instances. | <code>string</code> | ✓ | |
|
||||
| [name](variables.tf#L141) | Name of primary instance. | <code>string</code> | ✓ | |
|
||||
| [network](variables.tf#L146) | VPC self link where the instances will be deployed. Private Service Networking must be enabled and configured in this VPC. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L167) | The ID of the project where this instances will be created. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L172) | Region of the primary instance. | <code>string</code> | ✓ | |
|
||||
| [tier](variables.tf#L198) | The machine type to use for the instances. | <code>string</code> | ✓ | |
|
||||
| [activation_policy](variables.tf#L16) | This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS. | <code>string</code> | | <code>"ALWAYS"</code> |
|
||||
| [allocated_ip_ranges](variables.tf#L27) | (Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?. | <code title="object({ primary = optional(string) replica = optional(string) })">object({…})</code> | | <code>{}</code> |
|
||||
| [authorized_networks](variables.tf#L36) | Map of NAME=>CIDR_RANGE to allow to connect to the database(s). | <code>map(string)</code> | | <code>null</code> |
|
||||
@@ -199,19 +199,20 @@ module "db" {
|
||||
| [backup_configuration](variables.tf#L48) | Backup settings for primary instance. Will be automatically enabled if using MySQL with one or more replicas. | <code title="object({ enabled = optional(bool, false) binary_log_enabled = optional(bool, false) start_time = optional(string, "23:00") location = optional(string) log_retention_days = optional(number, 7) point_in_time_recovery_enabled = optional(bool) retention_count = optional(number, 7) })">object({…})</code> | | <code title="{ enabled = false binary_log_enabled = false start_time = "23:00" location = null log_retention_days = 7 point_in_time_recovery_enabled = null retention_count = 7 }">{…}</code> |
|
||||
| [databases](variables.tf#L76) | Databases to create once the primary instance is created. | <code>list(string)</code> | | <code>null</code> |
|
||||
| [deletion_protection](variables.tf#L82) | Allow terraform to delete instances. | <code>bool</code> | | <code>false</code> |
|
||||
| [disk_size](variables.tf#L88) | Disk size in GB. Set to null to enable autoresize. | <code>number</code> | | <code>null</code> |
|
||||
| [disk_type](variables.tf#L94) | The type of data disk: `PD_SSD` or `PD_HDD`. | <code>string</code> | | <code>"PD_SSD"</code> |
|
||||
| [encryption_key_name](variables.tf#L100) | The full path to the encryption key used for the CMEK disk encryption of the primary instance. | <code>string</code> | | <code>null</code> |
|
||||
| [flags](variables.tf#L106) | Map FLAG_NAME=>VALUE for database-specific tuning. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [insights_config](variables.tf#L112) | Query Insights configuration. Defaults to null which disables Query Insights. | <code title="object({ query_string_length = optional(number, 1024) record_application_tags = optional(bool, false) record_client_address = optional(bool, false) query_plans_per_minute = optional(number, 5) })">object({…})</code> | | <code>null</code> |
|
||||
| [ipv4_enabled](variables.tf#L123) | Add a public IP address to database instance. | <code>bool</code> | | <code>false</code> |
|
||||
| [labels](variables.tf#L129) | Labels to be attached to all instances. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [postgres_client_certificates](variables.tf#L145) | Map of cert keys connect to the application(s) using public IP. | <code>list(string)</code> | | <code>null</code> |
|
||||
| [prefix](variables.tf#L151) | Optional prefix used to generate instance names. | <code>string</code> | | <code>null</code> |
|
||||
| [replicas](variables.tf#L171) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | <code title="map(object({ region = string encryption_key_name = string }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [require_ssl](variables.tf#L180) | Enable SSL connections only. | <code>bool</code> | | <code>null</code> |
|
||||
| [root_password](variables.tf#L186) | Root password of the Cloud SQL instance. Required for MS SQL Server. | <code>string</code> | | <code>null</code> |
|
||||
| [users](variables.tf#L197) | Map of users to create in the primary instance (and replicated to other replicas) in the format USER=>PASSWORD. For MySQL, anything afterr the first `@` (if persent) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [deletion_protection_enabled](variables.tf#L88) | Set Google's deletion protection attribute which applies across all surfaces (UI, API, & Terraform). | <code>bool</code> | | <code>false</code> |
|
||||
| [disk_size](variables.tf#L94) | Disk size in GB. Set to null to enable autoresize. | <code>number</code> | | <code>null</code> |
|
||||
| [disk_type](variables.tf#L100) | The type of data disk: `PD_SSD` or `PD_HDD`. | <code>string</code> | | <code>"PD_SSD"</code> |
|
||||
| [encryption_key_name](variables.tf#L106) | The full path to the encryption key used for the CMEK disk encryption of the primary instance. | <code>string</code> | | <code>null</code> |
|
||||
| [flags](variables.tf#L112) | Map FLAG_NAME=>VALUE for database-specific tuning. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [insights_config](variables.tf#L118) | Query Insights configuration. Defaults to null which disables Query Insights. | <code title="object({ query_string_length = optional(number, 1024) record_application_tags = optional(bool, false) record_client_address = optional(bool, false) query_plans_per_minute = optional(number, 5) })">object({…})</code> | | <code>null</code> |
|
||||
| [ipv4_enabled](variables.tf#L129) | Add a public IP address to database instance. | <code>bool</code> | | <code>false</code> |
|
||||
| [labels](variables.tf#L135) | Labels to be attached to all instances. | <code>map(string)</code> | | <code>null</code> |
|
||||
| [postgres_client_certificates](variables.tf#L151) | Map of cert keys connect to the application(s) using public IP. | <code>list(string)</code> | | <code>null</code> |
|
||||
| [prefix](variables.tf#L157) | Optional prefix used to generate instance names. | <code>string</code> | | <code>null</code> |
|
||||
| [replicas](variables.tf#L177) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | <code title="map(object({ region = string encryption_key_name = string }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [require_ssl](variables.tf#L186) | Enable SSL connections only. | <code>bool</code> | | <code>null</code> |
|
||||
| [root_password](variables.tf#L192) | Root password of the Cloud SQL instance. Required for MS SQL Server. | <code>string</code> | | <code>null</code> |
|
||||
| [users](variables.tf#L203) | Map of users to create in the primary instance (and replicated to other replicas) in the format USER=>PASSWORD. For MySQL, anything afterr the first `@` (if persent) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. | <code>map(string)</code> | | <code>null</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
||||
@@ -53,13 +53,14 @@ resource "google_sql_database_instance" "primary" {
|
||||
root_password = var.root_password
|
||||
|
||||
settings {
|
||||
tier = var.tier
|
||||
disk_autoresize = var.disk_size == null
|
||||
disk_size = var.disk_size
|
||||
disk_type = var.disk_type
|
||||
availability_type = var.availability_type
|
||||
user_labels = var.labels
|
||||
activation_policy = var.activation_policy
|
||||
tier = var.tier
|
||||
deletion_protection_enabled = var.deletion_protection_enabled
|
||||
disk_autoresize = var.disk_size == null
|
||||
disk_size = var.disk_size
|
||||
disk_type = var.disk_type
|
||||
availability_type = var.availability_type
|
||||
user_labels = var.labels
|
||||
activation_policy = var.activation_policy
|
||||
|
||||
ip_configuration {
|
||||
ipv4_enabled = var.ipv4_enabled
|
||||
@@ -133,10 +134,11 @@ resource "google_sql_database_instance" "replicas" {
|
||||
master_instance_name = google_sql_database_instance.primary.name
|
||||
|
||||
settings {
|
||||
tier = var.tier
|
||||
disk_autoresize = var.disk_size == null
|
||||
disk_size = var.disk_size
|
||||
disk_type = var.disk_type
|
||||
tier = var.tier
|
||||
deletion_protection_enabled = var.deletion_protection_enabled
|
||||
disk_autoresize = var.disk_size == null
|
||||
disk_size = var.disk_size
|
||||
disk_type = var.disk_type
|
||||
# availability_type = var.availability_type
|
||||
user_labels = var.labels
|
||||
activation_policy = var.activation_policy
|
||||
|
||||
@@ -85,6 +85,12 @@ variable "deletion_protection" {
|
||||
default = false
|
||||
}
|
||||
|
||||
variable "deletion_protection_enabled" {
|
||||
description = "Set Google's deletion protection attribute which applies across all surfaces (UI, API, & Terraform)."
|
||||
type = bool
|
||||
default = false
|
||||
}
|
||||
|
||||
variable "disk_size" {
|
||||
description = "Disk size in GB. Set to null to enable autoresize."
|
||||
type = number
|
||||
|
||||
Reference in New Issue
Block a user