Skip to content

Commit a86d2b8

Browse files
authored
fix: remove point_in_time_recorvery_enabled from MySQL instance as it… (#689)
1 parent ac6aae2 commit a86d2b8

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

modules/mysql/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module "mysql-db" {
4949
| additional\_databases | A list of databases to be created in your cluster | <pre>list(object({<br> name = string<br> charset = string<br> collation = string<br> }))</pre> | `[]` | no |
5050
| additional\_users | A list of users to be created in your cluster. A random password would be set for the user if the `random_password` variable is set. | <pre>list(object({<br> name = string<br> password = string<br> random_password = bool<br> type = string<br> host = string<br> }))</pre> | `[]` | no |
5151
| availability\_type | The availability type for the master instance. Can be either `REGIONAL` or `null`. | `string` | `"REGIONAL"` | no |
52-
| backup\_configuration | The backup\_configuration settings subblock for the database setings | <pre>object({<br> binary_log_enabled = optional(bool, false)<br> enabled = optional(bool, false)<br> start_time = optional(string)<br> location = optional(string)<br> point_in_time_recovery_enabled = optional(bool, false)<br> transaction_log_retention_days = optional(string)<br> retained_backups = optional(number)<br> retention_unit = optional(string)<br> })</pre> | `{}` | no |
52+
| backup\_configuration | The backup\_configuration settings subblock for the database setings | <pre>object({<br> binary_log_enabled = optional(bool, false)<br> enabled = optional(bool, false)<br> start_time = optional(string)<br> location = optional(string)<br> transaction_log_retention_days = optional(string)<br> retained_backups = optional(number)<br> retention_unit = optional(string)<br> })</pre> | `{}` | no |
5353
| connector\_enforcement | Enforce that clients use the connector library | `bool` | `false` | no |
5454
| create\_timeout | The optional timout that is applied to limit long database creates. | `string` | `"30m"` | no |
5555
| data\_cache\_enabled | Whether data cache is enabled for the instance. Defaults to false. Feature is only available for ENTERPRISE\_PLUS tier and supported database\_versions | `bool` | `false` | no |
@@ -58,7 +58,7 @@ module "mysql-db" {
5858
| database\_version | The database version to use | `string` | n/a | yes |
5959
| db\_charset | The charset for the default database | `string` | `""` | no |
6060
| db\_collation | The collation for the default database. Example: 'utf8\_general\_ci' | `string` | `""` | no |
61-
| db\_name | The name of the default database to create | `string` | `"default"` | no |
61+
| db\_name | The name of the default database to create. This should be unique per Cloud SQL instance. | `string` | `"default"` | no |
6262
| delete\_timeout | The optional timout that is applied to limit long database deletes. | `string` | `"30m"` | no |
6363
| deletion\_protection | Used to block Terraform from deleting a SQL Instance. | `bool` | `true` | no |
6464
| deletion\_protection\_enabled | Enables protection of an instance from accidental deletion across all surfaces (API, gcloud, Cloud Console and Terraform). | `bool` | `false` | no |

modules/mysql/metadata.display.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
- type: ALTERNATE_TYPE_DC
5858
value:
5959
enabled: true
60-
point_in_time_recovery_enabled: true
60+
binary_log_enabled: true
6161
connector_enforcement:
6262
name: connector_enforcement
6363
title: Connector Enforcement

modules/mysql/metadata.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spec:
9090
varType: bool
9191
defaultValue: true
9292
- name: db_name
93-
description: The name of the default database to create
93+
description: The name of the default database to create. This should be unique per Cloud SQL instance.
9494
varType: string
9595
defaultValue: default
9696
- name: enable_default_user
@@ -263,7 +263,6 @@ spec:
263263
enabled = optional(bool, false)
264264
start_time = optional(string)
265265
location = optional(string)
266-
point_in_time_recovery_enabled = optional(bool, false)
267266
transaction_log_retention_days = optional(string)
268267
retained_backups = optional(number)
269268
retention_unit = optional(string)

modules/mysql/variables.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ variable "enable_default_db" {
5656
}
5757

5858
variable "db_name" {
59-
description = "The name of the default database to create"
59+
description = "The name of the default database to create. This should be unique per Cloud SQL instance."
6060
type = string
6161
default = "default"
6262
}
@@ -295,7 +295,6 @@ variable "backup_configuration" {
295295
enabled = optional(bool, false)
296296
start_time = optional(string)
297297
location = optional(string)
298-
point_in_time_recovery_enabled = optional(bool, false)
299298
transaction_log_retention_days = optional(string)
300299
retained_backups = optional(number)
301300
retention_unit = optional(string)

modules/postgresql/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ module "pg" {
130130
| database\_version | The database version to use | `string` | n/a | yes |
131131
| db\_charset | The charset for the default database | `string` | `""` | no |
132132
| db\_collation | The collation for the default database. Example: 'en\_US.UTF8' | `string` | `""` | no |
133-
| db\_name | The name of the default database to create | `string` | `"default"` | no |
133+
| db\_name | The name of the default database to create. This should be unique per Cloud SQL instance. | `string` | `"default"` | no |
134134
| delete\_timeout | The optional timout that is applied to limit long database deletes. | `string` | `"30m"` | no |
135135
| deletion\_protection | Used to block Terraform from deleting a SQL Instance. | `bool` | `true` | no |
136136
| deletion\_protection\_enabled | Enables protection of an Cloud SQL instance from accidental deletion across all surfaces (API, gcloud, Cloud Console and Terraform). | `bool` | `false` | no |

modules/postgresql/metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spec:
9090
varType: bool
9191
defaultValue: true
9292
- name: db_name
93-
description: The name of the default database to create
93+
description: The name of the default database to create. This should be unique per Cloud SQL instance.
9494
varType: string
9595
defaultValue: default
9696
- name: enable_default_user

modules/postgresql/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ variable "enable_default_db" {
6060
}
6161

6262
variable "db_name" {
63-
description = "The name of the default database to create"
63+
description = "The name of the default database to create. This should be unique per Cloud SQL instance."
6464
type = string
6565
default = "default"
6666
}

0 commit comments

Comments
 (0)