Skip to content

Commit

Permalink
fix!: delete deprecated attribute authorized_gae_applications (#240)
Browse files Browse the repository at this point in the history
Signed-off-by: Oleksii Kravchenko <oleksii.kravchenko@aspira.global>
  • Loading branch information
kam1kaze authored Aug 20, 2021
1 parent 79909c3 commit d35b23c
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 30 deletions.
1 change: 0 additions & 1 deletion modules/mssql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ The following dependency must be available for SQL Server module:
| activation\_policy | The activation policy for the master instance.Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | `string` | `"ALWAYS"` | no |
| 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 |
| additional\_users | A list of users to be created in your cluster | <pre>list(object({<br> name = string<br> password = string<br> }))</pre> | `[]` | no |
| authorized\_gae\_applications | The authorized gae applications for the Cloud SQL instances | `list(string)` | `[]` | no |
| 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 |
| 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 |
| create\_timeout | The optional timeout that is applied to limit long database creates. | `string` | `"15m"` | no |
Expand Down
7 changes: 3 additions & 4 deletions modules/mssql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,9 @@ 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
authorized_gae_applications = var.authorized_gae_applications
tier = var.tier
activation_policy = var.activation_policy
availability_type = var.availability_type
dynamic "backup_configuration" {
for_each = var.backup_configuration.enabled ? [var.backup_configuration] : []
content {
Expand Down
6 changes: 0 additions & 6 deletions modules/mssql/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,6 @@ variable "user_labels" {
default = {}
}

variable "authorized_gae_applications" {
description = "The authorized gae applications for the Cloud SQL instances"
type = list(string)
default = []
}

variable "ip_configuration" {
description = "The ip configuration for the master instances."
type = object({
Expand Down
1 change: 0 additions & 1 deletion modules/mysql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Note: CloudSQL provides [disk autoresize](https://cloud.google.com/sql/docs/mysq
| activation\_policy | The activation policy for the master instance. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | `string` | `"ALWAYS"` | no |
| 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 |
| 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 |
| authorized\_gae\_applications | The list of authorized App Engine project names | `list(string)` | `[]` | no |
| availability\_type | The availability type for the master instance. Can be either `REGIONAL` or `null`. | `string` | `"REGIONAL"` | no |
| 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 |
| create\_timeout | The optional timout that is applied to limit long database creates. | `string` | `"10m"` | no |
Expand Down
7 changes: 3 additions & 4 deletions modules/mysql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ 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
authorized_gae_applications = var.authorized_gae_applications
tier = var.tier
activation_policy = var.activation_policy
availability_type = var.availability_type
dynamic "backup_configuration" {
for_each = [var.backup_configuration]
content {
Expand Down
6 changes: 0 additions & 6 deletions modules/mysql/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ variable "availability_type" {
default = "REGIONAL"
}

variable "authorized_gae_applications" {
description = "The list of authorized App Engine project names"
type = list(string)
default = []
}

variable "disk_autoresize" {
description = "Configuration to increase storage size"
type = bool
Expand Down
1 change: 0 additions & 1 deletion modules/safer_mysql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ mysql -S $HOME/mysql_sockets/myproject:region:instance -u user -p
| 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 |
| 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 |
| assign\_public\_ip | Set to true if the master instance should also have a public IP (less secure). | `string` | `false` | no |
| authorized\_gae\_applications | The list of authorized App Engine project names | `list(string)` | `[]` | no |
| availability\_type | The availability type for the master instance. Can be either `REGIONAL` or `null`. | `string` | `"REGIONAL"` | no |
| 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 |
| create\_timeout | The optional timout that is applied to limit long database creates. | `string` | `"15m"` | no |
Expand Down
1 change: 0 additions & 1 deletion modules/safer_mysql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ module "safer_mysql" {
tier = var.tier
activation_policy = var.activation_policy
availability_type = var.availability_type
authorized_gae_applications = var.authorized_gae_applications
disk_autoresize = var.disk_autoresize
disk_size = var.disk_size
disk_type = var.disk_type
Expand Down
6 changes: 0 additions & 6 deletions modules/safer_mysql/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ variable "availability_type" {
default = "REGIONAL"
}

variable "authorized_gae_applications" {
description = "The list of authorized App Engine project names"
type = list(string)
default = []
}

variable "disk_autoresize" {
description = "Configuration to increase storage size"
type = bool
Expand Down

0 comments on commit d35b23c

Please sign in to comment.