Changed to manual approach

Signed-off-by: PhanikumarThodupunoori <[email protected]>

Author: PhanikumarThodupunoori

docs/CONFIG-VARS.md

@@ -269,14 +269,19 @@ postgres_servers = {
 
 **NOTE**: The `default = {}` elements is always required when creating external databases. This is the systems default database server.
 
-Each server element, like `foo = {}`, can contain none, some, or all of the parameters listed below. If `machine_type` or `edition` are not provided, default values will be applied based on the `server_version`. For example:
-- If `server_version >= 16`, defaults to `edition = "ENTERPRISE_PLUS"` and `machine_type = "db-perf-optimized-N-*"`
-- If `server_version < 16`, defaults to `edition = "ENTERPRISE"` and `machine_type = "db-custom-*"`
+Each server element, like `foo = {}`, can contain none, some, or all of the parameters listed below. The `machine_type` and `edition` parameters must be explicitly specified and will be validated based on the `server_version`:
+
+- For PostgreSQL 16+:
+  - `edition` must be `"ENTERPRISE_PLUS"`
+  - `machine_type` must start with `"db-perf-optimized-N-"`
+- For PostgreSQL < 16:
+  - `edition` must be `"ENTERPRISE"`
+  - `machine_type` must start with `"db-custom-"`
 
 | Name | Description | Type | Default | Notes |
 | :--- | ---: | ---: | ---: | ---: |
-| machine_type| The machine type for the PostgreSQL server VMs" | string | "db-custom-4-16384" | Google Cloud Postgres supports only shared-core machine types such as db-f1-micro, and custom machine types such as db-custom-2-13312. |
-| edition | Cloud SQL edition type | string | *(auto-determined)* | Accepts `"ENTERPRISE"` or `"ENTERPRISE_PLUS"`. Automatically set based on `server_version` if omitted. |
+| machine_type| The machine type for the PostgreSQL server VMs" | string | "db-custom-4-16384" | Google Cloud Postgres supports only shared-core machine types such as db-f1-micro, and custom machine types such as db-custom-2-13312. Must match the PostgreSQL version requirements. |
+| edition | Cloud SQL edition type | string | null | Must be `"ENTERPRISE"` for PostgreSQL < 16 or `"ENTERPRISE_PLUS"` for PostgreSQL 16+. |
 | storage_gb | Minimum storage allowed for the PostgreSQL server | number | 128 | |
 | backups_enabled | Enables postgres backups | bool | true | |
 | backups_start_time | Start time for postgres backups | string | "21:00" | |
@@ -292,18 +297,18 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
 
 Multiple SAS offerings require a second PostgreSQL instance referred to as SAS Common Data Store, or CDS PostgreSQL. For more information, see [Common Customizations](https://documentation.sas.com/?cdcId=itopscdc&cdcVersion=default&docsetId=dplyml0phy0dkr&docsetTarget=n08u2yg8tdkb4jn18u8zsi6yfv3d.htm#p0wkxxi9s38zbzn19ukjjaxsc0kl). A list of SAS offerings that require CDS PostgreSQL is provided in [SAS Common Data Store Requirements](https://documentation.sas.com/?cdcId=itopscdc&cdcVersion=default&docsetId=itopssr&docsetTarget=p05lfgkwib3zxbn1t6nyihexp12n.htm#n03wzanutmc6gon1val5fykas9aa). To create and configure an external CDS PostgreSQL instance in addition to the external platform PostgreSQL instance named `default`, specify `cds-postgres` as a second PostgreSQL instance, as shown in the example below.
 
-Here is an example of the `postgres_servers` variable with the `default` server entry overriding only the `administrator_password` parameter and the `cds-postgres` entry overriding all of the parameters:
+Here is an example of the `postgres_servers` variable with the `default` server entry and the `cds-postgres` entry, both with explicit edition and machine type configurations that match their PostgreSQL versions:
 
 ```terraform
 postgres_servers = {
   default = {
     administrator_password       = "D0ntL00kTh1sWay"
-    server_version               = ""  # Specify PostgreSQL version here
-    machine_type                 = ""  # Specify the machine type here
-    edition                      = ""  # Specify the edition here (e.g., ENTERPRISE, ENTERPRISE_PLUS)
+    server_version              = "16"  # PostgreSQL 16
+    machine_type                = "db-perf-optimized-N-8"  # Required for PostgreSQL 16+
+    edition                     = "ENTERPRISE_PLUS"  # Required for PostgreSQL 16+
   },
   cds-postgres = {
-    machine_type                           = "db-custom-4-16384"
+    machine_type                           = "db-custom-4-16384"  # Required for PostgreSQL < 16
     storage_gb                             = 128
     backups_enabled                        = true
     backups_start_time                     = "21:00"
@@ -312,7 +317,8 @@ postgres_servers = {
     backup_count                           = 7 # Number of backups to retain, not in days
     administrator_login                    = "cdsadmin"
     administrator_password                 = "my$up3rS3cretPassw0rd"
-    server_version                         = "15"
+    server_version                         = "15"  # PostgreSQL 15
+    edition                                = "ENTERPRISE"  # Required for PostgreSQL < 16
     availability_type                      = "ZONAL"
     ssl_enforcement_enabled                = true
     database_flags                         = [{ name = "cloudsql.enable_pg_cron", value = "true"}, { name = "cloudsql.enable_pgaudit", value = "true"}]

main.tf

@@ -256,18 +256,8 @@ module "postgresql" {
   deletion_protection = false
   module_depends_on   = [google_service_networking_connection.private_vpc_connection]
 
-  edition = tonumber(each.value.server_version) >= 16 ? "ENTERPRISE_PLUS" : "ENTERPRISE"
-
-  // If semver is 16+ and machine_type is not db-perf-optimized-*, then use db-perf-optimized-N-8
-  // If semver is < 16 and machine_type is not db-custom-*, then use db-custom-4-16384
-  // Otherwise, use the machine_type from the input
-  tier = (
-    tonumber(each.value.server_version) >= 16 && !can(regex("^db-perf-optimized-", each.value.machine_type))
-  ) || (
-    tonumber(each.value.server_version) < 16 && !can(regex("^db-custom-", each.value.machine_type))
-  ) ? (
-    tonumber(each.value.server_version) >= 16 ? "db-perf-optimized-N-8" : "db-custom-4-16384"
-  ) : each.value.machine_type
+  edition = each.value.edition
+  tier    = each.value.machine_type
 
   disk_size = each.value.storage_gb
 
@@ -329,4 +319,4 @@ module "google_netapp" {
   volume_path        = "${var.prefix}-${var.netapp_volume_path}"
   allowed_clients    = join(",", [local.gke_subnet_cidr, local.misc_subnet_cidr])
   depends_on         = [ module.gke ]
-}
+}

variables.tf

@@ -410,9 +410,18 @@ variable "postgres_servers" {
     error_message = "ERROR: The database server name must start with a letter, cannot end with a hyphen, must be between 1-88 characters in length, and can only contain hyphens, letters, and numbers."
   }
 
-  # Checking user provided login
-
-  # Checking user provided password
+  # Validate edition and machine type based on PostgreSQL version
+  validation {
+    condition = var.postgres_servers != null ? length(var.postgres_servers) != 0 ? alltrue([
+      for k, v in var.postgres_servers : (
+        v.server_version != null && (
+          (tonumber(v.server_version) >= 16 && v.edition == "ENTERPRISE_PLUS" && can(regex("^db-perf-optimized-N-", v.machine_type))) ||
+          (tonumber(v.server_version) < 16 && v.edition == "ENTERPRISE" && can(regex("^db-custom-", v.machine_type)))
+        )
+      )
+    ]) : false : true
+    error_message = "ERROR: Invalid PostgreSQL configuration:\n* PostgreSQL 16+ requires ENTERPRISE_PLUS edition and db-perf-optimized-N-* machine type\n* PostgreSQL < 16 requires ENTERPRISE edition and db-custom-* machine type"
+  }
 }
 
 ## filestore
@@ -590,4 +599,4 @@ variable "cluster_node_pool_mode" {
   description = "Flag for predefined cluster node configurations - Values : default, minimal"
   type        = string
   default     = "default"
-}
+}