Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Don't require var.zone for read_replica instances #513

Closed
wants to merge 12 commits into from
Closed

fix: Don't require var.zone for read_replica instances #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
01831f1
fix: Don't require `var.zone` for `read_replica` instances
Sep 14, 2023
f5007c6
Switch from `lookup()` to `coalesce()` function.
Sep 15, 2023
b431ee9
Update `edition` variable to default to `ENTERPRISE`.
Sep 15, 2023
3cd5e4e
Merge branch 'master' into replica_use_random_zone
g-awmalik Sep 21, 2023
5e5e922
Set the "default" for `edition` as a local
Oct 2, 2023
ff3ee10
Remove `count` from `google_compute_zones.available` to prevent error
Oct 2, 2023
90e1074
Merge branch 'master' into replica_use_random_zone
g-awmalik Feb 5, 2024
9204771
generate docs
g-awmalik Feb 5, 2024
944a7fb
Merge branch 'master' into replica_use_random_zone
g-awmalik Feb 6, 2024
314e14c
Merge branch 'master' into replica_use_random_zone
g-awmalik Feb 6, 2024
4e114c0
Merge branch 'master' into replica_use_random_zone
g-awmalik Feb 6, 2024
95922a8
Merge branch 'master' into replica_use_random_zone
g-awmalik Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/mysql/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Note: CloudSQL provides [disk autoresize](https://cloud.google.com/sql/docs/mysq
| disk\_autoresize\_limit | The maximum size to which storage can be auto increased. | `number` | `0` | no |
| disk\_size | The disk size for the master instance | `number` | `10` | no |
| disk\_type | The disk type for the master instance. | `string` | `"PD_SSD"` | no |
| edition | The edition of the instance, can be ENTERPRISE or ENTERPRISE\_PLUS. | `string` | `null` | no |
| edition | The edition of the instance, can be ENTERPRISE or ENTERPRISE\_PLUS. Defaults to ENTERPRISE. | `string` | `null` | no |
| enable\_default\_db | Enable or disable the creation of the default database | `bool` | `true` | no |
| enable\_default\_user | Enable or disable the creation of the default user | `bool` | `true` | no |
| enable\_random\_password\_special | Enable special characters in generated random passwords. | `bool` | `false` | no |
Expand Down
27 changes: 14 additions & 13 deletions modules/mysql/read_replica.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ locals {
replicas = {
for x in var.read_replicas : "${var.name}-replica${var.read_replica_name_suffix}${x.name}" => x
}
// Edition should default to Enterprise
edition = var.edition != null ? var.edition : "ENTERPRISE"
// Zone for replica instances
zone = var.zone == null ? data.google_compute_zones.available[0].names[0] : var.zone
zone = var.zone == null ? data.google_compute_zones.available.names[0] : var.zone
}

data "google_compute_zones" "available" {
count = var.zone == null ? 1 : 0
project = var.project_id
region = var.region
}
Expand All @@ -34,20 +35,20 @@ resource "google_sql_database_instance" "replicas" {
project = var.project_id
name = each.value.name_override == null || each.value.name_override == "" ? "${local.master_instance_name}-replica${var.read_replica_name_suffix}${each.value.name}" : each.value.name_override
database_version = var.replica_database_version != "" ? var.replica_database_version : var.database_version
region = join("-", slice(split("-", lookup(each.value, "zone", var.zone)), 0, 2))
region = join("-", slice(split("-", coalesce(each.value["zone"], local.zone)), 0, 2))
master_instance_name = google_sql_database_instance.default.name
deletion_protection = var.read_replica_deletion_protection
encryption_key_name = (join("-", slice(split("-", lookup(each.value, "zone", var.zone)), 0, 2))) == var.region ? null : each.value.encryption_key_name
encryption_key_name = (join("-", slice(split("-", coalesce(each.value["zone"], local.zone)), 0, 2))) == var.region ? null : each.value.encryption_key_name

replica_configuration {
failover_target = false
}

settings {
tier = lookup(each.value, "tier", var.tier)
edition = lookup(each.value, "edition", var.edition)
tier = coalesce(each.value["tier"], var.tier)
edition = coalesce(each.value["edition"], local.edition)
activation_policy = "ALWAYS"
availability_type = lookup(each.value, "availability_type", var.availability_type)
availability_type = coalesce(each.value["availability_type"], var.availability_type)
deletion_protection_enabled = var.read_replica_deletion_protection_enabled

dynamic "backup_configuration" {
Expand Down Expand Up @@ -97,12 +98,12 @@ resource "google_sql_database_instance" "replicas" {
}
}

disk_autoresize = lookup(each.value, "disk_autoresize", var.disk_autoresize)
disk_autoresize_limit = lookup(each.value, "disk_autoresize_limit", var.disk_autoresize_limit)
disk_size = lookup(each.value, "disk_size", var.disk_size)
disk_type = lookup(each.value, "disk_type", var.disk_type)
disk_autoresize = coalesce(each.value["disk_autoresize"], var.disk_autoresize)
disk_autoresize_limit = coalesce(each.value["disk_autoresize_limit"], var.disk_autoresize_limit)
disk_size = coalesce(each.value["disk_size"], var.disk_size)
disk_type = coalesce(each.value["disk_type"], var.disk_type)
pricing_plan = "PER_USE"
user_labels = lookup(each.value, "user_labels", var.user_labels)
user_labels = coalesce(each.value["user_labels"], var.user_labels)

dynamic "database_flags" {
for_each = lookup(each.value, "database_flags", [])
Expand All @@ -113,7 +114,7 @@ resource "google_sql_database_instance" "replicas" {
}

location_preference {
zone = lookup(each.value, "zone", local.zone)
zone = coalesce(each.value["zone"], local.zone)
}

}
Expand Down
2 changes: 1 addition & 1 deletion modules/mysql/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ variable "tier" {
}

variable "edition" {
description = "The edition of the instance, can be ENTERPRISE or ENTERPRISE_PLUS."
description = "The edition of the instance, can be ENTERPRISE or ENTERPRISE_PLUS. Defaults to ENTERPRISE."
type = string
default = null
}
Expand Down
2 changes: 1 addition & 1 deletion modules/postgresql/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Note: CloudSQL provides [disk autoresize](https://cloud.google.com/sql/docs/mysq
| disk\_autoresize\_limit | The maximum size to which storage can be auto increased. | `number` | `0` | no |
| disk\_size | The disk size for the master instance. | `number` | `10` | no |
| disk\_type | The disk type for the master instance. | `string` | `"PD_SSD"` | no |
| edition | The edition of the instance, can be ENTERPRISE or ENTERPRISE\_PLUS. | `string` | `null` | no |
| edition | The edition of the instance, can be ENTERPRISE or ENTERPRISE\_PLUS. Defaults to ENTERPRISE. | `string` | `null` | no |
| enable\_default\_db | Enable or disable the creation of the default database | `bool` | `true` | no |
| enable\_default\_user | Enable or disable the creation of the default user | `bool` | `true` | no |
| enable\_random\_password\_special | Enable special characters in generated random passwords. | `bool` | `false` | no |
Expand Down
27 changes: 14 additions & 13 deletions modules/postgresql/read_replica.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ locals {
replicas = {
for x in var.read_replicas : "${var.name}-replica${var.read_replica_name_suffix}${x.name}" => x
}
// Edition should default to Enterprise
edition = var.edition != null ? var.edition : "ENTERPRISE"
// Zone for replica instances
zone = var.zone == null ? data.google_compute_zones.available[0].names[0] : var.zone
zone = var.zone == null ? data.google_compute_zones.available.names[0] : var.zone
}

data "google_compute_zones" "available" {
count = var.zone == null ? 1 : 0
project = var.project_id
region = var.region
}
Expand All @@ -34,20 +35,20 @@ resource "google_sql_database_instance" "replicas" {
project = var.project_id
name = each.value.name_override == null || each.value.name_override == "" ? "${local.master_instance_name}-replica${var.read_replica_name_suffix}${each.value.name}" : each.value.name_override
database_version = var.database_version
region = join("-", slice(split("-", lookup(each.value, "zone", var.zone)), 0, 2))
region = join("-", slice(split("-", coalesce(each.value["zone"], local.zone)), 0, 2))
master_instance_name = google_sql_database_instance.default.name
deletion_protection = var.read_replica_deletion_protection
encryption_key_name = (join("-", slice(split("-", lookup(each.value, "zone", var.zone)), 0, 2))) == var.region ? null : each.value.encryption_key_name
encryption_key_name = (join("-", slice(split("-", coalesce(each.value["zone"], local.zone)), 0, 2))) == var.region ? null : each.value.encryption_key_name

replica_configuration {
failover_target = false
}

settings {
tier = lookup(each.value, "tier", var.tier)
edition = lookup(each.value, "edition", var.edition)
tier = coalesce(each.value["tier"], var.tier)
edition = coalesce(each.value["edition"], local.edition)
activation_policy = "ALWAYS"
availability_type = lookup(each.value, "availability_type", var.availability_type)
availability_type = coalesce(each.value["availability_type"], var.availability_type)
deletion_protection_enabled = var.read_replica_deletion_protection_enabled

dynamic "ip_configuration" {
Expand Down Expand Up @@ -89,12 +90,12 @@ resource "google_sql_database_instance" "replicas" {
}
}

disk_autoresize = lookup(each.value, "disk_autoresize", var.disk_autoresize)
disk_autoresize_limit = lookup(each.value, "disk_autoresize_limit", var.disk_autoresize_limit)
disk_size = lookup(each.value, "disk_size", var.disk_size)
disk_type = lookup(each.value, "disk_type", var.disk_type)
disk_autoresize = coalesce(each.value["disk_autoresize"], var.disk_autoresize)
disk_autoresize_limit = coalesce(each.value["disk_autoresize_limit"], var.disk_autoresize_limit)
disk_size = coalesce(each.value["disk_size"], var.disk_size)
disk_type = coalesce(each.value["disk_type"], var.disk_type)
pricing_plan = "PER_USE"
user_labels = lookup(each.value, "user_labels", var.user_labels)
user_labels = coalesce(each.value["user_labels"], var.user_labels)

dynamic "database_flags" {
for_each = lookup(each.value, "database_flags", [])
Expand All @@ -105,7 +106,7 @@ resource "google_sql_database_instance" "replicas" {
}

location_preference {
zone = lookup(each.value, "zone", local.zone)
zone = coalesce(each.value["zone"], local.zone)
}

}
Expand Down
2 changes: 1 addition & 1 deletion modules/postgresql/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ variable "tier" {
}

variable "edition" {
description = "The edition of the instance, can be ENTERPRISE or ENTERPRISE_PLUS."
description = "The edition of the instance, can be ENTERPRISE or ENTERPRISE_PLUS. Defaults to ENTERPRISE."
type = string
default = null
}
Expand Down