Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reafac: use kebab case for resource names #9

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flagsmith-on-ecs/terraform/04_loadbalancer.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -83,4 +83,4 @@ resource "aws_alb_listener_rule" "host_header" {
type = "forward"
target_group_arn = aws_alb_target_group.default-target-group.arn
}
}
}
10 changes: 5 additions & 5 deletions flagsmith-on-ecs/terraform/05_iam.tf
Original file line number Diff line number Diff line change
@@ -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")
}
Expand Down Expand Up @@ -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"
Expand All @@ -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
}
8 changes: 4 additions & 4 deletions flagsmith-on-ecs/terraform/09_ecs_service.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

}

Expand All @@ -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
Expand All @@ -54,4 +54,4 @@ resource "aws_ecs_service" "flagsmith-svc" {
lifecycle {
ignore_changes = [task_definition, desired_count]
}
}
}
30 changes: 15 additions & 15 deletions flagsmith-on-ecs/terraform/10_secrets.tf
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion flagsmith-on-ecs/terraform/11_rds.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading