From 95610a65052859462242700d1655c5277a0540c6 Mon Sep 17 00:00:00 2001
From: Massimiliano Adamo <maxadamo@gmail.com>
Date: Thu, 19 Jan 2023 12:49:26 +0100
Subject: [PATCH] fix warning message
---
functions/fw_builder.pp | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/functions/fw_builder.pp b/functions/fw_builder.pp
index bbd297e..d241e94 100644
--- a/functions/fw_builder.pp
+++ b/functions/fw_builder.pp
@@ -129,15 +129,20 @@ function fw_builder::fw_builder() {
content => to_yaml({fw_ipsets => $ipsets});
}
+ # emit warning if the key is deinfed and it's empty
+ #
+ ['public', 'trust'].each() |$zone| {
+ if $zone in $fw_conf and empty($fw_conf[$zone]) {
+ echo { 'WARNING fw_builder':
+ message => "'${zone}' zone key is defined but it\'s empty";
+ }
+ }
+ }
+
# this section will setup / create all the fwb rules
#
['public', 'trust'].each() |$zone| {
if $fw_conf[$zone] {
- if $fw_conf[$zone].length() == 0 {
- echo { 'WARNING fw_builder':
- message => "fw_builder ${zone} key exists but it\'s empty";
- }
- }
$fw_conf[$zone].each |$name , $conf| {
$ports_spaces = $conf['port'] ? {
Array => join($conf['port'], ' '),
--
GitLab