Skip to content

Commit 459abc2

Browse files
committed
fix: Revert - Enable transit_encryption_enabled for all avialble engines now that Elasticache supports this terraform-aws-modules#56
1 parent 9e7317e commit 459abc2

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.100.1
3+
rev: v1.101.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_wrapper_module_for_each

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ No modules.
464464
| <a name="input_subnet_ids"></a> [subnet\_ids](#input\_subnet\_ids) | List of VPC Subnet IDs for the Elasticache subnet group | `list(string)` | `[]` | no |
465465
| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to add to all resources | `map(string)` | `{}` | no |
466466
| <a name="input_timeouts"></a> [timeouts](#input\_timeouts) | Define maximum timeout for creating, updating, and deleting cluster resource | `map(string)` | `{}` | no |
467-
| <a name="input_transit_encryption_enabled"></a> [transit\_encryption\_enabled](#input\_transit\_encryption\_enabled) | Enable encryption in-transit. Supported on replication groups running Valkey 7.2 and later, and Redis OSS versions 3.2.6, 4.0.10 and later, running in a VPC | `bool` | `true` | no |
468-
| <a name="input_transit_encryption_mode"></a> [transit\_encryption\_mode](#input\_transit\_encryption\_mode) | A setting that enables clients to migrate to in-transit encryption with no downtime. Valid values are preferred and required | `string` | `null` | no |
467+
| <a name="input_transit_encryption_enabled"></a> [transit\_encryption\_enabled](#input\_transit\_encryption\_enabled) | Enable encryption in-transit | `bool` | `true` | no |
468+
| <a name="input_transit_encryption_mode"></a> [transit\_encryption\_mode](#input\_transit\_encryption\_mode) | A setting that enables clients to migrate to in-transit encryption with no downtime. Valid values are `preferred` and `required` | `string` | `null` | no |
469469
| <a name="input_user_group_ids"></a> [user\_group\_ids](#input\_user\_group\_ids) | User Group ID to associate with the replication group. Only a maximum of one (1) user group ID is valid | `list(string)` | `null` | no |
470470
| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | Identifier of the VPC where the security group will be created | `string` | `null` | no |
471471

main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ resource "aws_elasticache_cluster" "this" {
5353
snapshot_retention_limit = local.in_replication_group ? null : var.snapshot_retention_limit
5454
snapshot_window = local.in_replication_group ? null : var.snapshot_window
5555
subnet_group_name = local.in_replication_group ? null : local.subnet_group_name
56-
transit_encryption_enabled = var.transit_encryption_enabled
56+
# ToDo - remove restriction at next breaking change https://github.com/terraform-aws-modules/terraform-aws-elasticache/pull/56
57+
transit_encryption_enabled = var.engine == "memcached" ? var.transit_encryption_enabled : null
5758

5859
tags = local.tags
5960

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ variable "snapshot_window" {
176176
}
177177

178178
variable "transit_encryption_enabled" {
179-
description = "Enable encryption in-transit. Supported on replication groups running Valkey 7.2 and later, and Redis OSS versions 3.2.6, 4.0.10 and later, running in a VPC"
179+
description = "Enable encryption in-transit"
180180
type = bool
181181
default = true
182182
}
183183

184184
variable "transit_encryption_mode" {
185-
description = "A setting that enables clients to migrate to in-transit encryption with no downtime. Valid values are preferred and required"
185+
description = "A setting that enables clients to migrate to in-transit encryption with no downtime. Valid values are `preferred` and `required`"
186186
type = string
187187
default = null
188188
}

0 commit comments

Comments
 (0)