diff --git a/CHANGELOG.md b/CHANGELOG.md index 6249090..a932ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -172,3 +172,6 @@ - config - configrules - description + +* 1.16.1 -- 2022-07-15 + - fix updates to cloudtrail, config diff --git a/cloudtrail/generate_splunk.cloudtrail.tf b/cloudtrail/generate_splunk.cloudtrail.tf index 59b2311..be0417e 100644 --- a/cloudtrail/generate_splunk.cloudtrail.tf +++ b/cloudtrail/generate_splunk.cloudtrail.tf @@ -20,11 +20,11 @@ data "template_file" "splunk_cloudtrail" { # } resource "null_resource" "splunk_cloudtrail" { + count = var.enable_sqs ? 1 : 0 triggers = { filename = format("inputs.%v.%v-%v.%v.conf", local.splunk_name, local.account_id, local.account_alias, local.region) directory = format("%v/setup", path.root) } - count = var.enable_sqs ? 1 : 0 provisioner "local-exec" { command = "test -d ${self.triggers.directory} || mkdir ${self.triggers.directory}" @@ -41,5 +41,5 @@ resource "local_file" "splunk_cloudtrail" { content = data.template_file.splunk_cloudtrail.rendered file_permission = "0644" - filename = format("%v/%v", null_resource.splunk_cloudtrail.triggers.directory, null_resource.splunk_cloudtrail.triggers.filename) + filename = var.enable_sqs ? format("%v/%v", null_resource.splunk_cloudtrail[0].triggers.directory, null_resource.splunk_cloudtrail[0].triggers.filename) : null } diff --git a/common/version.tf b/common/version.tf index f26f210..a280ee3 100644 --- a/common/version.tf +++ b/common/version.tf @@ -1,3 +1,3 @@ locals { - _module_version = "1.16.0" + _module_version = "1.16.1" } diff --git a/config/generate_splunk.config.tf b/config/generate_splunk.config.tf index ece27f2..e83317c 100644 --- a/config/generate_splunk.config.tf +++ b/config/generate_splunk.config.tf @@ -7,7 +7,7 @@ data "template_file" "splunk_config" { account_id = local.account_id account_alias = local.account_alias # entry_uuid = random_uuid.splunk_config.result - region = local.config_region + region = local.region queue_url = aws_sqs_queue.config.id } } @@ -24,7 +24,7 @@ data "template_file" "splunk_config" { # } # provisioner "local-exec" { # working_dir = "setup" -# command = "echo '${data.template_file.splunk_config.rendered}' > inputs.config.${local.account_id}.${local.config_region}.conf" +# command = "echo '${data.template_file.splunk_config.rendered}' > inputs.config.${local.account_id}.${local.region}.conf" # } # } diff --git a/config/generate_splunk.config_rules.tf b/config/generate_splunk.config_rules.tf index 2f84117..faf65c7 100644 --- a/config/generate_splunk.config_rules.tf +++ b/config/generate_splunk.config_rules.tf @@ -7,7 +7,7 @@ data "template_file" "splunk_configrules" { account_id = local.account_id account_alias = local.account_alias # entry_uuid = random_uuid.splunk_configrules.result - region = local.config_region + region = local.region } } @@ -23,7 +23,7 @@ data "template_file" "splunk_configrules" { # } # provisioner "local-exec" { # working_dir = "setup" -# command = "echo '${data.template_file.splunk_configrules.rendered}' > aws_config_rules_tasks.${local.account_id}.${local.config_region}.conf" +# command = "echo '${data.template_file.splunk_configrules.rendered}' > aws_config_rules_tasks.${local.account_id}.${local.region}.conf" # } # }