q!

lucasmacedot · lucasmacedot · commit 8948eeb31de5 · 2025-02-18T14:19:29.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+module
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ module "redis" {
   redis_port                     = try(each.value.redis_port, 6379)
   redis_snapshot_retention_limit = try(each.value.redis_snapshot_retention_limit, 0)
   redis_snapshot_window          = try(each.value.redis_snapshot_window, "06:30-07:30") # "The daily time range (in UTC) during which ElastiCache will begin taking a daily snapshot of your cache cluster."
-  redis_version                  = try(each.value.redis_version, "3.2.10")              # "Whether to enable encryption in transit. Requires 3.2.6 or >=4.0 redis_version"
+  engine_version                  = try(each.value.engine_version, "3.2.10")              # "Whether to enable encryption in transit. Requires 3.2.6 or >=4.0 engine_version"
   snapshot_arns                  = try(each.value.snapshot_arns, [])                    # "A single-element string list containing an Amazon Resource Name (ARN) of a Redis RDB snapshot file stored in Amazon S3. Example: arn:aws:s3:::my_bucket/snapshot1.rdb"
   snapshot_name                  = try(each.value.snapshot_name, "")                    # " The name of a snapshot from which to restore data into the new node group. Changing the snapshot_name forces a new resource"
   tags                           = try(each.value.tags, {})
diff --git a/_locals.tf b/_locals.tf
@@ -1,3 +1,3 @@
 locals {
-  major_version = tonumber(replace(var.redis_version, "/\\.[\\d][\\.\\d]*/", ""))
+  major_version = tonumber(replace(var.engine_version, "/\\.[\\d][\\.\\d]*/", ""))
 }
diff --git a/outputs.tf b/outputs.tf
@@ -1,23 +1,23 @@
 output "security_group_id" {
-  value = aws_security_group.security_group.id
+  value = aws_security_group.default.id
 }
 
 output "parameter_group" {
   value = aws_elasticache_parameter_group.parameter_group.id
 }
 
 output "subnet_group_name" {
-  value = var.create_subnet_group == true ? aws_elasticache_subnet_group.subnet_group[0].name : ""
+  value = var.create_subnet_group == true ? aws_elasticache_subnet_group.default[0].name : ""
 }
 
 output "id" {
-  value = aws_elasticache_replication_group.default.id
+  value = aws_elasticache_replication_group.default[0].id
 }
 
 output "port" {
   value = var.port
 }
 
 output "endpoint" {
-  value = var.cluster_enabled == true ? aws_elasticache_replication_group.default.configuration_endpoint_address : aws_elasticache_replication_group.default.primary_endpoint_address
+  value = var.cluster_enabled == true ? aws_elasticache_replication_group.default[0].configuration_endpoint_address : aws_elasticache_replication_group.default[0].primary_endpoint_address
 }
diff --git a/parameter_group.tf b/parameter_group.tf
@@ -2,9 +2,9 @@ resource "aws_elasticache_parameter_group" "parameter_group" {
   name        = replace(format("%.255s", lower(replace("tf-elasticache-${var.name}-${var.env}-${var.vpc_id}-${random_id.salt.hex}", "_", "-"))), "/\\s/", "-")
   description = "Terraform-managed ElastiCache parameter group for ${var.name}-${var.env}-${var.vpc_id}"
 
-  # Strip the patch version from redis_version var
-  # family = "redis${replace(var.redis_version, "/\\.[\\d]+$/", "")}"
-  family = local.major_version >= 7 ? "redis${local.major_version}" : (local.major_version == 6 ? "redis${local.major_version}.x" : "redis${replace(var.redis_version, "/\\.[\\d]+$/", "")}")
+  # Strip the patch version from engine_version var
+  # family = "redis${replace(var.engine_version, "/\\.[\\d]+$/", "")}"
+  family = local.major_version >= 7 ? "redis${local.major_version}" : (local.major_version == 6 ? "redis${local.major_version}.x" : "redis${replace(var.engine_version, "/\\.[\\d]+$/", "")}")
   dynamic "parameter" {
     for_each = var.redis_parameters
     content {
diff --git a/replication_group.tf b/replication_group.tf
@@ -15,9 +15,9 @@ resource "aws_elasticache_replication_group" "default" {
   engine_version             = var.engine_version
   port                       = var.port
   parameter_group_name       = aws_elasticache_parameter_group.parameter_group.id
-  subnet_group_name          = try(aws_elasticache_subnet_group.subnet_group[0].id, var.subnet_group_id)
+  subnet_group_name          = try(aws_elasticache_subnet_group.default[0].id, var.subnet_group_id)
   security_group_names       = var.security_group_names
-  security_group_ids         = [aws_security_group.security_group.id]
+  security_group_ids         = [aws_security_group.default.id]
   snapshot_arns              = var.snapshot_arns
   snapshot_name              = var.snapshot_name
   apply_immediately          = var.apply_immediately
diff --git a/secrets_manager.tf b/secrets_manager.tf
@@ -8,8 +8,8 @@ resource "aws_secretsmanager_secret_version" "elasticache" {
   count     = var.secret_method == "secretsmanager" ? 1 : 0
   secret_id = aws_secretsmanager_secret.elasticache[0].id
   secret_string = jsonencode({
-    "PORT" : aws_elasticache_replication_group.default.port,
-    "HOST" : aws_elasticache_replication_group.default.cluster_enabled ? aws_elasticache_replication_group.default.configuration_endpoint_address : aws_elasticache_replication_group.default.primary_endpoint_address,
-    "URL" : "redis${var.transit_encryption_enabled ? "s" : ""}://${aws_elasticache_replication_group.default.cluster_enabled ? aws_elasticache_replication_group.default.configuration_endpoint_address : aws_elasticache_replication_group.default.primary_endpoint_address}:${aws_elasticache_replication_group.default.port}",
+    "PORT" : aws_elasticache_replication_group.default[0].port,
+    "HOST" : aws_elasticache_replication_group.default[0].cluster_enabled ? aws_elasticache_replication_group.default[0].configuration_endpoint_address : aws_elasticache_replication_group.default[0].primary_endpoint_address,
+    "URL" : "redis${var.transit_encryption_enabled ? "s" : ""}://${aws_elasticache_replication_group.default[0].cluster_enabled ? aws_elasticache_replication_group.default[0].configuration_endpoint_address : aws_elasticache_replication_group.default[0].primary_endpoint_address}:${aws_elasticache_replication_group.default[0].port}",
   })
 }
diff --git a/security_groups.tf b/security_groups.tf
@@ -1,4 +1,4 @@
-resource "aws_security_group" "security_group" {
+resource "aws_security_group" "default" {
   name        = format("%.255s", "tf-sg-ec-${var.name}-${var.env}-${var.vpc_id}")
   description = "Terraform-managed ElastiCache security group for ${var.name}-${var.env}-${var.vpc_id}"
   vpc_id      = var.vpc_id
@@ -15,7 +15,7 @@ resource "aws_security_group_rule" "inbound_from_sg" {
   to_port                  = var.port
   protocol                 = "tcp"
   source_security_group_id = each.value.security_group_id
-  security_group_id        = aws_security_group.redis_security_group.id
+  security_group_id        = aws_security_group.default.id
   description              = try(each.value.description, "From ${each.value.security_group_id}")
 }
 
@@ -26,6 +26,6 @@ resource "aws_security_group_rule" "networks_ingress" {
   to_port           = var.port
   protocol          = "tcp"
   cidr_blocks       = [each.value.cidr]
-  security_group_id = aws_security_group.redis_security_group.id
+  security_group_id = aws_security_group.default.id
   description       = try(each.value.description, "From ${each.value.cidr}")
 }
diff --git a/ssm.tf b/ssm.tf
@@ -3,13 +3,13 @@ resource "aws_ssm_parameter" "endpoint" {
   name        = "/elasticache/${var.engine}/${var.env}-${var.name}/ENDPOINT"
   description = "Elasticache Redis Endpoint"
   type        = "String"
-  value       = aws_elasticache_replication_group.default.cluster_enabled ? aws_elasticache_replication_group.default.configuration_endpoint_address : aws_elasticache_replication_group.default.primary_endpoint_address
+  value       = aws_elasticache_replication_group.default[0].cluster_enabled ? aws_elasticache_replication_group.default[0].configuration_endpoint_address : aws_elasticache_replication_group.default[0].primary_endpoint_address
 }
 
 resource "aws_ssm_parameter" "port" {
   count       = var.secret_method == "ssm" ? 1 : 0
   name        = "/elasticache/${var.engine}/${var.env}-${var.name}/PORT"
   description = "Elasticache Redis Port"
   type        = "String"
-  value       = aws_elasticache_replication_group.default.port
+  value       = aws_elasticache_replication_group.default[0].port
 }
diff --git a/variables.tf b/variables.tf
@@ -61,6 +61,7 @@ variable "name" {
 variable "number_clusters" {
   description = "Number of Redis cache clusters (nodes) to create"
   type        = string
+  default     = 0
 }
 
 variable "cluster_enabled" {
@@ -178,7 +179,7 @@ variable "kms_key_id" {
 }
 
 variable "transit_encryption_enabled" {
-  description = "Whether to enable encryption in transit. Requires 3.2.6 or >=4.0 redis_version"
+  description = "Whether to enable encryption in transit. Requires 3.2.6 or >=4.0 engine_version"
   type        = bool
   default     = false
 }
@@ -234,4 +235,5 @@ variable "create_subnet_group" {
 variable "subnet_group_id" {
   description = "Subnet group ID to use for the replication group"
   type        = string
+  default     = null
 }
diff --git a/versions.tf b/versions.tf
@@ -1,3 +1,9 @@
 terraform {
   required_version = ">= 0.13.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "> 5.0.0"
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`locals {`
`2`		`- major_version = tonumber(replace(var.redis_version, "/\\.[\\d][\\.\\d]*/", ""))`
	`2`	`+ major_version = tonumber(replace(var.engine_version, "/\\.[\\d][\\.\\d]*/", ""))`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,23 @@`
`1`	`1`	`output "security_group_id" {`
`2`		`- value = aws_security_group.security_group.id`
	`2`	`+ value = aws_security_group.default.id`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`output "parameter_group" {`
`6`	`6`	`value = aws_elasticache_parameter_group.parameter_group.id`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`output "subnet_group_name" {`
`10`		`- value = var.create_subnet_group == true ? aws_elasticache_subnet_group.subnet_group[0].name : ""`
	`10`	`+ value = var.create_subnet_group == true ? aws_elasticache_subnet_group.default[0].name : ""`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`output "id" {`
`14`		`- value = aws_elasticache_replication_group.default.id`
	`14`	`+ value = aws_elasticache_replication_group.default[0].id`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`output "port" {`
`18`	`18`	`value = var.port`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`output "endpoint" {`
`22`		`- value = var.cluster_enabled == true ? aws_elasticache_replication_group.default.configuration_endpoint_address : aws_elasticache_replication_group.default.primary_endpoint_address`
	`22`	`+ value = var.cluster_enabled == true ? aws_elasticache_replication_group.default[0].configuration_endpoint_address : aws_elasticache_replication_group.default[0].primary_endpoint_address`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ variable "name" {`
`61`	`61`	`variable "number_clusters" {`
`62`	`62`	`description = "Number of Redis cache clusters (nodes) to create"`
`63`	`63`	`type = string`
	`64`	`+ default = 0`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`variable "cluster_enabled" {`
`@@ -178,7 +179,7 @@ variable "kms_key_id" {`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`variable "transit_encryption_enabled" {`
`181`		`- description = "Whether to enable encryption in transit. Requires 3.2.6 or >=4.0 redis_version"`
	`182`	`+ description = "Whether to enable encryption in transit. Requires 3.2.6 or >=4.0 engine_version"`
`182`	`183`	`type = bool`
`183`	`184`	`default = false`
`184`	`185`	`}`
`@@ -234,4 +235,5 @@ variable "create_subnet_group" {`
`234`	`235`	`variable "subnet_group_id" {`
`235`	`236`	`description = "Subnet group ID to use for the replication group"`
`236`	`237`	`type = string`
	`238`	`+ default = null`
`237`	`239`	`}`