Skip to content

Commit

Permalink
fine grain permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewpeng02
andrewpeng02 committed May 17, 2024
1 parent 15f8e69 commit 6169692
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 77 deletions.
19 changes: 1 addition & 18 deletions dlp-terraform/ecs/ecs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,7 @@ data "aws_iam_policy_document" "ecs_task_doc" {
}
}

resource "aws_iam_role" "ecs_task_role" {
name_prefix = "backend-ecs-task-role"
assume_role_policy = data.aws_iam_policy_document.ecs_task_doc.json
}

resource "aws_iam_role_policy_attachment" "ecs_task_role_policy" {
for_each = toset([
"arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess",
"arn:aws:iam::aws:policy/SecretsManagerReadWrite",
"arn:aws:iam::aws:policy/AmazonSQSFullAccess",
"arn:aws:iam::aws:policy/AmazonS3FullAccess"
])

role = aws_iam_role.ecs_task_role.name
policy_arn = each.value
}


# --- ECS Exec Role ---
resource "aws_iam_role" "ecs_exec_role" {
name_prefix = "backend-ecs-exec-role"
assume_role_policy = data.aws_iam_policy_document.ecs_task_doc.json
Expand Down
70 changes: 44 additions & 26 deletions dlp-terraform/ecs/ecs_django_service.tf
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,38 @@
# --- ECS Task Role --- #
resource "aws_iam_role" "django_ecs_task_role" {
name_prefix = "django-ecs-task-role"
assume_role_policy = data.aws_iam_policy_document.ecs_task_doc.json

inline_policy {
name = "django-inline-policy"
policy = data.aws_iam_policy_document.django_inline_policy.json
}
}

data "aws_iam_policy_document" "django_inline_policy" {
statement {
actions = ["secretsmanager:GetSecretValue"]
resources = ["arn:aws:secretsmanager:us-east-1:521654603461:secret:DLP/Firebase/Admin_SDK-8g8IDn"]
}
}

resource "aws_ecs_task_definition" "django" {
family = "django"
task_role_arn = aws_iam_role.ecs_task_role.arn
execution_role_arn = aws_iam_role.ecs_exec_role.arn
network_mode = "awsvpc"
family = "django"
task_role_arn = aws_iam_role.django_ecs_task_role.arn
execution_role_arn = aws_iam_role.ecs_exec_role.arn
network_mode = "awsvpc"
requires_compatibilities = ["FARGATE"]
cpu = 1024
memory = 2048
cpu = 1024
memory = 2048

container_definitions = jsonencode([
{
"name": "django",
"name" : "django",
"image" : "${aws_ecr_repository.django.repository_url}:latest",
"cpu": 1024,
"memory": 2048,
"essential": true,
"portMappings": [
"cpu" : 1024,
"memory" : 2048,
"essential" : true,
"portMappings" : [
{
"name" : "gunicorn-port",
"containerPort" : 8000,
Expand All @@ -31,10 +49,10 @@ resource "aws_ecs_task_definition" "django" {
"awslogs-stream-prefix" : "ecs"
}
},
"environment": [
"environment" : [
{
"name": "ALLOWED_HOST",
"value": "${aws_lb.main.dns_name}"
"name" : "ALLOWED_HOST",
"value" : "${aws_lb.main.dns_name}"
}
]
}
Expand All @@ -50,27 +68,27 @@ resource "aws_security_group" "ecs_django_sg" {
resource "aws_vpc_security_group_ingress_rule" "ecs_django_sg_ingress" {
security_group_id = aws_security_group.ecs_django_sg.id

ip_protocol = "-1"
ip_protocol = "-1"
referenced_security_group_id = aws_security_group.http.id
}
}

resource "aws_vpc_security_group_egress_rule" "ecs_django_sg_egress" {
security_group_id = aws_security_group.ecs_django_sg.id

ip_protocol = "-1"
cidr_ipv4 = "0.0.0.0/0"
}
ip_protocol = "-1"
cidr_ipv4 = "0.0.0.0/0"
}

resource "aws_ecs_service" "django" {
name = "django"
cluster = aws_ecs_cluster.main.id
task_definition = aws_ecs_task_definition.django.arn
desired_count = 2
launch_type = "FARGATE"
desired_count = 1
launch_type = "FARGATE"

network_configuration {
security_groups = [ aws_security_group.ecs_django_sg.id]
subnets = aws_subnet.public[*].id
security_groups = [aws_security_group.ecs_django_sg.id]
subnets = aws_subnet.public[*].id
assign_public_ip = true
}

Expand All @@ -80,9 +98,9 @@ resource "aws_ecs_service" "django" {

load_balancer {
target_group_arn = aws_lb_target_group.app.arn
container_name = "django"
container_port = 8000
container_name = "django"
container_port = 8000
}

depends_on = [aws_lb_target_group.app]
}
}
79 changes: 47 additions & 32 deletions dlp-terraform/ecs/ecs_training_service.tf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
# --- ECS Task Role --- #
resource "aws_iam_role" "training_ecs_task_role" {
name_prefix = "training-ecs-task-role"
assume_role_policy = data.aws_iam_policy_document.ecs_task_doc.json

inline_policy {
name = "training-inline-policy"
policy = data.aws_iam_policy_document.training_inline_policy.json
}
}

data "aws_iam_policy_document" "training_inline_policy" {
statement {
actions = ["sqs:ReceiveMessage"]
resources = [aws_sqs_queue.training_queue.arn]
}

statement {
actions = ["s3:ListBucket", "s3:GetObject"]
resources = [aws_s3_bucket.s3bucket_executions.arn]
}
}

# --- ECS Task Definition --- #
resource "aws_ecs_task_definition" "training" {
family = "training"
task_role_arn = aws_iam_role.ecs_task_role.arn
task_role_arn = aws_iam_role.training_ecs_task_role.arn
execution_role_arn = aws_iam_role.ecs_exec_role.arn
network_mode = "bridge"
cpu = 1024
Expand All @@ -10,15 +34,6 @@ resource "aws_ecs_task_definition" "training" {
{
"name" : "training",
"image" : "${aws_ecr_repository.training.repository_url}:latest",
"portMappings" : [
{
"name" : "gunicorn-port",
"containerPort" : 8000,
"hostPort" : 0,
"protocol" : "tcp",
"appProtocol" : "http"
}
],
"essential" : true,
"environment" : [],
"mountPoints" : [],
Expand Down Expand Up @@ -69,45 +84,45 @@ resource "aws_ecs_service" "training" {

# --- ECS Service Auto Scaling ---
resource "aws_appautoscaling_target" "training_ecs_target" {
service_namespace = "ecs"
service_namespace = "ecs"
scalable_dimension = "ecs:service:DesiredCount"
resource_id = "service/${aws_ecs_cluster.main.name}/${aws_ecs_service.training.name}"
min_capacity = 0
max_capacity = 2
resource_id = "service/${aws_ecs_cluster.main.name}/${aws_ecs_service.training.name}"
min_capacity = 0
max_capacity = 2
}

resource "aws_appautoscaling_policy" "training_ecs_target_cpu" {
name = "training-application-scaling-policy-cpu"
policy_type = "TargetTrackingScaling"
service_namespace = aws_appautoscaling_target.training_ecs_target.service_namespace
resource_id = aws_appautoscaling_target.training_ecs_target.resource_id
name = "training-application-scaling-policy-cpu"
policy_type = "TargetTrackingScaling"
service_namespace = aws_appautoscaling_target.training_ecs_target.service_namespace
resource_id = aws_appautoscaling_target.training_ecs_target.resource_id
scalable_dimension = aws_appautoscaling_target.training_ecs_target.scalable_dimension

target_tracking_scaling_policy_configuration {
predefined_metric_specification {
predefined_metric_type = "ECSServiceAverageCPUUtilization"
}

target_value = 80
scale_in_cooldown = 300
target_value = 80
scale_in_cooldown = 300
scale_out_cooldown = 300
}
}

resource "aws_appautoscaling_policy" "training_ecs_target_memory" {
name = "training-application-scaling-policy-memory"
policy_type = "TargetTrackingScaling"
service_namespace = aws_appautoscaling_target.training_ecs_target.service_namespace
resource_id = aws_appautoscaling_target.training_ecs_target.resource_id
name = "training-application-scaling-policy-memory"
policy_type = "TargetTrackingScaling"
service_namespace = aws_appautoscaling_target.training_ecs_target.service_namespace
resource_id = aws_appautoscaling_target.training_ecs_target.resource_id
scalable_dimension = aws_appautoscaling_target.training_ecs_target.scalable_dimension

target_tracking_scaling_policy_configuration {
predefined_metric_specification {
predefined_metric_type = "ECSServiceAverageMemoryUtilization"
}

target_value = 80
scale_in_cooldown = 300
target_value = 80
scale_in_cooldown = 300
scale_out_cooldown = 300
}
}
Expand All @@ -121,17 +136,17 @@ resource "aws_security_group" "ecs_training_sg" {
resource "aws_vpc_security_group_ingress_rule" "ecs_training_sg_ingress" {
security_group_id = aws_security_group.ecs_training_sg.id

ip_protocol = "-1"
ip_protocol = "-1"
# cidr_blocks = [aws_vpc.main.cidr_block]
referenced_security_group_id = aws_security_group.ecs_django_sg.id
}
}

resource "aws_vpc_security_group_egress_rule" "ecs_training_sg_egress" {
security_group_id = aws_security_group.ecs_training_sg.id

ip_protocol = "-1"
cidr_ipv4 = "0.0.0.0/0"
}
ip_protocol = "-1"
cidr_ipv4 = "0.0.0.0/0"
}

# --- ECS Launch Template ---
resource "aws_launch_template" "ecs_lt_training" {
Expand Down Expand Up @@ -209,4 +224,4 @@ resource "aws_ecs_cluster_capacity_providers" "main" {
base = 1
weight = 100
}
}
}
5 changes: 4 additions & 1 deletion frontend/next.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ const nextConfig = {
},
{
source: "/api/training/:path*",
destination: "http://127.0.0.1:8000/api/:path*",
destination:
process.env.ENVIRONMENT === "production"
? "http://alb-208353726.us-east-1.elb.amazonaws.com/api/:path*"
: "http://127.0.0.1:8000/api/:path*",
},
],
};
Expand Down

0 comments on commit 6169692

Please sign in to comment.