From aff00cd7c76c7c899ccc29b42ebaa4aaedf96200 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Fri, 13 Dec 2019 10:19:36 +0100 Subject: [PATCH] MON-544 allow to define empty message for warning and nodata --- common/alerting-message/inputs.tf | 4 +++- common/alerting-message/main.tf | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/alerting-message/inputs.tf b/common/alerting-message/inputs.tf index 3ebe0cf..d113f84 100644 --- a/common/alerting-message/inputs.tf +++ b/common/alerting-message/inputs.tf @@ -6,12 +6,13 @@ variable "message_alert" { variable "message_warning" { description = "Define a broadcast channel for warning alerts" type = string + default = "false" } variable "message_nodata" { description = "Define a broadcast channel for nodata alerts" type = string - default = "" + default = "false" } variable "prepend_text" { @@ -26,3 +27,4 @@ variable "append_text" { default = "" } + diff --git a/common/alerting-message/main.tf b/common/alerting-message/main.tf index 88d4840..8c5c02c 100644 --- a/common/alerting-message/main.tf +++ b/common/alerting-message/main.tf @@ -10,11 +10,10 @@ EOF vars = { message_alert = var.message_alert - message_warning = var.message_warning - message_nodata = coalesce(var.message_nodata, var.message_alert) + message_warning = var.message_warning == "false" ? var.message_alert : var.message_warning + message_nodata = var.message_nodata == "false" ? var.message_alert : var.message_nodata message_recovery = join(" ", compact(distinct(list(var.message_alert, var.message_warning, var.message_nodata)))) prepend_text = var.prepend_text append_text = var.append_text } } -