Skip to content

Commit 7bc43d6

Browse files
committed
feat: add S3 logging policy and update ECS config
- Remove duplicate README copy file and adjust README.md formatting. - Introduce a new IAM policy document and policy for S3 logging. - Update local S3 logging bucket name to include a "-logging" suffix. - Set ECS service health check grace period to 120 seconds.
1 parent 534b258 commit 7bc43d6

File tree

7 files changed

+32
-122
lines changed

7 files changed

+32
-122
lines changed

README copy.md

Lines changed: 0 additions & 118 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Table of Contents
2-
[1. Overview](#1-overview)\
2+
[1. Overview](#1-overview)
33
[2. Notices](#2-notices)
44
- [Table of Contents](#table-of-contents)
55
- [1. Overview](#1-overview)

_data.tf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,24 @@ data "aws_iam_policy_document" "ecr_viewer_s3" {
2727
}
2828
}
2929

30+
data "aws_iam_policy_document" "logging" {
31+
statement {
32+
actions = [
33+
"s3:PutObject",
34+
"s3:PutObjectAcl",
35+
"s3:GetObject",
36+
"s3:GetObjectAcl",
37+
"s3:ListBucket",
38+
"s3:GetBucketAcl",
39+
]
40+
resources = [
41+
aws_s3_bucket.logging.arn,
42+
"${aws_s3_bucket.logging.arn}/*",
43+
44+
]
45+
}
46+
}
47+
3048
data "aws_iam_policy" "ecs_task_execution" {
3149
name = "AmazonECSTaskExecutionRolePolicy"
3250
}

_local.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ locals {
266266
ecs_cloudwatch_group = var.ecs_cloudwatch_group == "" ? "/${local.local_name}" : var.ecs_cloudwatch_group
267267
ecs_cluster_name = var.ecs_cluster_name == "" ? local.local_name : var.ecs_cluster_name
268268
s3_viewer_bucket_name = var.s3_viewer_bucket_name == "" ? "${local.local_name}-${random_string.s3_viewer.result}" : var.s3_viewer_bucket_name
269-
s3_logging_bucket_name = var.s3_logging_bucket_name == "" ? "${local.local_name}-${random_string.s3_viewer.result}" : var.s3_logging_bucket_name
269+
s3_logging_bucket_name = var.s3_logging_bucket_name == "" ? "${local.local_name}-${random_string.s3_viewer.result}-logging" : var.s3_logging_bucket_name
270270
s3_viewer_bucket_role_name = var.s3_viewer_bucket_role_name == "" ? "${local.local_name}-ecrv" : var.s3_viewer_bucket_role_name
271271
tags = var.tags
272272
vpc_endpoints = [

alb.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,4 +287,4 @@ resource "aws_security_group_rule" "alb_egress" {
287287
description = "Allow outbound traffic from alb"
288288
security_group_id = aws_security_group.alb.id
289289
cidr_blocks = ["0.0.0.0/0"]
290-
}
290+
}

ecs.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ resource "aws_ecs_service" "this" {
5757
deployment_minimum_healthy_percent = 50
5858
deployment_maximum_percent = 200
5959

60+
health_check_grace_period_seconds = 120
61+
6062
deployment_circuit_breaker {
6163
enable = true
6264
rollback = true

iam.tf

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,18 @@ resource "aws_iam_role" "s3_role_for_ecr_viewer" {
2828
assume_role_policy = data.aws_iam_policy_document.assume_role.json
2929
tags = local.tags
3030
}
31-
# s3
31+
3232
resource "aws_iam_policy" "s3_bucket_ecr_viewer" {
3333
name = "${local.s3_viewer_bucket_role_name}-policy"
3434
description = "Policy for ECR-Viewer and S3 for DIBBS-AWS"
3535
policy = data.aws_iam_policy_document.ecr_viewer_s3.json
3636
tags = local.tags
3737
}
38+
39+
resource "aws_iam_policy" "s3_bucket_logging" {
40+
name = "${local.s3_logging_bucket_name}-policy"
41+
description = "Policy for S3 bucket logging"
42+
policy = data.aws_iam_policy_document.logging.json
43+
tags = local.tags
44+
45+
}

0 commit comments

Comments
 (0)