#37 from clouddrove/bug/6ix-81

h1manshu98 · web-flow · commit c4caab534602 · 2023-04-05T16:30:00.000+05:30
updated deprecated variables
diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ Here are some examples of how you can use this module in your inventory structur
     security_group_ids           = ["sg-xxxxxxxxx"]
     availability_zones           = ["eu-west-1a","eu-west-1b" ]
     auto_minor_version_upgrade   = true
-    number_cache_clusters        = 2
+    num_cache_clusters           = 2
    }
 
 ```
diff --git a/README.yaml b/README.yaml
@@ -58,7 +58,7 @@ usage : |-
       security_group_ids           = ["sg-xxxxxxxxx"]
       availability_zones           = ["eu-west-1a","eu-west-1b" ]
       auto_minor_version_upgrade   = true
-      number_cache_clusters        = 2
+      num_cache_clusters           = 2
      }
 
   ```
diff --git a/_example/redis/example.tf b/_example/redis/example.tf
@@ -57,7 +57,7 @@ module "redis" {
   security_group_ids         = [module.redis-sg.security_group_ids]
   availability_zones         = ["eu-west-1a", "eu-west-1b"]
   auto_minor_version_upgrade = true
-  number_cache_clusters      = 2
+  num_cache_clusters         = 2
   retention_in_days          = 0
 
   log_delivery_configuration = [
diff --git a/main.tf b/main.tf
@@ -41,33 +41,33 @@ resource "aws_elasticache_subnet_group" "default" {
 # Module      : Elasticache Replication Group
 # Description : Terraform module which creates standalone instance for Elasticache Redis.
 resource "aws_elasticache_replication_group" "default" {
-  count                         = var.enable && var.replication_enabled ? 1 : 0
-  engine                        = var.engine
-  replication_group_id          = module.labels.id
-  replication_group_description = module.labels.id
-  engine_version                = var.engine_version
-  port                          = var.port
-  parameter_group_name          = var.parameter_group_name
-  node_type                     = var.node_type
-  automatic_failover_enabled    = var.automatic_failover_enabled
-  subnet_group_name             = join("", aws_elasticache_subnet_group.default.*.name)
-  security_group_ids            = var.security_group_ids
-  security_group_names          = var.security_group_names
-  snapshot_arns                 = var.snapshot_arns
-  snapshot_name                 = var.snapshot_name
-  notification_topic_arn        = var.notification_topic_arn
-  snapshot_window               = var.snapshot_window
-  snapshot_retention_limit      = var.snapshot_retention_limit
-  apply_immediately             = var.apply_immediately
-  availability_zones            = slice(var.availability_zones, 0, var.number_cache_clusters)
-  number_cache_clusters         = var.number_cache_clusters
-  auto_minor_version_upgrade    = var.auto_minor_version_upgrade
-  maintenance_window            = var.maintenance_window
-  at_rest_encryption_enabled    = var.at_rest_encryption_enabled
-  transit_encryption_enabled    = var.transit_encryption_enabled
-  auth_token                    = var.auth_token
-  kms_key_id                    = var.kms_key_id
-  tags                          = module.labels.tags
+  count                      = var.enable && var.replication_enabled ? 1 : 0
+  engine                     = var.engine
+  replication_group_id       = module.labels.id
+  description                = module.labels.id
+  engine_version             = var.engine_version
+  port                       = var.port
+  parameter_group_name       = var.parameter_group_name
+  node_type                  = var.node_type
+  automatic_failover_enabled = var.automatic_failover_enabled
+  subnet_group_name          = join("", aws_elasticache_subnet_group.default.*.name)
+  security_group_ids         = var.security_group_ids
+  security_group_names       = var.security_group_names
+  snapshot_arns              = var.snapshot_arns
+  snapshot_name              = var.snapshot_name
+  notification_topic_arn     = var.notification_topic_arn
+  snapshot_window            = var.snapshot_window
+  snapshot_retention_limit   = var.snapshot_retention_limit
+  apply_immediately          = var.apply_immediately
+  availability_zones         = slice(var.availability_zones, 0, var.num_cache_clusters)
+  num_cache_clusters         = var.num_cache_clusters
+  auto_minor_version_upgrade = var.auto_minor_version_upgrade
+  maintenance_window         = var.maintenance_window
+  at_rest_encryption_enabled = var.at_rest_encryption_enabled
+  transit_encryption_enabled = var.transit_encryption_enabled
+  auth_token                 = var.auth_token
+  kms_key_id                 = var.kms_key_id
+  tags                       = module.labels.tags
 
   dynamic "log_delivery_configuration" {
     for_each = var.log_delivery_configuration
@@ -85,32 +85,32 @@ resource "aws_elasticache_replication_group" "default" {
 # Module      : Elasticache Replication Group
 # Description : Terraform module which creates cluster for Elasticache Redis.
 resource "aws_elasticache_replication_group" "cluster" {
-  count                         = var.enable && var.cluster_replication_enabled ? 1 : 0
-  engine                        = var.engine
-  replication_group_id          = module.labels.id
-  replication_group_description = module.labels.id
-  engine_version                = var.engine_version
-  port                          = var.port
-  parameter_group_name          = var.parameter_group_name
-  node_type                     = var.node_type
-  automatic_failover_enabled    = var.automatic_failover_enabled
-  subnet_group_name             = join("", aws_elasticache_subnet_group.default.*.name)
-  security_group_ids            = var.security_group_ids
-  security_group_names          = var.security_group_names
-  snapshot_arns                 = var.snapshot_arns
-  snapshot_name                 = var.snapshot_name
-  notification_topic_arn        = var.notification_topic_arn
-  snapshot_window               = var.snapshot_window
-  snapshot_retention_limit      = var.snapshot_retention_limit
-  apply_immediately             = var.apply_immediately
-  availability_zones            = slice(var.availability_zones, 0, var.num_node_groups)
-  auto_minor_version_upgrade    = var.auto_minor_version_upgrade
-  maintenance_window            = var.maintenance_window
-  at_rest_encryption_enabled    = var.at_rest_encryption_enabled
-  transit_encryption_enabled    = var.transit_encryption_enabled
-  auth_token                    = var.auth_token
-  kms_key_id                    = var.kms_key_id
-  tags                          = module.labels.tags
+  count                      = var.enable && var.cluster_replication_enabled ? 1 : 0
+  engine                     = var.engine
+  replication_group_id       = module.labels.id
+  description                = module.labels.id
+  engine_version             = var.engine_version
+  port                       = var.port
+  parameter_group_name       = var.parameter_group_name
+  node_type                  = var.node_type
+  automatic_failover_enabled = var.automatic_failover_enabled
+  subnet_group_name          = join("", aws_elasticache_subnet_group.default.*.name)
+  security_group_ids         = var.security_group_ids
+  security_group_names       = var.security_group_names
+  snapshot_arns              = var.snapshot_arns
+  snapshot_name              = var.snapshot_name
+  notification_topic_arn     = var.notification_topic_arn
+  snapshot_window            = var.snapshot_window
+  snapshot_retention_limit   = var.snapshot_retention_limit
+  apply_immediately          = var.apply_immediately
+  availability_zones         = slice(var.availability_zones, 0, var.num_node_groups)
+  auto_minor_version_upgrade = var.auto_minor_version_upgrade
+  maintenance_window         = var.maintenance_window
+  at_rest_encryption_enabled = var.at_rest_encryption_enabled
+  transit_encryption_enabled = var.transit_encryption_enabled
+  auth_token                 = var.auth_token
+  kms_key_id                 = var.kms_key_id
+  tags                       = module.labels.tags
   cluster_mode {
     replicas_per_node_group = var.replicas_per_node_group #Replicas per Shard
     num_node_groups         = var.num_node_groups         #Number of Shards
diff --git a/variables.tf b/variables.tf
@@ -148,7 +148,7 @@ variable "availability_zones" {
   description = "A list of EC2 availability zones in which the replication group's cache clusters will be created. The order of the availability zones in the list is not important."
 }
 
-variable "number_cache_clusters" {
+variable "num_cache_clusters" {
   type        = string
   default     = ""
   description = "(Required for Cluster Mode Disabled) The number of cache clusters (primary and replicas) this replication group will have. If Multi-AZ is enabled, the value of this parameter must be at least 2. Updates will occur before other modifications."

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ Here are some examples of how you can use this module in your inventory structur`
`92`	`92`	`security_group_ids = ["sg-xxxxxxxxx"]`
`93`	`93`	`availability_zones = ["eu-west-1a","eu-west-1b" ]`
`94`	`94`	`auto_minor_version_upgrade = true`
`95`		`- number_cache_clusters = 2`
	`95`	`+ num_cache_clusters = 2`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	```
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ usage : \|-`
`58`	`58`	`security_group_ids = ["sg-xxxxxxxxx"]`
`59`	`59`	`availability_zones = ["eu-west-1a","eu-west-1b" ]`
`60`	`60`	`auto_minor_version_upgrade = true`
`61`		`- number_cache_clusters = 2`
	`61`	`+ num_cache_clusters = 2`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	```
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ variable "availability_zones" {`
`148`	`148`	`description = "A list of EC2 availability zones in which the replication group's cache clusters will be created. The order of the availability zones in the list is not important."`
`149`	`149`	`}`
`150`	`150`
`151`		`-variable "number_cache_clusters" {`
	`151`	`+variable "num_cache_clusters" {`
`152`	`152`	`type = string`
`153`	`153`	`default = ""`
`154`	`154`	`description = "(Required for Cluster Mode Disabled) The number of cache clusters (primary and replicas) this replication group will have. If Multi-AZ is enabled, the value of this parameter must be at least 2. Updates will occur before other modifications."`