Skip to content

Commit 8cdd297

Browse files
committed
Fix code format issues
Signed-off-by: Arthur Diniz <[email protected]>
1 parent 05d31f4 commit 8cdd297

File tree

7 files changed

+43
-44
lines changed

7 files changed

+43
-44
lines changed

alb.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ resource "aws_lb" "ecs" {
1616
for_each = compact([var.lb_access_logs_bucket])
1717

1818
content {
19-
bucket = var.lb_access_logs_bucket
20-
prefix = var.lb_access_logs_prefix
19+
bucket = var.lb_access_logs_bucket
20+
prefix = var.lb_access_logs_prefix
2121
enabled = true
2222
}
2323
}

asg.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ resource "aws_autoscaling_group" "ecs" {
3737
map("key", "Name", "value", "ecs-node-${var.name}", "propagate_at_launch", true)
3838
]
3939

40-
target_group_arns = var.target_group_arns
40+
target_group_arns = var.target_group_arns
4141
health_check_grace_period = var.autoscaling_health_check_grace_period
42-
default_cooldown = var.autoscaling_default_cooldown
42+
default_cooldown = var.autoscaling_default_cooldown
4343
lifecycle {
4444
create_before_destroy = true
4545
}

cloutwatch-alarms.tf

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
resource "aws_cloudwatch_metric_alarm" "high_memory" {
22
count = length(var.alarm_sns_topics) > 0 ? 1 : 0
33

4-
alarm_name = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-high-memory"
5-
comparison_operator = "GreaterThanOrEqualToThreshold"
6-
evaluation_periods = "3"
7-
metric_name = "MemoryUtilization"
8-
namespace = "AWS/ECS"
9-
period = "300"
10-
statistic = "Maximum"
11-
threshold = "80"
12-
alarm_description = "Cluster node memory above threshold"
13-
alarm_actions = var.alarm_sns_topics
14-
ok_actions = var.alarm_sns_topics
4+
alarm_name = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-high-memory"
5+
comparison_operator = "GreaterThanOrEqualToThreshold"
6+
evaluation_periods = "3"
7+
metric_name = "MemoryUtilization"
8+
namespace = "AWS/ECS"
9+
period = "300"
10+
statistic = "Maximum"
11+
threshold = "80"
12+
alarm_description = "Cluster node memory above threshold"
13+
alarm_actions = var.alarm_sns_topics
14+
ok_actions = var.alarm_sns_topics
1515

1616
dimensions = {
1717
ClusterName = aws_ecs_cluster.ecs.name
@@ -21,17 +21,17 @@ resource "aws_cloudwatch_metric_alarm" "high_memory" {
2121
resource "aws_cloudwatch_metric_alarm" "high_cpu" {
2222
count = length(var.alarm_sns_topics) > 0 ? 1 : 0
2323

24-
alarm_name = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-high-cpu"
25-
comparison_operator = "GreaterThanOrEqualToThreshold"
26-
evaluation_periods = "3"
27-
metric_name = "CPUUtilization"
28-
namespace = "AWS/ECS"
29-
period = "300"
30-
statistic = "Maximum"
31-
threshold = "80"
32-
alarm_description = "Cluster node CPU above threshold"
33-
alarm_actions = var.alarm_sns_topics
34-
ok_actions = var.alarm_sns_topics
24+
alarm_name = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-high-cpu"
25+
comparison_operator = "GreaterThanOrEqualToThreshold"
26+
evaluation_periods = "3"
27+
metric_name = "CPUUtilization"
28+
namespace = "AWS/ECS"
29+
period = "300"
30+
statistic = "Maximum"
31+
threshold = "80"
32+
alarm_description = "Cluster node CPU above threshold"
33+
alarm_actions = var.alarm_sns_topics
34+
ok_actions = var.alarm_sns_topics
3535

3636
dimensions = {
3737
ClusterName = aws_ecs_cluster.ecs.name

efs-backup.tf

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ resource "aws_backup_plan" "bkp_efs_plan" {
88
name = "Backup-${var.name}"
99

1010
rule {
11-
rule_name = "Daily-Backup-${var.name}"
12-
target_vault_name = aws_backup_vault.nfs.*.name[count.index]
13-
schedule = "cron(0 22 * * ? *)"
14-
lifecycle{
15-
delete_after = var.expire_backup_efs
11+
rule_name = "Daily-Backup-${var.name}"
12+
target_vault_name = aws_backup_vault.nfs.*.name[count.index]
13+
schedule = "cron(0 22 * * ? *)"
14+
lifecycle {
15+
delete_after = var.expire_backup_efs
1616
}
17-
1817
}
1918
}
2019

2120
resource "aws_iam_role" "efs_backup_role" {
2221
count = var.expire_backup_efs > 0 ? 1 : 0
23-
22+
2423
name = "Backup-efs-${var.name}"
2524
assume_role_policy = <<POLICY
2625
{
@@ -40,15 +39,15 @@ POLICY
4039

4140
resource "aws_iam_role_policy_attachment" "efs_backup_role" {
4241
count = var.expire_backup_efs > 0 ? 1 : 0
43-
42+
4443
policy_arn = "arn:aws:iam::aws:policy/service-role/AWSBackupServiceRolePolicyForBackup"
4544
role = aws_iam_role.efs_backup_role.*.name[count.index]
4645
}
4746

4847

4948
resource "aws_backup_selection" "example" {
5049
count = var.expire_backup_efs > 0 ? 1 : 0
51-
50+
5251
iam_role_arn = aws_iam_role.efs_backup_role.*.arn[count.index]
5352
name = "Backup-efs-${var.name}"
5453
plan_id = aws_backup_plan.bkp_efs_plan.*.id[count.index]

efs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ resource "aws_efs_mount_target" "ecs" {
2121
]
2222

2323
lifecycle {
24-
ignore_changes = [ subnet_id ]
24+
ignore_changes = [subnet_id]
2525
}
2626
}
2727

example/ecs-app.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ module "ecs_app_wordpress_01" {
99
name = "wordpress-01"
1010
image = "nginxdemos/hello:latest"
1111
container_port = 80
12-
hostname = "wp01.labs.dnx.host" # signed by cf_certificate_arn
13-
hostname_blue = "wp01-blue.labs.dnx.host" # signed by cf_certificate_arn
14-
hostname_origin = "wp01-origin.labs.dnx.host" # signed by alb_certificate_arn
12+
hostname = "wp01.labs.dnx.host" # signed by cf_certificate_arn
13+
hostname_blue = "wp01-blue.labs.dnx.host" # signed by cf_certificate_arn
14+
hostname_origin = "wp01-origin.labs.dnx.host" # signed by alb_certificate_arn
1515
hosted_zone = "labs.dnx.host"
16-
certificate_arn = local.workspace["cf_certificate_arn"] # goes on cloudfront
16+
certificate_arn = local.workspace["cf_certificate_arn"] # goes on cloudfront
1717
alb_cloudfront_key = module.ecs_apps.alb_cloudfront_key
1818

1919
# use these values for Wordpress

waf.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
resource "aws_wafregional_web_acl_association" "alb" {
2-
count = var.alb && !var.alb_only ? 1 : 0
2+
count = var.alb && ! var.alb_only ? 1 : 0
33

44
resource_arn = aws_lb.ecs[0].arn
55
web_acl_id = aws_wafregional_web_acl.alb[0].id
66
}
77

88
resource "aws_wafregional_web_acl" "alb" {
9-
count = var.alb && !var.alb_only ? 1 : 0
9+
count = var.alb && ! var.alb_only ? 1 : 0
1010

1111
depends_on = [aws_wafregional_rule.alb_header]
1212
name = "alb_ecs_${var.name}"
@@ -28,7 +28,7 @@ resource "aws_wafregional_web_acl" "alb" {
2828
}
2929

3030
resource "aws_wafregional_rule" "alb_header" {
31-
count = var.alb && !var.alb_only ? 1 : 0
31+
count = var.alb && ! var.alb_only ? 1 : 0
3232

3333
depends_on = [aws_wafregional_byte_match_set.alb_header]
3434
name = "alb_cloudfront_header_ecs_${var.name}"
@@ -47,7 +47,7 @@ resource "random_string" "alb_cloudfront_key" {
4747
}
4848

4949
resource "aws_wafregional_byte_match_set" "alb_header" {
50-
count = var.alb && !var.alb_only ? 1 : 0
50+
count = var.alb && ! var.alb_only ? 1 : 0
5151

5252
name = "alb_cloudfront_header_ecs_${var.name}"
5353

0 commit comments

Comments
 (0)