Skip to content

Commit 2f43d57

Browse files
authored
fix: Use lookup() for VPC name getting (#40)
1 parent e88714e commit 2f43d57

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

cloudwatch.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
resource "aws_cloudwatch_metric_alarm" "cache_cpu" {
77
count = "${var.redis_clusters}"
88
9-
alarm_name = "alarm-${var.name}-${data.aws_vpc.vpc.tags["Name"]}-CacheCluster00${count.index + 1}CPUUtilization"
9+
alarm_name = "alarm-${var.name}-${local.vpc_name}-CacheCluster00${count.index + 1}CPUUtilization"
1010
alarm_description = "Redis cluster CPU utilization"
1111
comparison_operator = "GreaterThanThreshold"
1212
evaluation_periods = "1"
@@ -27,7 +27,7 @@ resource "aws_cloudwatch_metric_alarm" "cache_cpu" {
2727
resource "aws_cloudwatch_metric_alarm" "cache_memory" {
2828
count = "${var.redis_clusters}"
2929
30-
alarm_name = "alarm-${var.name}-${data.aws_vpc.vpc.tags["Name"]}-CacheCluster00${count.index + 1}FreeableMemory"
30+
alarm_name = "alarm-${var.name}-${local.vpc_name}-CacheCluster00${count.index + 1}FreeableMemory"
3131
alarm_description = "Redis cluster freeable memory"
3232
comparison_operator = "LessThanThreshold"
3333
evaluation_periods = "1"

main.tf

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ data "aws_vpc" "vpc" {
22
id = var.vpc_id
33
}
44

5+
locals {
6+
vpc_name = lookup(data.aws_vpc.vpc.tags, "Name", var.vpc_id)
7+
}
8+
59
resource "random_id" "salt" {
610
byte_length = 8
711
keepers = {
@@ -11,7 +15,7 @@ resource "random_id" "salt" {
1115

1216
resource "aws_elasticache_replication_group" "redis" {
1317
replication_group_id = format("%.20s", "${var.name}-${var.env}")
14-
replication_group_description = "Terraform-managed ElastiCache replication group for ${var.name}-${var.env}-${data.aws_vpc.vpc.tags["Name"]}"
18+
replication_group_description = "Terraform-managed ElastiCache replication group for ${var.name}-${var.env}-${local.vpc_name}"
1519
number_cache_clusters = var.redis_clusters
1620
node_type = var.redis_node_type
1721
automatic_failover_enabled = var.redis_failover
@@ -24,13 +28,13 @@ resource "aws_elasticache_replication_group" "redis" {
2428
maintenance_window = var.redis_maintenance_window
2529
snapshot_window = var.redis_snapshot_window
2630
snapshot_retention_limit = var.redis_snapshot_retention_limit
27-
tags = merge(map("Name", format("tf-elasticache-%s-%s", var.name, lookup(data.aws_vpc.vpc.tags, "Name", ""))), var.tags)
31+
tags = merge(map("Name", format("tf-elasticache-%s-%s", var.name, local.vpc_name)), var.tags)
2832
}
2933

3034
resource "aws_elasticache_parameter_group" "redis_parameter_group" {
31-
name = replace(format("%.255s", lower(replace("tf-redis-${var.name}-${var.env}-${data.aws_vpc.vpc.tags["Name"]}-${random_id.salt.hex}", "_", "-"))), "/\\s/", "-")
35+
name = replace(format("%.255s", lower(replace("tf-redis-${var.name}-${var.env}-${local.vpc_name}-${random_id.salt.hex}", "_", "-"))), "/\\s/", "-")
3236

33-
description = "Terraform-managed ElastiCache parameter group for ${var.name}-${var.env}-${data.aws_vpc.vpc.tags["Name"]}"
37+
description = "Terraform-managed ElastiCache parameter group for ${var.name}-${var.env}-${local.vpc_name}"
3438

3539
# Strip the patch version from redis_version var
3640
family = "redis${replace(var.redis_version, "/\\.[\\d]+$/", "")}"
@@ -48,6 +52,6 @@ resource "aws_elasticache_parameter_group" "redis_parameter_group" {
4852
}
4953

5054
resource "aws_elasticache_subnet_group" "redis_subnet_group" {
51-
name = replace(format("%.255s", lower(replace("tf-redis-${var.name}-${var.env}-${data.aws_vpc.vpc.tags["Name"]}", "_", "-"))), "/\\s/", "-")
55+
name = replace(format("%.255s", lower(replace("tf-redis-${var.name}-${var.env}-${local.vpc_name}", "_", "-"))), "/\\s/", "-")
5256
subnet_ids = var.subnets
5357
}

security_groups.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
resource "aws_security_group" "redis_security_group" {
2-
name = format("%.255s", "tf-sg-ec-${var.name}-${var.env}-${data.aws_vpc.vpc.tags["Name"]}")
3-
description = "Terraform-managed ElastiCache security group for ${var.name}-${var.env}-${data.aws_vpc.vpc.tags["Name"]}"
2+
name = format("%.255s", "tf-sg-ec-${var.name}-${var.env}-${local.vpc_name}")
3+
description = "Terraform-managed ElastiCache security group for ${var.name}-${var.env}-${local.vpc_name}"
44
vpc_id = data.aws_vpc.vpc.id
55

66
tags = {
7-
Name = "tf-sg-ec-${var.name}-${var.env}-${data.aws_vpc.vpc.tags["Name"]}"
7+
Name = "tf-sg-ec-${var.name}-${var.env}-${local.vpc_name}"
88
}
99
}
1010

0 commit comments

Comments
 (0)