Skip to content

Commit d35b23c

Browse files
authored
fix!: delete deprecated attribute authorized_gae_applications (#240)
Signed-off-by: Oleksii Kravchenko <[email protected]>
1 parent 79909c3 commit d35b23c

File tree

9 files changed

+6
-30
lines changed

9 files changed

+6
-30
lines changed

modules/mssql/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ The following dependency must be available for SQL Server module:
1212
| activation\_policy | The activation policy for the master instance.Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | `string` | `"ALWAYS"` | no |
1313
| 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 |
1414
| additional\_users | A list of users to be created in your cluster | <pre>list(object({<br> name = string<br> password = string<br> }))</pre> | `[]` | no |
15-
| authorized\_gae\_applications | The authorized gae applications for the Cloud SQL instances | `list(string)` | `[]` | no |
1615
| availability\_type | The availability type for the master instance.This is only used to set up high availability for the MSSQL instance. Can be either `ZONAL` or `REGIONAL`. | `string` | `"ZONAL"` | no |
1716
| backup\_configuration | The database backup configuration. | <pre>object({<br> binary_log_enabled = bool<br> enabled = bool<br> point_in_time_recovery_enabled = bool<br> start_time = string<br> transaction_log_retention_days = string<br> retained_backups = number<br> retention_unit = string<br> })</pre> | <pre>{<br> "binary_log_enabled": null,<br> "enabled": false,<br> "point_in_time_recovery_enabled": null,<br> "retained_backups": null,<br> "retention_unit": null,<br> "start_time": null,<br> "transaction_log_retention_days": null<br>}</pre> | no |
1817
| create\_timeout | The optional timeout that is applied to limit long database creates. | `string` | `"15m"` | no |

modules/mssql/main.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,9 @@ resource "google_sql_database_instance" "default" {
5151
deletion_protection = var.deletion_protection
5252

5353
settings {
54-
tier = var.tier
55-
activation_policy = var.activation_policy
56-
availability_type = var.availability_type
57-
authorized_gae_applications = var.authorized_gae_applications
54+
tier = var.tier
55+
activation_policy = var.activation_policy
56+
availability_type = var.availability_type
5857
dynamic "backup_configuration" {
5958
for_each = var.backup_configuration.enabled ? [var.backup_configuration] : []
6059
content {

modules/mssql/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,6 @@ variable "user_labels" {
124124
default = {}
125125
}
126126

127-
variable "authorized_gae_applications" {
128-
description = "The authorized gae applications for the Cloud SQL instances"
129-
type = list(string)
130-
default = []
131-
}
132-
133127
variable "ip_configuration" {
134128
description = "The ip configuration for the master instances."
135129
type = object({

modules/mysql/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Note: CloudSQL provides [disk autoresize](https://cloud.google.com/sql/docs/mysq
1010
| activation\_policy | The activation policy for the master instance. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | `string` | `"ALWAYS"` | no |
1111
| 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 |
1212
| additional\_users | A list of users to be created in your cluster | <pre>list(object({<br> name = string<br> password = string<br> host = string<br> }))</pre> | `[]` | no |
13-
| authorized\_gae\_applications | The list of authorized App Engine project names | `list(string)` | `[]` | no |
1413
| availability\_type | The availability type for the master instance. Can be either `REGIONAL` or `null`. | `string` | `"REGIONAL"` | no |
1514
| backup\_configuration | The backup\_configuration settings subblock for the database setings | <pre>object({<br> binary_log_enabled = bool<br> enabled = bool<br> start_time = string<br> location = string<br> transaction_log_retention_days = string<br> retained_backups = number<br> retention_unit = string<br> })</pre> | <pre>{<br> "binary_log_enabled": false,<br> "enabled": false,<br> "location": null,<br> "retained_backups": null,<br> "retention_unit": null,<br> "start_time": null,<br> "transaction_log_retention_days": null<br>}</pre> | no |
1615
| create\_timeout | The optional timout that is applied to limit long database creates. | `string` | `"10m"` | no |

modules/mysql/main.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ resource "google_sql_database_instance" "default" {
5252
deletion_protection = var.deletion_protection
5353

5454
settings {
55-
tier = var.tier
56-
activation_policy = var.activation_policy
57-
availability_type = var.availability_type
58-
authorized_gae_applications = var.authorized_gae_applications
55+
tier = var.tier
56+
activation_policy = var.activation_policy
57+
availability_type = var.availability_type
5958
dynamic "backup_configuration" {
6059
for_each = [var.backup_configuration]
6160
content {

modules/mysql/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ variable "availability_type" {
6767
default = "REGIONAL"
6868
}
6969

70-
variable "authorized_gae_applications" {
71-
description = "The list of authorized App Engine project names"
72-
type = list(string)
73-
default = []
74-
}
75-
7670
variable "disk_autoresize" {
7771
description = "Configuration to increase storage size"
7872
type = bool

modules/safer_mysql/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ mysql -S $HOME/mysql_sockets/myproject:region:instance -u user -p
168168
| 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 |
169169
| additional\_users | A list of users to be created in your cluster | <pre>list(object({<br> name = string<br> password = string<br> host = string<br> }))</pre> | `[]` | no |
170170
| assign\_public\_ip | Set to true if the master instance should also have a public IP (less secure). | `string` | `false` | no |
171-
| authorized\_gae\_applications | The list of authorized App Engine project names | `list(string)` | `[]` | no |
172171
| availability\_type | The availability type for the master instance. Can be either `REGIONAL` or `null`. | `string` | `"REGIONAL"` | no |
173172
| backup\_configuration | The backup\_configuration settings subblock for the database setings | <pre>object({<br> binary_log_enabled = bool<br> enabled = bool<br> start_time = string<br> location = string<br> transaction_log_retention_days = string<br> retained_backups = number<br> retention_unit = string<br> })</pre> | <pre>{<br> "binary_log_enabled": false,<br> "enabled": false,<br> "location": null,<br> "retained_backups": null,<br> "retention_unit": null,<br> "start_time": null,<br> "transaction_log_retention_days": null<br>}</pre> | no |
174173
| create\_timeout | The optional timout that is applied to limit long database creates. | `string` | `"15m"` | no |

modules/safer_mysql/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module "safer_mysql" {
2525
tier = var.tier
2626
activation_policy = var.activation_policy
2727
availability_type = var.availability_type
28-
authorized_gae_applications = var.authorized_gae_applications
2928
disk_autoresize = var.disk_autoresize
3029
disk_size = var.disk_size
3130
disk_type = var.disk_type

modules/safer_mysql/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ variable "availability_type" {
7272
default = "REGIONAL"
7373
}
7474

75-
variable "authorized_gae_applications" {
76-
description = "The list of authorized App Engine project names"
77-
type = list(string)
78-
default = []
79-
}
80-
8175
variable "disk_autoresize" {
8276
description = "Configuration to increase storage size"
8377
type = bool

0 commit comments

Comments
 (0)