Skip to content

Commit b8db620

Browse files
committed
chore: simplify edition logic and add comments to explain tier
Signed-off-by: chjmil <[email protected]>
1 parent 8df06fe commit b8db620

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

main.tf

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -256,21 +256,18 @@ module "postgresql" {
256256
deletion_protection = false
257257
module_depends_on = [google_service_networking_connection.private_vpc_connection]
258258

259-
edition = (
260-
tonumber(each.value.server_version) >= 16 && each.value.edition != "ENTERPRISE_PLUS"
261-
) || (
262-
tonumber(each.value.server_version) < 16 && each.value.edition != "ENTERPRISE"
263-
) ? (
264-
tonumber(each.value.server_version) >= 16 ? "ENTERPRISE_PLUS" : "ENTERPRISE"
265-
) : each.value.edition
266-
267-
tier = (
268-
tonumber(each.value.server_version) >= 16 && !can(regex("^db-perf-optimized-", each.value.machine_type))
269-
) || (
270-
tonumber(each.value.server_version) < 16 && !can(regex("^db-custom-", each.value.machine_type))
271-
) ? (
272-
tonumber(each.value.server_version) >= 16 ? "db-perf-optimized-N-8" : "db-custom-4-16384"
273-
) : each.value.machine_type
259+
edition = tonumber(each.value.server_version) >= 16 ? "ENTERPRISE_PLUS" : "ENTERPRISE"
260+
261+
// If semver is 16+ and machine_type is not db-perf-optimized-*, then use db-perf-optimized-N-8
262+
// If semver is < 16 and machine_type is not db-custom-*, then use db-custom-4-16384
263+
// Otherwise, use the machine_type from the input
264+
tier = (
265+
tonumber(each.value.server_version) >= 16 && !can(regex("^db-perf-optimized-", each.value.machine_type))
266+
) || (
267+
tonumber(each.value.server_version) < 16 && !can(regex("^db-custom-", each.value.machine_type))
268+
) ? (
269+
tonumber(each.value.server_version) >= 16 ? "db-perf-optimized-N-8" : "db-custom-4-16384"
270+
) : each.value.machine_type
274271

275272
disk_size = each.value.storage_gb
276273

0 commit comments

Comments
 (0)