From 127d7749ad3b392b59e976b2a43e6569925c14c0 Mon Sep 17 00:00:00 2001 From: Christophe BIGUEREAU Date: Thu, 10 Apr 2025 16:06:01 +0200 Subject: [PATCH 1/3] fix(terraform-google-sql-db/mysql): Disable data_cache in Mysql instance when data_cache_enabled is false --- modules/mysql/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mysql/main.tf b/modules/mysql/main.tf index b9d4ff08..5e5fb841 100644 --- a/modules/mysql/main.tf +++ b/modules/mysql/main.tf @@ -105,7 +105,7 @@ resource "google_sql_database_instance" "default" { } } dynamic "data_cache_config" { - for_each = var.edition == "ENTERPRISE_PLUS" && var.data_cache_enabled ? ["cache_enabled"] : [] + for_each = var.edition == "ENTERPRISE_PLUS" ? ["cache_enabled"] : [] content { data_cache_enabled = var.data_cache_enabled } From 1cf57b6d232912e54f85484cb5975b414cdd5a73 Mon Sep 17 00:00:00 2001 From: Christophe BIGUEREAU Date: Thu, 10 Apr 2025 16:06:25 +0200 Subject: [PATCH 2/3] fix(terraform-google-sql-db/mssql): Disable data_cache in MSSQL instance when data_cache_enabled is false --- modules/mssql/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mssql/main.tf b/modules/mssql/main.tf index cb0a484b..ac99646c 100644 --- a/modules/mssql/main.tf +++ b/modules/mssql/main.tf @@ -83,7 +83,7 @@ resource "google_sql_database_instance" "default" { } } dynamic "data_cache_config" { - for_each = var.edition == "ENTERPRISE_PLUS" && var.data_cache_enabled ? ["cache_enabled"] : [] + for_each = var.edition == "ENTERPRISE_PLUS" ? ["cache_enabled"] : [] content { data_cache_enabled = var.data_cache_enabled } From fe52780b9997782a9f43bc53c0df6915397b2b75 Mon Sep 17 00:00:00 2001 From: Christophe BIGUEREAU Date: Thu, 10 Apr 2025 16:06:43 +0200 Subject: [PATCH 3/3] fix(terraform-google-sql-db/postgresql): Disable data_cache in PostgreSQL instance when data_cache_enabled is false --- modules/postgresql/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/postgresql/main.tf b/modules/postgresql/main.tf index f9f209c2..bb9d4629 100644 --- a/modules/postgresql/main.tf +++ b/modules/postgresql/main.tf @@ -98,7 +98,7 @@ resource "google_sql_database_instance" "default" { } } dynamic "data_cache_config" { - for_each = var.edition == "ENTERPRISE_PLUS" && var.data_cache_enabled ? ["cache_enabled"] : [] + for_each = var.edition == "ENTERPRISE_PLUS" ? ["cache_enabled"] : [] content { data_cache_enabled = var.data_cache_enabled }