From 2f3a04a6423115b8683981447aab29a7d368b1ba Mon Sep 17 00:00:00 2001 From: Massimiliano Adamo <maxadamo@gmail.com> Date: Thu, 19 Jan 2023 12:11:53 +0100 Subject: [PATCH] check if keys are empty --- functions/fw_builder.pp | 5 +++++ functions/fw_builder_public_ips.pp | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/functions/fw_builder.pp b/functions/fw_builder.pp index 68f283b..bbd297e 100644 --- a/functions/fw_builder.pp +++ b/functions/fw_builder.pp @@ -133,6 +133,11 @@ function fw_builder::fw_builder() { # ['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'], ' '), diff --git a/functions/fw_builder_public_ips.pp b/functions/fw_builder_public_ips.pp index c3fddbf..2d60042 100644 --- a/functions/fw_builder_public_ips.pp +++ b/functions/fw_builder_public_ips.pp @@ -29,9 +29,6 @@ function fw_builder::fw_builder_public_ips( $public_ipsets = [] # if public is empty it's seen as empty string } elsif $facts_fw_conf['public'] =~ String or $facts_fw_conf['public'] =~ Undef { - echo { 'WARNING: fw_builder_public_ips': - message => 'fw_builder public key exists but it\'s empty'; - } $public_ipsets = [] } else { # if public is present and contains some value -- GitLab