Skip to content

Commit

Permalink
Merge branch 'main' into bug/skip-5.71
Browse files Browse the repository at this point in the history
  • Loading branch information
ASTRobinson authored Oct 11, 2024
2 parents 73fba37 + 3f378e0 commit acab3bf
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 7 deletions.
2 changes: 1 addition & 1 deletion terraform/environments/ppud/platform_versions.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
terraform {
required_providers {
aws = {
version = "~> 5.0, != 5.71.0"
source = "hashicorp/aws"
version = "~> 5.0, != 5.71.0"
}
http = {
version = "~> 3.0"
Expand Down
52 changes: 46 additions & 6 deletions terraform/environments/ppud/s3.tf
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ resource "aws_s3_bucket_notification" "moj-log-files-prod" {
topic {
topic_arn = aws_sns_topic.cw_alerts[0].arn
events = ["s3:ObjectCreated:*"]
filter_prefix = "logs/"
filter_prefix = "alb-logs/"
}
}

Expand Down Expand Up @@ -415,18 +415,36 @@ resource "aws_s3_bucket_policy" "moj-log-files-prod" {
},
{
"Action" : [
"s3:PutObject"
"s3:GetBucketAcl",
"s3:DeleteObject",
"s3:GetObject",
"s3:PutObject",
"s3:ListBucket"
],
"Effect" = "Allow",
"Resource" : [
"arn:aws:elasticloadbalancing:eu-west-2:817985104434:*",
"arn:aws:elasticloadbalancing:eu-west-2:817985104434:*",
"arn:aws:s3:::moj-log-files-prod",
"arn:aws:s3:::moj-log-files-prod/*"
]
"Principal" : {
Service = "elasticloadbalancing.amazonaws.com"
}
},
{
"Action" : [
"s3:GetBucketAcl",
"s3:PutObject",
],
"Effect" = "Allow",
"Resource" : [
"arn:aws:s3:::moj-log-files-prod",
"arn:aws:s3:::moj-log-files-prod/*"
]
"Principal" : {
Service = "delivery.logs.amazonaws.com"
}
},
{
"Action" : [
"s3:DeleteObject",
Expand Down Expand Up @@ -487,7 +505,7 @@ resource "aws_s3_bucket_notification" "moj-log-files-uat" {
topic {
topic_arn = aws_sns_topic.cw_uat_alerts[0].arn
events = ["s3:ObjectCreated:*"]
filter_prefix = "logs/"
filter_prefix = "alb-logs/"
}
}

Expand Down Expand Up @@ -536,7 +554,25 @@ resource "aws_s3_bucket_policy" "moj-log-files-uat" {
},
{
"Action" : [
"s3:PutObject"
"s3:GetBucketAcl",
"s3:PutObject",
],
"Effect" = "Allow",
"Resource" : [
"arn:aws:s3:::moj-log-files-uat",
"arn:aws:s3:::moj-log-files-uat/*"
]
"Principal" : {
Service = "delivery.logs.amazonaws.com"
}
},
{
"Action" : [
"s3:GetBucketAcl",
"s3:DeleteObject",
"s3:GetObject",
"s3:PutObject",
"s3:ListBucket"
],
"Effect" = "Allow",
"Resource" : [
Expand Down Expand Up @@ -629,7 +665,11 @@ resource "aws_s3_bucket_policy" "moj-log-files-dev" {
},
{
"Action" : [
"s3:PutObject"
"s3:GetBucketAcl",
"s3:DeleteObject",
"s3:GetObject",
"s3:PutObject",
"s3:ListBucket"
],
"Effect" = "Allow",
"Resource" : [
Expand Down

0 comments on commit acab3bf

Please sign in to comment.