From 27f27173a0d3a7d9dbb64b559ef10423487b41d7 Mon Sep 17 00:00:00 2001 From: Gagan Trivedi Date: Tue, 26 Mar 2024 13:16:24 +0530 Subject: [PATCH] reafac: use kebab case for resource names --- flagsmith-on-ecs/terraform/04_loadbalancer.tf | 4 +-- flagsmith-on-ecs/terraform/05_iam.tf | 10 +++---- flagsmith-on-ecs/terraform/09_ecs_service.tf | 8 ++--- flagsmith-on-ecs/terraform/10_secrets.tf | 30 +++++++++---------- flagsmith-on-ecs/terraform/11_rds.tf | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/flagsmith-on-ecs/terraform/04_loadbalancer.tf b/flagsmith-on-ecs/terraform/04_loadbalancer.tf index 714d599..dd6001d 100644 --- a/flagsmith-on-ecs/terraform/04_loadbalancer.tf +++ b/flagsmith-on-ecs/terraform/04_loadbalancer.tf @@ -70,7 +70,7 @@ resource "aws_alb_listener" "ecs-alb-https-listener" { } # matches header with configured flagsmith subdomain -resource "aws_alb_listener_rule" "host_header" { +resource "aws_alb_listener_rule" "host-header" { listener_arn = aws_alb_listener.ecs-alb-https-listener.arn priority = 10 @@ -83,4 +83,4 @@ resource "aws_alb_listener_rule" "host_header" { type = "forward" target_group_arn = aws_alb_target_group.default-target-group.arn } -} \ No newline at end of file +} diff --git a/flagsmith-on-ecs/terraform/05_iam.tf b/flagsmith-on-ecs/terraform/05_iam.tf index 101907e..476b405 100644 --- a/flagsmith-on-ecs/terraform/05_iam.tf +++ b/flagsmith-on-ecs/terraform/05_iam.tf @@ -1,4 +1,4 @@ -resource "aws_iam_role" "ecs_host_role" { +resource "aws_iam_role" "ecs-host-role" { name = "${var.app_name}-ecs-host-role-${var.app_environment}" assume_role_policy = file("policies/ecs-task-role.json") } @@ -29,15 +29,15 @@ resource "aws_iam_role_policy" "ecs-host-role-policy" { ] } ) - role = aws_iam_role.ecs_host_role.id + role = aws_iam_role.ecs-host-role.id } -resource "aws_iam_role" "ecs_task" { +resource "aws_iam_role" "ecs-task" { name = "${var.app_name}-ecs-task" assume_role_policy = file("policies/ecs-task-role.json") } -resource "aws_iam_role_policy" "ecs_task" { +resource "aws_iam_role_policy" "ecs-task" { name = "${var.app_name}-ecs-task-policy" policy = jsonencode({ Version = "2012-10-17" @@ -49,5 +49,5 @@ resource "aws_iam_role_policy" "ecs_task" { } ] }) - role = aws_iam_role.ecs_task.id + role = aws_iam_role.ecs-task.id } diff --git a/flagsmith-on-ecs/terraform/09_ecs_service.tf b/flagsmith-on-ecs/terraform/09_ecs_service.tf index fb4a2b3..02e5b46 100644 --- a/flagsmith-on-ecs/terraform/09_ecs_service.tf +++ b/flagsmith-on-ecs/terraform/09_ecs_service.tf @@ -16,8 +16,8 @@ resource "aws_ecs_task_definition" "app" { network_mode = "awsvpc" cpu = var.cpu memory = var.memory - task_role_arn = aws_iam_role.ecs_task.arn - execution_role_arn = aws_iam_role.ecs_host_role.arn + task_role_arn = aws_iam_role.ecs-task.arn + execution_role_arn = aws_iam_role.ecs-host-role.arn } @@ -27,7 +27,7 @@ resource "aws_ecs_service" "flagsmith-svc" { task_definition = aws_ecs_task_definition.app.arn desired_count = var.app_count ## prevent race condition - iam - depends_on = [aws_alb_listener.ecs-alb-http-listener, aws_iam_role_policy.ecs_task] + depends_on = [aws_alb_listener.ecs-alb-http-listener, aws_iam_role_policy.ecs-task] load_balancer { target_group_arn = aws_alb_target_group.default-target-group.arn @@ -54,4 +54,4 @@ resource "aws_ecs_service" "flagsmith-svc" { lifecycle { ignore_changes = [task_definition, desired_count] } -} \ No newline at end of file +} diff --git a/flagsmith-on-ecs/terraform/10_secrets.tf b/flagsmith-on-ecs/terraform/10_secrets.tf index b236bec..8d60a07 100644 --- a/flagsmith-on-ecs/terraform/10_secrets.tf +++ b/flagsmith-on-ecs/terraform/10_secrets.tf @@ -1,52 +1,52 @@ -data "aws_kms_key" "ssm_kms_key" { +data "aws_kms_key" "ssm-kms-key" { key_id = var.ssm_kms_key } -resource "random_password" "rds_password" { +resource "random_password" "rds-password" { count = var.rds_password == "" ? 1 : 0 length = 15 special = true override_special = "#%!&" } -resource "random_password" "django_secret_key" { +resource "random_password" "django-secret-key" { count = var.django_secret_key == "" ? 1 : 0 length = 25 special = true override_special = "#%!&" } -resource "aws_ssm_parameter" "db_password" { +resource "aws_ssm_parameter" "db-password" { name = "/${var.app_name}/${var.app_environment}/rds_db_password" - value = var.rds_password == "" ? random_password.rds_password[0].result : var.rds_password + value = var.rds_password == "" ? random_password.rds-password[0].result : var.rds_password type = "SecureString" - key_id = data.aws_kms_key.ssm_kms_key.key_id + key_id = data.aws_kms_key.ssm-kms-key.key_id } -resource "aws_ssm_parameter" "db_host" { +resource "aws_ssm_parameter" "db-host" { name = "/${var.app_name}/${var.app_environment}/rds_host" value = aws_db_instance.postgres.address type = "SecureString" - key_id = data.aws_kms_key.ssm_kms_key.key_id + key_id = data.aws_kms_key.ssm-kms-key.key_id } -resource "aws_ssm_parameter" "django_secret_key" { +resource "aws_ssm_parameter" "django-secret-key" { name = "/${var.app_name}/${var.app_environment}/django_secret_key" - value = var.django_secret_key == "" ? random_password.django_secret_key[0].result : var.django_secret_key + value = var.django_secret_key == "" ? random_password.django-secret-key[0].result : var.django_secret_key type = "SecureString" - key_id = data.aws_kms_key.ssm_kms_key.key_id + key_id = data.aws_kms_key.ssm-kms-key.key_id } -resource "aws_ssm_parameter" "rds_username" { +resource "aws_ssm_parameter" "rds-username" { name = "/${var.app_name}/${var.app_environment}/rds_db_username" value = var.rds_username type = "SecureString" - key_id = data.aws_kms_key.ssm_kms_key.key_id + key_id = data.aws_kms_key.ssm-kms-key.key_id } -resource "aws_ssm_parameter" "rds_db_name" { +resource "aws_ssm_parameter" "rds-db-name" { name = "/${var.app_name}/${var.app_environment}/rds_db_name" value = var.rds_db_name type = "SecureString" - key_id = data.aws_kms_key.ssm_kms_key.key_id + key_id = data.aws_kms_key.ssm-kms-key.key_id } diff --git a/flagsmith-on-ecs/terraform/11_rds.tf b/flagsmith-on-ecs/terraform/11_rds.tf index a90a2af..f1d1bbb 100644 --- a/flagsmith-on-ecs/terraform/11_rds.tf +++ b/flagsmith-on-ecs/terraform/11_rds.tf @@ -9,7 +9,7 @@ resource "aws_db_instance" "postgres" { identifier = "${var.app_name}-postgres" db_name = var.rds_db_name username = var.rds_username - password = aws_ssm_parameter.db_password.value + password = aws_ssm_parameter.db-password.value port = "5432" engine = "postgres" engine_version = "14"