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.

Sign up for GitHub

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

refactor: re-organize locals #243

Merged
merged 1 commit into from
Jan 9, 2022
Merged

refactor: re-organize locals #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions bucket.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ locals {
audit_log_cloudtrail_destination = join("/", [local.audit_log_bucket_arn, trim(var.cloudtrail_s3_key_prefix, "/")])
audit_log_config_destination = join("/", [local.audit_log_bucket_arn, trim(var.config_s3_bucket_key_prefix, "/")])
audit_log_flow_logs_destination = join("/", [local.audit_log_bucket_arn, trim(var.vpc_flow_logs_s3_key_prefix, "/")])

flow_logs_use_s3 = var.vpc_flow_logs_destination_type == "s3"
}

# --------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -213,7 +211,7 @@ data "aws_iam_policy_document" "audit_log_config" {
# https://docs.aws.amazon.com/vpc/latest/userguide/flow-logs-s3.html#flow-logs-s3-permissions
# --------------------------------------------------------------------------------------------------
data "aws_iam_policy_document" "audit_log_flow_logs" {
count = !local.use_external_bucket && local.flow_logs_use_s3 ? 1 : 0
count = !local.use_external_bucket && local.flow_logs_to_s3 ? 1 : 0

source_json = data.aws_iam_policy_document.audit_log_config[0].json

Expand Down Expand Up @@ -250,7 +248,7 @@ data "aws_iam_policy_document" "audit_log_flow_logs" {
data "aws_iam_policy_document" "audit_log" {
count = local.use_external_bucket ? 0 : 1

source_json = local.flow_logs_use_s3 ? data.aws_iam_policy_document.audit_log_flow_logs[0].json : data.aws_iam_policy_document.audit_log_config[0].json
source_json = local.flow_logs_to_s3 ? data.aws_iam_policy_document.audit_log_flow_logs[0].json : data.aws_iam_policy_document.audit_log_config[0].json
override_json = var.audit_log_bucket_custom_policy_json
}

Expand Down
9 changes: 4 additions & 5 deletions modules/vpc-baseline/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
locals {
is_cw_logs = var.enable_flow_logs && var.flow_logs_destination_type == "cloud-watch-logs"
s3_destination_arn = "${var.flow_logs_s3_arn}/${var.flow_logs_s3_key_prefix}"
flow_logs_to_cw_logs = var.enable_flow_logs && var.flow_logs_destination_type == "cloud-watch-logs"
}

data "aws_availability_zones" "all" {
Expand All @@ -23,7 +22,7 @@ data "aws_subnet" "default" {
# --------------------------------------------------------------------------------------------------

resource "aws_cloudwatch_log_group" "default_vpc_flow_logs" {
count = var.enable_flow_logs && local.is_cw_logs ? 1 : 0
count = var.enable_flow_logs && local.flow_logs_to_cw_logs ? 1 : 0

name = var.flow_logs_log_group_name
retention_in_days = var.flow_logs_retention_in_days
Expand All @@ -35,8 +34,8 @@ resource "aws_flow_log" "default_vpc_flow_logs" {
count = var.enable_flow_logs ? 1 : 0

log_destination_type = var.flow_logs_destination_type
log_destination = local.is_cw_logs ? aws_cloudwatch_log_group.default_vpc_flow_logs[0].arn : local.s3_destination_arn
iam_role_arn = local.is_cw_logs ? var.flow_logs_iam_role_arn : null
log_destination = local.flow_logs_to_cw_logs ? aws_cloudwatch_log_group.default_vpc_flow_logs[0].arn : "${var.flow_logs_s3_arn}/${var.flow_logs_s3_key_prefix}"
iam_role_arn = local.flow_logs_to_cw_logs ? var.flow_logs_iam_role_arn : null
vpc_id = aws_default_vpc.default.id
traffic_type = "ALL"

Expand Down
2 changes: 1 addition & 1 deletion modules/vpc-baseline/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ output "default_route_table" {

output "vpc_flow_logs_group" {
description = "The CloudWatch Logs log group which stores VPC Flow Logs."
value = local.is_cw_logs ? aws_cloudwatch_log_group.default_vpc_flow_logs[0] : null
value = local.flow_logs_to_cw_logs ? aws_cloudwatch_log_group.default_vpc_flow_logs[0] : null
}
4 changes: 2 additions & 2 deletions outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ output "support_iam_role" {

output "vpc_flow_logs_iam_role" {
description = "The IAM role used for delivering VPC Flow Logs to CloudWatch Logs."
value = local.is_cw_logs ? aws_iam_role.flow_logs_publisher : null
value = local.flow_logs_to_cw_logs ? aws_iam_role.flow_logs_publisher : null
}

output "vpc_flow_logs_group" {
description = "The CloudWatch Logs log group which stores VPC Flow Logs in each region."

value = local.is_cw_logs ? {
value = local.flow_logs_to_cw_logs ? {
"ap-northeast-1" = one(module.vpc_baseline_ap-northeast-1[*].vpc_flow_logs_group)
"ap-northeast-2" = one(module.vpc_baseline_ap-northeast-2[*].vpc_flow_logs_group)
"ap-northeast-3" = one(module.vpc_baseline_ap-northeast-3[*].vpc_flow_logs_group)
Expand Down
1 change: 0 additions & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# --------------------------------------------------------------------------------------------------
# Variables for root module.
# --------------------------------------------------------------------------------------------------

variable "aws_account_id" {
description = "The AWS Account ID number of the account."
}
Expand Down
Loading