diff --git a/alb_template/aws_acm_certificate_validation.tf b/alb_template/aws_acm_certificate_validation.tf index ca8c6d9..41be869 100644 --- a/alb_template/aws_acm_certificate_validation.tf +++ b/alb_template/aws_acm_certificate_validation.tf @@ -1,5 +1,5 @@ resource "aws_acm_certificate_validation" "cert" { - certificate_arn = aws_acm_certificate.https-certificate.arn + certificate_arn = aws_acm_certificate.https-certificate.arn validation_record_fqdns = aws_route53_record.https-certificate-validations.*.fqdn } diff --git a/ecs_ec2_cluster_template/variables.tf b/ecs_ec2_cluster_template/variables.tf index 533eb8d..ffa5318 100644 --- a/ecs_ec2_cluster_template/variables.tf +++ b/ecs_ec2_cluster_template/variables.tf @@ -135,17 +135,17 @@ EOF } variable "autoscaling_scaledown_max" { - default = 0 + default = 0 description = "Max instance count during autoscaling_scaledown_between_utc period." } variable "autoscaling_scaledown_desired_capacity" { - default = 0 + default = 0 description = "Instance count during autoscaling_scaledown_between_utc period." } variable "autoscaling_scaledown_min" { - default = 0 + default = 0 description = "Minimum instance count during autoscaling_scaledown_between_utc period." } diff --git a/ecs_web_service_template/variables.tf b/ecs_web_service_template/variables.tf index 43ecce8..de3c6ea 100644 --- a/ecs_web_service_template/variables.tf +++ b/ecs_web_service_template/variables.tf @@ -62,7 +62,7 @@ EOF } variable "loadbalancer_listener_arns" { - type = list(string) + type = list(string) description = < 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "us-east-2" { @@ -26,7 +26,7 @@ module "us-east-2" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "us-west-1" { @@ -39,7 +39,7 @@ module "us-west-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "us-west-2" { @@ -52,7 +52,7 @@ module "us-west-2" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "ca-central-1" { @@ -65,7 +65,7 @@ module "ca-central-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "eu-central-1" { @@ -78,7 +78,7 @@ module "eu-central-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "eu-west-1" { @@ -91,7 +91,7 @@ module "eu-west-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "eu-west-2" { @@ -104,7 +104,7 @@ module "eu-west-2" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "eu-west-3" { @@ -117,7 +117,7 @@ module "eu-west-3" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "eu-north-1" { @@ -130,7 +130,7 @@ module "eu-north-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "ap-northeast-1" { @@ -143,7 +143,7 @@ module "ap-northeast-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "ap-northeast-2" { @@ -156,7 +156,7 @@ module "ap-northeast-2" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "ap-southeast-1" { @@ -169,7 +169,7 @@ module "ap-southeast-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "ap-southeast-2" { @@ -182,7 +182,7 @@ module "ap-southeast-2" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "ap-south-1" { @@ -195,7 +195,7 @@ module "ap-south-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } module "sa-east-1" { @@ -208,6 +208,6 @@ module "sa-east-1" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } diff --git a/guardduty_slack/regions.tf.sh b/guardduty_slack/regions.tf.sh index d014000..f14a153 100755 --- a/guardduty_slack/regions.tf.sh +++ b/guardduty_slack/regions.tf.sh @@ -32,7 +32,7 @@ module "$region" { lambda_notify_to_slack_arn = module.lambda_sns_to_slack.lambda_arn is_enable_lambda_notify_to_slack = var.guardduty_slack_webhook_url == "" ? false : true ipset_location = local.ipset_location - is_enable_gurdduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false + is_enable_guardduty_ipset = length(var.trusted_ip_cidr_blocks) > 0 ? true : false guardduty_finding_publishing_frequency = var.guardduty_finding_publishing_frequency } EOS diff --git a/guardduty_slack/variables.tf b/guardduty_slack/variables.tf index d552b14..43f58b3 100644 --- a/guardduty_slack/variables.tf +++ b/guardduty_slack/variables.tf @@ -11,7 +11,7 @@ variable "s3_bucket_name" { variable "trusted_ip_cidr_blocks" { type = list(string) - description = "CIDR block notations of trusted IP address ranges. (If you set an empty list, build without the gurdduty ipset. )" + description = "CIDR block notations of trusted IP address ranges. (If you set an empty list, build without the guardduty ipset. )" default = [] } diff --git a/lambda_monitoring/aws_cloudwatch_metric_alarm.tf b/lambda_monitoring/aws_cloudwatch_metric_alarm.tf index 8c447f3..9c1deff 100644 --- a/lambda_monitoring/aws_cloudwatch_metric_alarm.tf +++ b/lambda_monitoring/aws_cloudwatch_metric_alarm.tf @@ -1,112 +1,112 @@ resource "aws_cloudwatch_metric_alarm" "lambda_error" { - alarm_name = "${var.function_name}-errors" + alarm_name = "${var.function_name}-errors" alarm_description = "Lambda \"${var.function_name}\" error occured" - namespace = "AWS/Lambda" - metric_name = "Errors" - statistic = "Maximum" - period = "60" + namespace = "AWS/Lambda" + metric_name = "Errors" + statistic = "Maximum" + period = "60" evaluation_periods = "1" treat_missing_data = "notBreaching" comparison_operator = "GreaterThanThreshold" - threshold = "0" + threshold = "0" dimensions = { FunctionName = var.function_name } - alarm_actions = [ var.sns_arn ] + alarm_actions = [var.sns_arn] } resource "aws_cloudwatch_metric_alarm" "lambda_throttles" { - alarm_name = "${var.function_name}-throttles" + alarm_name = "${var.function_name}-throttles" alarm_description = "Lambda \"${var.function_name}\" throttled" - namespace = "AWS/Lambda" - metric_name = "Throttles" - statistic = "Maximum" - period = "60" + namespace = "AWS/Lambda" + metric_name = "Throttles" + statistic = "Maximum" + period = "60" evaluation_periods = "1" treat_missing_data = "notBreaching" comparison_operator = "GreaterThanThreshold" - threshold = "0" + threshold = "0" dimensions = { FunctionName = var.function_name } - alarm_actions = [ var.sns_arn ] + alarm_actions = [var.sns_arn] } resource "aws_cloudwatch_metric_alarm" "lambda_duration" { count = (var.duration_alarm_ms == 0) ? 0 : 1 - alarm_name = "${var.function_name}-duration" + alarm_name = "${var.function_name}-duration" alarm_description = "Lambda \"${var.function_name}\" duration too long" - namespace = "AWS/Lambda" - metric_name = "Duration" - statistic = "Maximum" - period = "60" + namespace = "AWS/Lambda" + metric_name = "Duration" + statistic = "Maximum" + period = "60" evaluation_periods = "1" treat_missing_data = "notBreaching" comparison_operator = "GreaterThanThreshold" - threshold = var.duration_alarm_ms + threshold = var.duration_alarm_ms dimensions = { FunctionName = var.function_name } - alarm_actions = [ var.sns_arn ] + alarm_actions = [var.sns_arn] } resource "aws_cloudwatch_metric_alarm" "lambda_invocations_max" { - alarm_name = "${var.function_name}-invocations-max" + alarm_name = "${var.function_name}-invocations-max" alarm_description = "Lambda \"${var.function_name}\" too many invocations" - namespace = "AWS/Lambda" - metric_name = "Invocations" - statistic = "Sum" - period = var.invocations_window_seconds + namespace = "AWS/Lambda" + metric_name = "Invocations" + statistic = "Sum" + period = var.invocations_window_seconds evaluation_periods = "1" treat_missing_data = "notBreaching" comparison_operator = "GreaterThanThreshold" - threshold = var.invocations_max + threshold = var.invocations_max dimensions = { FunctionName = var.function_name } - alarm_actions = [ var.sns_arn ] + alarm_actions = [var.sns_arn] } resource "aws_cloudwatch_metric_alarm" "lambda_invocations_min" { - alarm_name = "${var.function_name}-invocations-min" + alarm_name = "${var.function_name}-invocations-min" alarm_description = "Lambda \"${var.function_name}\" too few invocations" - namespace = "AWS/Lambda" - metric_name = "Invocations" - statistic = "Sum" - period = var.invocations_window_seconds + namespace = "AWS/Lambda" + metric_name = "Invocations" + statistic = "Sum" + period = var.invocations_window_seconds evaluation_periods = "1" treat_missing_data = "notBreaching" comparison_operator = "LessThanThreshold" - threshold = var.invocations_min + threshold = var.invocations_min dimensions = { FunctionName = var.function_name } - alarm_actions = [ var.sns_arn ] + alarm_actions = [var.sns_arn] } diff --git a/lambda_monitoring/variables.tf b/lambda_monitoring/variables.tf index aa8dd06..b49d9e5 100644 --- a/lambda_monitoring/variables.tf +++ b/lambda_monitoring/variables.tf @@ -6,7 +6,7 @@ variable "sns_arn" { } variable "duration_alarm_ms" { - default = 0 + default = 0 description = "Milliseconds threshold to alarm too long lambda execution. 0 (default) to disable this alarm." } @@ -15,11 +15,11 @@ variable "invocations_max" { } variable "invocations_min" { - default = 0 + default = 0 description = "Threshold to alarm too many invocations." } variable "invocations_window_seconds" { - default = 5 * 60 + default = 5 * 60 description = "Window (duration) to check max,min_invocations. Unit is [sec]." }