Default delivery_channel_name recorder_name

Author: wesleung-appzen

config.tf

@@ -11,12 +11,7 @@ module "config-us-east-1" {
   }
 */
   account_type                      = var.account_type
-  delivery_channel_name             = var.delivery_channel_name == "" ? "default" : var.delivery_channel_name
-  recorder_name                     = var.recorder_name == "" ? "default" : var.recorder_name
   s3_bucket_name                    = "appzen-log-infra-us-east-1"
-  #delivery_channel_name             = var.config_delivery_channel_name
-  #recorder_name                     = var.config_recorder_name
-  #s3_bucket_name                    = var.config_s3_bucket_name
   security_administrator_account_id = var.security_administrator_account_id
 }
 

modules/config/main.tf

@@ -162,7 +162,7 @@ resource "aws_config_configuration_aggregator" "organization" {
 # Each account & region
 resource "aws_config_configuration_recorder" "recorder" {
   count    = var.enable ? 1 : 0
-  name     = var.recorder_name
+  name     = var.recorder_name == "" ? "default" : var.recorder_name
   role_arn = var.iam_role_arn
   recording_group {
     all_supported                 = true
@@ -176,7 +176,7 @@ resource "aws_config_configuration_recorder" "recorder" {
 # Each account & region
 resource "aws_config_delivery_channel" "bucket" {
   count          = var.enable ? 1 : 0
-  name           = var.delivery_channel_name
+  name           = var.delivery_channel_name == "" ? "default" " var.delivery_channel_name
   s3_bucket_name = var.s3_bucket_name
   s3_key_prefix  = var.s3_key_prefix
   #s3_kms_key_arn =

modules/config/variables.tf

@@ -68,6 +68,7 @@ variable "org_aggregator_role_name" {
 variable "recorder_name" {
   description = ""
   type        = string
+  default     = ""
 }
 variable "s3_bucket_name" {
   description = ""