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

FEATURE CE-454: Set Config retention via native TF #11

Merged
merged 1 commit into from
Mar 1, 2024
Merged

FEATURE CE-454: Set Config retention via native TF #11

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
59 changes: 17 additions & 42 deletions config_baselines.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ module "config_baseline_ap-northeast-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "ap-northeast-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "ap-northeast-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -138,6 +139,7 @@ module "config_baseline_ap-northeast-2" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "ap-northeast-2"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "ap-northeast-2") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -161,6 +163,7 @@ module "config_baseline_ap-northeast-3" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "ap-northeast-3"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "ap-northeast-3") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -184,6 +187,7 @@ module "config_baseline_ap-south-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "ap-south-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "ap-south-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -207,6 +211,7 @@ module "config_baseline_ap-southeast-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "ap-southeast-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "ap-southeast-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -230,6 +235,7 @@ module "config_baseline_ap-southeast-2" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "ap-southeast-2"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "ap-southeast-2") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -253,6 +259,7 @@ module "config_baseline_ca-central-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "ca-central-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "ca-central-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -276,6 +283,7 @@ module "config_baseline_eu-central-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "eu-central-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "eu-central-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -299,6 +307,7 @@ module "config_baseline_eu-north-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "eu-north-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "eu-north-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -322,6 +331,7 @@ module "config_baseline_eu-west-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "eu-west-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "eu-west-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -345,6 +355,7 @@ module "config_baseline_eu-west-2" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "eu-west-2"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "eu-west-2") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -368,6 +379,7 @@ module "config_baseline_eu-west-3" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "eu-west-3"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "eu-west-3") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -391,6 +403,7 @@ module "config_baseline_sa-east-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "sa-east-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "sa-east-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -414,6 +427,7 @@ module "config_baseline_us-east-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "us-east-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "us-east-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -437,6 +451,7 @@ module "config_baseline_us-east-2" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "us-east-2"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "us-east-2") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -460,6 +475,7 @@ module "config_baseline_us-west-1" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "us-west-1"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "us-west-1") : false
limit_resource_types = var.config_limit_resource_types

Expand All @@ -483,6 +499,7 @@ module "config_baseline_us-west-2" {
sns_topic_name = var.config_sns_topic_name
sns_topic_kms_master_key_id = var.config_sns_topic_kms_master_key_id
include_global_resource_types = var.config_global_resources_all_regions ? true : var.region == "us-west-2"
config_retention_days = var.config_retention_days
continuous_recording = var.config_continuous_recording ? contains(var.config_continuous_recording_regions, "us-west-2") : false
limit_resource_types = var.config_limit_resource_types

Expand Down Expand Up @@ -690,45 +707,3 @@ resource "aws_config_configuration_aggregator" "organization" {

tags = var.tags
}



### Provision Config recorder attributes not supported by provider yet:
# recorder frequency (https://github.com/hashicorp/terraform-provider-aws/pull/35527)
# Config retention (https://github.com/hashicorp/terraform-provider-aws/issues/13305)
resource "terraform_data" "recorder_tuning" {
count = var.config_baseline_enabled && var.config_tuning_enabled ? 1 : 0

triggers_replace = concat(
module.config_baseline_ap-northeast-1[*].configuration_recorder,
module.config_baseline_ap-northeast-2[*].configuration_recorder,
module.config_baseline_ap-northeast-3[*].configuration_recorder,
module.config_baseline_ap-south-1[*].configuration_recorder,
module.config_baseline_ap-southeast-1[*].configuration_recorder,
module.config_baseline_ap-southeast-2[*].configuration_recorder,
module.config_baseline_ca-central-1[*].configuration_recorder,
module.config_baseline_eu-central-1[*].configuration_recorder,
module.config_baseline_eu-north-1[*].configuration_recorder,
module.config_baseline_eu-west-1[*].configuration_recorder,
module.config_baseline_eu-west-2[*].configuration_recorder,
module.config_baseline_eu-west-3[*].configuration_recorder,
module.config_baseline_sa-east-1[*].configuration_recorder,
module.config_baseline_us-east-1[*].configuration_recorder,
module.config_baseline_us-east-2[*].configuration_recorder,
module.config_baseline_us-west-1[*].configuration_recorder,
module.config_baseline_us-west-2[*].configuration_recorder,
[
var.config_retention_days,
],
)

provisioner "local-exec" {
command = "${path.module}/resources/config_recorder.py"
interpreter = ["python3"]
environment = {
CONFIG_RECORDER_RETENTION = var.config_retention_days
CONFIG_REGIONS = join(",", var.target_regions)
TF_AWS_ROLE = data.aws_iam_session_context.current.issuer_arn
}
}
}
2 changes: 1 addition & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.38"
version = ">= 5.39"

# A provider alias should be passed for each AWS region.
# Reference: https://docs.aws.amazon.com/general/latest/gr/rande.html
Expand Down
6 changes: 6 additions & 0 deletions modules/config-baseline/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ resource "aws_config_configuration_recorder" "recorder" {
name = var.recorder_name
role_arn = var.iam_role_arn


recording_group {
all_supported = length(var.limit_resource_types) == 0
include_global_resource_types = length(var.limit_resource_types) == 0 ? var.include_global_resource_types : false
Expand All @@ -53,6 +54,11 @@ resource "aws_config_configuration_recorder" "recorder" {
}
}

resource "aws_config_retention_configuration" "this" {
count = var.config_retention_days == 0 ? 0 : 1
retention_period_in_days = var.config_retention_days
}

resource "aws_config_delivery_channel" "bucket" {
name = var.delivery_channel_name
s3_bucket_name = var.s3_bucket_name
Expand Down
6 changes: 6 additions & 0 deletions modules/config-baseline/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ variable "delivery_channel_name" {
default = "default"
}

variable "config_retention_days" {
description = "AWS Config retention in days. 0 disables setting retention."
type = number
default = 0
}

variable "continuous_recording" {
description = "Enable CONTINUOUS recording (as opposed to DAILY)."
type = bool
Expand Down
42 changes: 0 additions & 42 deletions resources/config_recorder.py
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,6 @@ variable "config_s3_bucket_retention_days" {
default = 0
}

variable "config_tuning_enabled" {
description = "Tune AWS Config frequency & retention using Python local provisioner."
type = bool
default = false
}

variable "config_retention_days" {
description = "AWS Config retention in days. 0 disables setting retention."
type = number
Expand Down