From 2f386251905ab8de49c60b8abef4e16482764f4f Mon Sep 17 00:00:00 2001 From: Benjamin Edwards Date: Mon, 17 Jun 2024 16:02:33 -0400 Subject: [PATCH] ensure strict configuration outputs for terraform logging destination modules (#19807) --- .../byo-firehose-logging-destination/firehose/outputs.tf | 6 +++--- .../byo-kinesis-logging-destination/kinesis/outputs.tf | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf b/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf index 708a3e5cc9..506c48359b 100644 --- a/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf +++ b/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf @@ -6,10 +6,10 @@ output "fleet_extra_environment_variables" { FLEET_FIREHOSE_STS_ASSUME_ROLE_ARN = var.iam_role_arn FLEET_FIREHOSE_STS_EXTERNAL_ID = var.sts_external_id FLEET_FIREHOSE_REGION = var.region - FLEET_OSQUERY_STATUS_LOG_PLUGIN = "firehose" - FLEET_OSQUERY_RESULT_LOG_PLUGIN = "firehose" + FLEET_OSQUERY_STATUS_LOG_PLUGIN = length(var.firehose_status_name) > 0 ? "firehose" : "" + FLEET_OSQUERY_RESULT_LOG_PLUGIN = length(var.firehose_results_name) > 0 ? "firehose" : "" + FLEET_ACTIVITY_AUDIT_LOG_PLUGIN = length(var.firehose_audit_name) > 0 ? "firehose" : "" FLEET_ACTIVITY_ENABLE_AUDIT_LOG = length(var.firehose_audit_name) > 0 ? "true" : "false" - FLEET_ACTIVITY_AUDIT_LOG_PLUGIN = "firehose" # only has an effect if ^ is true } } diff --git a/terraform/addons/byo-kinesis-logging-destination/kinesis/outputs.tf b/terraform/addons/byo-kinesis-logging-destination/kinesis/outputs.tf index 9aa68fbc84..35c76726da 100644 --- a/terraform/addons/byo-kinesis-logging-destination/kinesis/outputs.tf +++ b/terraform/addons/byo-kinesis-logging-destination/kinesis/outputs.tf @@ -6,10 +6,10 @@ output "fleet_extra_environment_variables" { FLEET_KINESIS_STS_ASSUME_ROLE_ARN = var.iam_role_arn FLEET_KINESIS_STS_EXTERNAL_ID = var.sts_external_id FLEET_KINESIS_REGION = var.region - FLEET_OSQUERY_STATUS_LOG_PLUGIN = "kinesis" - FLEET_OSQUERY_RESULT_LOG_PLUGIN = "kinesis" - FLEET_ACTIVITY_ENABLE_AUDIT_LOG = length(var.kinesis_audit_name) > 0 ? "true" : "false" - FLEET_ACTIVITY_AUDIT_LOG_PLUGIN = "kinesis" # only has an effect if ^ is true + FLEET_OSQUERY_STATUS_LOG_PLUGIN = length(var.kinesis_status_name) > 0 ? "kinesis" : "" + FLEET_OSQUERY_RESULT_LOG_PLUGIN = length(var.kinesis_results_name) > 0 ? "kinesis" : "" + FLEET_ACTIVITY_AUDIT_LOG_PLUGIN = length(var.kinesis_audit_name) > 0 ? "kinesis" : "" + FLEET_ACTIVITY_ENABLE_AUDIT_LOG = length(var.kinesis_audit_name) > 0 ? "true" : "false" } }