Skip to content

Commit 7cccf78

Browse files
feat: added version.tf in example
1 parent 41613e6 commit 7cccf78

File tree

10 files changed

+36
-81
lines changed

10 files changed

+36
-81
lines changed

README.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ usage : |-
6262
automatic_failover_enabled = false
6363
multi_az_enabled = false
6464
num_cache_clusters = 1
65-
replicas_per_node_group = 1
6665
retention_in_days = 0
6766
snapshot_retention_limit = 7
6867
@@ -112,7 +111,6 @@ usage : |-
112111
node_type = "cache.t2.micro"
113112
subnet_ids = module.subnets.public_subnet_id
114113
availability_zones = ["eu-west-1a", "eu-west-1b"]
115-
replicas_per_node_group = 2
116114
num_cache_nodes = 1
117115
snapshot_retention_limit = 7
118116
automatic_failover_enabled = true

_example/memcached/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ module "memcached" {
5959
memcached_route53_record_enabled = true
6060
engine = "memcached"
6161
engine_version = "1.6.17"
62-
family = "memcached1.5"
6362
parameter_group_name = ""
6463
az_mode = "cross-az"
6564
port = 11211
@@ -81,4 +80,4 @@ module "memcached" {
8180
route53_type = "CNAME"
8281
route53_zone_id = "SERFxxxx6XCsY9Lxxxxx"
8382

84-
}
83+
}

_example/memcached/outputs.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
output "id" {
2-
value = module.memcached.*.id
2+
value = module.memcached[*].id
33
description = "memcached id."
44
}
55

@@ -21,4 +21,4 @@ output "hostname" {
2121
output "redis_ssm_arn" {
2222
value = module.memcached.Memcached_ssm_name
2323
description = "A map of the names and ARNs created"
24-
}
24+
}

_example/redis-cluster/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ module "redis-cluster" {
6464
node_type = "cache.t2.micro"
6565
subnet_ids = module.subnets.public_subnet_id
6666
availability_zones = ["eu-west-1a", "eu-west-1b"]
67-
replicas_per_node_group = 2
6867
num_cache_nodes = 1
6968
snapshot_retention_limit = 7
7069
automatic_failover_enabled = true

_example/redis-cluster/outputs.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ output "tags" {
99
}
1010

1111
output "redis_endpoint" {
12-
value = module.redis-cluster.*.redis_endpoint
12+
value = module.redis-cluster[*].redis_endpoint
1313
description = "Redis endpoint address."
1414
}
1515

@@ -21,4 +21,4 @@ output "hostname" {
2121
output "redis_ssm_arn" {
2222
value = module.redis-cluster.redis_ssm_name
2323
description = "A map of the names and ARNs created"
24-
}
24+
}

_example/redis/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ module "redis" {
6868
automatic_failover_enabled = false
6969
multi_az_enabled = false
7070
num_cache_clusters = 1
71-
replicas_per_node_group = 1
7271
retention_in_days = 0
7372
snapshot_retention_limit = 7
7473

_example/redis/outputs.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
output "id" {
2-
value = module.redis.*.id
2+
value = module.redis[*].id
33
description = "Redis cluster id."
44
}
55

@@ -14,17 +14,17 @@ output "redis_endpoint" {
1414
}
1515

1616
output "sg_id" {
17-
value = module.redis.*.sg_id
17+
value = module.redis[*].sg_id
1818
description = "of the security group id."
1919
}
2020

2121
output "hostname" {
22-
value = module.redis.*.hostname
22+
value = module.redis[*].hostname
2323
description = "DNS hostname"
2424
}
2525

2626

2727
output "redis_ssm_arn" {
2828
value = module.redis.redis_ssm_name
2929
description = "A map of the names and ARNs created"
30-
}
30+
}

main.tf

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ resource "aws_security_group" "default" {
2929
}
3030
}
3131

32-
data "aws_security_group" "existing" {
33-
count = var.is_external ? 1 : 0
34-
id = var.existing_sg_id
35-
vpc_id = var.vpc_id
36-
}
37-
3832
##----------------------------------------------------------------------------------
3933
## Below resources will create SECURITY-GROUP-RULE and its components.
4034
##----------------------------------------------------------------------------------
@@ -48,7 +42,7 @@ resource "aws_security_group_rule" "egress" {
4842
to_port = 65535
4943
protocol = "-1"
5044
cidr_blocks = ["0.0.0.0/0"]
51-
security_group_id = join("", aws_security_group.default.*.id)
45+
security_group_id = join("", aws_security_group.default[*].id)
5246
}
5347
#tfsec:ignore:aws-ec2-no-public-egress-sgr
5448
resource "aws_security_group_rule" "egress_ipv6" {
@@ -60,7 +54,7 @@ resource "aws_security_group_rule" "egress_ipv6" {
6054
to_port = 65535
6155
protocol = "-1"
6256
ipv6_cidr_blocks = ["::/0"]
63-
security_group_id = join("", aws_security_group.default.*.id)
57+
security_group_id = join("", aws_security_group.default[*].id)
6458
}
6559
resource "aws_security_group_rule" "ingress" {
6660
count = length(var.allowed_ip) > 0 == true && length(var.sg_ids) < 1 ? length(compact(var.allowed_ports)) : 0
@@ -71,7 +65,7 @@ resource "aws_security_group_rule" "ingress" {
7165
to_port = element(var.allowed_ports, count.index)
7266
protocol = var.protocol
7367
cidr_blocks = var.allowed_ip
74-
security_group_id = join("", aws_security_group.default.*.id)
68+
security_group_id = join("", aws_security_group.default[*].id)
7569
}
7670

7771
##----------------------------------------------------------------------------------
@@ -95,7 +89,7 @@ resource "aws_kms_alias" "default" {
9589
count = var.kms_key_enabled && var.kms_key_id == "" ? 1 : 0
9690

9791
name = coalesce(var.alias, format("alias/%v", module.labels.id))
98-
target_key_id = var.kms_key_id == "" ? join("", aws_kms_key.default.*.id) : var.kms_key_id
92+
target_key_id = var.kms_key_id == "" ? join("", aws_kms_key.default[*].id) : var.kms_key_id
9993
}
10094

10195
##----------------------------------------------------------------------------------
@@ -113,7 +107,7 @@ data "aws_iam_policy_document" "default" {
113107
identifiers = [
114108
format(
115109
"arn:%s:iam::%s:root",
116-
join("", data.aws_partition.current.*.partition),
110+
join("", data.aws_partition.current[*].partition),
117111
data.aws_caller_identity.current.account_id
118112
)
119113
]
@@ -157,8 +151,8 @@ resource "aws_elasticache_replication_group" "cluster" {
157151
parameter_group_name = var.parameter_group_name
158152
node_type = var.node_type
159153
automatic_failover_enabled = var.automatic_failover_enabled
160-
subnet_group_name = join("", aws_elasticache_subnet_group.default.*.name)
161-
security_group_ids = length(var.sg_ids) < 1 ? aws_security_group.default.*.id : var.sg_ids
154+
subnet_group_name = join("", aws_elasticache_subnet_group.default[*].name)
155+
security_group_ids = length(var.sg_ids) < 1 ? aws_security_group.default[*].id : var.sg_ids
162156
security_group_names = var.security_group_names
163157
snapshot_arns = var.snapshot_arns
164158
snapshot_name = var.snapshot_name
@@ -172,15 +166,15 @@ resource "aws_elasticache_replication_group" "cluster" {
172166
transit_encryption_enabled = var.transit_encryption_enabled
173167
multi_az_enabled = var.multi_az_enabled
174168
auth_token = var.auth_token
175-
kms_key_id = var.kms_key_id == "" ? join("", aws_kms_key.default.*.arn) : var.kms_key_id
169+
kms_key_id = var.kms_key_id == "" ? join("", aws_kms_key.default[*].arn) : var.kms_key_id
176170
tags = module.labels.tags
177171
num_cache_clusters = var.num_cache_clusters
178172

179173
dynamic "log_delivery_configuration" {
180174
for_each = var.log_delivery_configuration
181175

182176
content {
183-
destination = lookup(log_delivery_configuration.value, "destination", join("", aws_cloudwatch_log_group.default.*.name))
177+
destination = lookup(log_delivery_configuration.value, "destination", join("", aws_cloudwatch_log_group.default[*].name))
184178
destination_type = lookup(log_delivery_configuration.value, "destination_type", null)
185179
log_format = lookup(log_delivery_configuration.value, "log_format", null)
186180
log_type = lookup(log_delivery_configuration.value, "log_type", null)
@@ -201,8 +195,8 @@ resource "aws_elasticache_cluster" "default" {
201195
az_mode = var.az_mode
202196
parameter_group_name = var.parameter_group_name
203197
node_type = var.node_type
204-
subnet_group_name = join("", aws_elasticache_subnet_group.default.*.name)
205-
security_group_ids = length(var.sg_ids) < 1 ? aws_security_group.default.*.id : var.sg_ids
198+
subnet_group_name = join("", aws_elasticache_subnet_group.default[*].name)
199+
security_group_ids = length(var.sg_ids) < 1 ? aws_security_group.default[*].id : var.sg_ids
206200
snapshot_arns = var.snapshot_arns
207201
snapshot_name = var.snapshot_name
208202
notification_topic_arn = var.notification_topic_arn
@@ -238,7 +232,7 @@ resource "aws_ssm_parameter" "secret" {
238232
description = var.ssm_parameter_description
239233
type = var.ssm_parameter_type
240234
value = var.auth_token
241-
key_id = var.kms_key_id == "" ? join("", aws_kms_key.default.*.arn) : var.kms_key_id
235+
key_id = var.kms_key_id == "" ? join("", aws_kms_key.default[*].arn) : var.kms_key_id
242236
}
243237

244238
##----------------------------------------------------------------------------------
@@ -251,7 +245,7 @@ resource "aws_ssm_parameter" "secret-endpoint" {
251245
description = var.ssm_parameter_description
252246
type = var.ssm_parameter_type
253247
value = var.automatic_failover_enabled ? [join("", aws_elasticache_replication_group.cluster[*].configuration_endpoint_address)][0] : [join("", aws_elasticache_replication_group.cluster[*].primary_endpoint_address)][0]
254-
key_id = var.kms_key_id == "" ? join("", aws_kms_key.default.*.arn) : var.kms_key_id
248+
key_id = var.kms_key_id == "" ? join("", aws_kms_key.default[*].arn) : var.kms_key_id
255249
}
256250

257251
##----------------------------------------------------------------------------------
@@ -264,7 +258,7 @@ resource "aws_route53_record" "memcached_route_53" {
264258
zone_id = var.route53_zone_id
265259
type = var.route53_type
266260
ttl = var.route53_ttl
267-
records = aws_elasticache_cluster.default.*.configuration_endpoint
261+
records = aws_elasticache_cluster.default[*].configuration_endpoint
268262
}
269263

270264
##----------------------------------------------------------------------------------
@@ -276,6 +270,6 @@ resource "aws_ssm_parameter" "memcached_secret-endpoint" {
276270
name = format("/%s/%s/memcached-endpoint", var.environment, var.name)
277271
description = var.ssm_parameter_description
278272
type = var.ssm_parameter_type
279-
value = join("", aws_elasticache_cluster.default.*.configuration_endpoint)
280-
key_id = var.kms_key_id == "" ? join("", aws_kms_key.default.*.arn) : var.kms_key_id
281-
}
273+
value = join("", aws_elasticache_cluster.default[*].configuration_endpoint)
274+
key_id = var.kms_key_id == "" ? join("", aws_kms_key.default[*].arn) : var.kms_key_id
275+
}

outputs.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Module : Redis
22
# Description : Terraform module to create Elasticache Cluster and replica for Redis.
33
output "id" {
4-
value = var.cluster_enabled ? "" : (var.cluster_replication_enabled ? join("", aws_elasticache_replication_group.cluster.*.id) : join("", aws_elasticache_replication_group.cluster.*.id))
4+
value = var.cluster_enabled ? "" : (var.cluster_replication_enabled ? join("", aws_elasticache_replication_group.cluster[*].id) : join("", aws_elasticache_replication_group.cluster[*].id))
55
description = "Redis cluster id."
66
}
77

@@ -17,7 +17,7 @@ output "tags" {
1717
}
1818

1919
output "redis_endpoint" {
20-
value = var.cluster_replication_enabled ? "" : (var.cluster_replication_enabled ? join("", aws_elasticache_replication_group.cluster.*.primary_endpoint_address) : join("", aws_elasticache_cluster.default.*.configuration_endpoint))
20+
value = var.cluster_replication_enabled ? "" : (var.cluster_replication_enabled ? join("", aws_elasticache_replication_group.cluster[*].primary_endpoint_address) : join("", aws_elasticache_cluster.default[*].configuration_endpoint))
2121
description = "Redis endpoint address."
2222
}
2323

@@ -27,7 +27,7 @@ output "redis_arn" {
2727
}
2828

2929
output "memcached_endpoint" {
30-
value = var.cluster_enabled ? join("", aws_elasticache_cluster.default.*.configuration_endpoint) : ""
30+
value = var.cluster_enabled ? join("", aws_elasticache_cluster.default[*].configuration_endpoint) : ""
3131
description = "Memcached endpoint address."
3232
}
3333

@@ -37,25 +37,25 @@ output "memcached_arn" {
3737
}
3838

3939
output "sg_id" {
40-
value = join("", aws_security_group.default.*.id)
40+
value = join("", aws_security_group.default[*].id)
4141
}
4242

4343
output "hostname" {
44-
value = join("", aws_route53_record.elasticache.*.fqdn)
44+
value = join("", aws_route53_record.elasticache[*].fqdn)
4545
description = "DNS hostname"
4646
}
4747

4848
output "memcached_hostname" {
49-
value = join("", aws_route53_record.memcached_route_53.*.fqdn)
49+
value = join("", aws_route53_record.memcached_route_53[*].fqdn)
5050
description = "DNS hostname"
5151
}
5252

5353
output "redis_ssm_name" {
54-
value = join("", aws_ssm_parameter.secret-endpoint.*.name)
54+
value = join("", aws_ssm_parameter.secret-endpoint[*].name)
5555
description = "A list of all of the parameter values"
5656
}
5757

5858
output "Memcached_ssm_name" {
59-
value = join("", aws_ssm_parameter.memcached_secret-endpoint.*.name)
59+
value = join("", aws_ssm_parameter.memcached_secret-endpoint[*].name)
6060
description = "A list of all of the parameter values"
6161
}

variables.tf

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ variable "label_order" {
2929
description = "Label order, e.g. `name`,`application`."
3030
}
3131

32-
variable "attributes" {
33-
type = list(any)
34-
default = []
35-
description = "Additional attributes (e.g. `1`)."
36-
}
37-
3832
variable "extra_tags" {
3933
type = map(string)
4034
default = {}
@@ -59,13 +53,6 @@ variable "engine" {
5953
description = "The name of the cache engine to be used for the clusters in this replication group. e.g. redis."
6054
}
6155

62-
variable "replication_group_id" {
63-
type = string
64-
default = ""
65-
description = "The replication group identifier This parameter is stored as a lowercase string."
66-
sensitive = true
67-
}
68-
6956
variable "automatic_failover_enabled" {
7057
type = bool
7158
default = true
@@ -92,11 +79,13 @@ variable "node_type" {
9279
}
9380

9481
variable "security_group_names" {
82+
type = list(string)
9583
default = null
9684
description = "A list of cache security group names to associate with this replication group."
9785
}
9886

9987
variable "snapshot_arns" {
88+
type = list(string)
10089
default = null
10190
description = "A single-element string list containing an Amazon Resource Name (ARN) of a Redis RDB snapshot file stored in Amazon S3."
10291
}
@@ -192,12 +181,6 @@ variable "auth_token" {
192181
description = "The password used to access a password protected server. Can be specified only if transit_encryption_enabled = true."
193182
}
194183

195-
variable "family" {
196-
type = string
197-
default = ""
198-
description = "(Required) The family of the ElastiCache parameter group."
199-
}
200-
201184
variable "cluster_replication_enabled" {
202185
type = bool
203186
default = false
@@ -224,12 +207,6 @@ variable "az_mode" {
224207
description = "(Memcached only) Specifies whether the nodes in this Memcached node group are created in a single Availability Zone or created across multiple Availability Zones in the cluster's region. Valid values for this parameter are single-az or cross-az, default is single-az. If you want to choose cross-az, num_cache_nodes must be greater than 1."
225208
}
226209

227-
variable "replicas_per_node_group" {
228-
type = number
229-
default = 2
230-
description = "Replicas per Shard."
231-
}
232-
233210
variable "parameter_group_name" {
234211
type = string
235212
default = "default.redis5.0"
@@ -432,11 +409,6 @@ variable "route53_zone_id" {
432409

433410
###------------------------------- ssm_parameter----------------------------
434411

435-
variable "ssm_parameter_enabled" {
436-
type = bool
437-
default = true
438-
description = "Name of the parameter."
439-
}
440412
variable "ssm_parameter_endpoint_enabled" {
441413
type = bool
442414
default = false
@@ -460,9 +432,3 @@ variable "ssm_parameter_type" {
460432
default = "SecureString"
461433
description = "Type of the parameter."
462434
}
463-
464-
variable "ssm_paramete_kms_key_id" {
465-
type = string
466-
default = ""
467-
description = "KMS key ID or ARN for encrypting a SecureString."
468-
}

0 commit comments

Comments
 (0)