Skip to content

Commit

Permalink
Merge pull request #8004 from ministryofjustice/feature/7607-send-flo…
Browse files Browse the repository at this point in the history
…w-logs-to-s3

Send `core-shared-services` flow logs to S3
  • Loading branch information
dms1981 committed Sep 20, 2024
2 parents 129132f + 9ddd998 commit 812b1cc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions terraform/environments/core-shared-services/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ locals {
# This local allows us to references the key / value pairs held in xsiam_secrets.
xsiam = jsondecode(data.aws_secretsmanager_secret_version.xsiam_secret_arn_version.secret_string)

cloudwatch_log_buckets = nonsensitive(jsondecode(data.aws_secretsmanager_secret_version.core_logging_bucket_arns.secret_string))

tags = {
business-unit = "Platforms"
application = "Modernisation Platform: ${terraform.workspace}"
Expand Down
11 changes: 11 additions & 0 deletions terraform/environments/core-shared-services/secrets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,14 @@ data "aws_secretsmanager_secret_version" "xsiam_secret_arn_version" {
provider = aws.modernisation-platform
secret_id = data.aws_secretsmanager_secret.xsiam_secret_arn.id
}

# Get the ARNs of the logging buckets in `core-logging`
data "aws_secretsmanager_secret" "core_logging_bucket_arns" {
provider = aws.modernisation-platform
name = "core_logging_bucket_arns"
}

data "aws_secretsmanager_secret_version" "core_logging_bucket_arns" {
provider = aws.modernisation-platform
secret_id = data.aws_secretsmanager_secret.core_logging_bucket_arns.id
}
3 changes: 2 additions & 1 deletion terraform/environments/core-shared-services/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ module "vpc" {
gateway = "transit"

# VPC Flow Logs
vpc_flow_log_iam_role = aws_iam_role.vpc_flow_log.arn
vpc_flow_log_iam_role = aws_iam_role.vpc_flow_log.arn
flow_log_s3_destination_arn = each.key == "live_data" ? local.cloudwatch_log_buckets["vpc-flow-logs"] : ""

# Transit Gateway ID
transit_gateway_id = data.aws_ec2_transit_gateway.transit-gateway.id
Expand Down

0 comments on commit 812b1cc

Please sign in to comment.