feat(TPG >=5.33)!: zone_distribution_config force recreation (#222)

terraform-google-modules · Jul 16, 2024 · c49bdbf · c49bdbf
1 parent d152655
commit c49bdbf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/modules/redis-cluster/README.md b/modules/redis-cluster/README.md
@@ -42,6 +42,8 @@ module "redis_cluster" {
 | service\_connection\_policies | The Service Connection Policies to create | <pre>map(object({<br>    description     = optional(string)<br>    network_name    = string<br>    network_project = string<br>    subnet_names    = list(string)<br>    limit           = optional(number)<br>    labels          = optional(map(string), {})<br>  }))</pre> | `{}` | no |
 | shard\_count | Required. Number of shards for the Redis cluster. The minimum number of shards in a Memorystore cluster is 3 shards | `number` | `3` | no |
 | transit\_encryption\_mode | The in-transit encryption for the Redis cluster. If not provided, encryption is disabled for the cluster. Default value is TRANSIT\_ENCRYPTION\_MODE\_DISABLED. Possible values are: TRANSIT\_ENCRYPTION\_MODE\_UNSPECIFIED, TRANSIT\_ENCRYPTION\_MODE\_DISABLED, TRANSIT\_ENCRYPTION\_MODE\_SERVER\_AUTHENTICATION | `string` | `"TRANSIT_ENCRYPTION_MODE_DISABLED"` | no |
+| zone\_distribution\_config\_mode | The mode for zone distribution for Memorystore Redis cluster (Immutable). If not provided, MULTI\_ZONE will be used as default value. Possible values are: MULTI\_ZONE, SINGLE\_ZONE | `string` | `"MULTI_ZONE"` | no |
+| zone\_distribution\_config\_zone | The zone for single zone Memorystore Redis cluster (Immutable) | `string` | `null` | no |
 
 ## Outputs
 

diff --git a/modules/redis-cluster/main.tf b/modules/redis-cluster/main.tf
@@ -32,6 +32,14 @@ resource "google_redis_cluster" "redis_cluster" {
     }
   }
 
+  dynamic "zone_distribution_config" {
+    for_each = var.zone_distribution_config_mode != null ? [1] : []
+    content {
+      mode = var.zone_distribution_config_mode
+      zone = var.zone_distribution_config_mode == "SINGLE_ZONE" ? var.zone_distribution_config_zone : null
+    }
+  }
+
   depends_on = [
     google_network_connectivity_service_connection_policy.service_connection_policies,
     module.enable_apis,

diff --git a/modules/redis-cluster/variables.tf b/modules/redis-cluster/variables.tf
@@ -96,3 +96,15 @@ variable "redis_configs" {
   })
   default = null
 }
+
+variable "zone_distribution_config_mode" {
+  description = "The mode for zone distribution for Memorystore Redis cluster (Immutable). If not provided, MULTI_ZONE will be used as default value. Possible values are: MULTI_ZONE, SINGLE_ZONE"
+  type        = string
+  default     = "MULTI_ZONE"
+}
+
+variable "zone_distribution_config_zone" {
+  description = "The zone for single zone Memorystore Redis cluster (Immutable)"
+  type        = string
+  default     = null
+}
diff --git a/modules/redis-cluster/versions.tf b/modules/redis-cluster/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.28, < 6"
+      version = ">= 5.33, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.28, < 6"
+      version = ">= 5.33, < 6"
     }
   }