From: David Swan <david.swan@puppet.co.uk>
Date: Thu, 2 Jan 2020 14:15:31 +0000 (+0000)
Subject: (MODULES-10358) - Clarification added to Boolean validation checks
X-Git-Tag: v2.3.0~14^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=83d2511695677cc4ce1957389fb506e2bd1c74a4;p=puppet-modules%2Fpuppetlabs-firewall.git

(MODULES-10358) - Clarification added to Boolean validation checks
---

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index cba598c..32483de 100644
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -763,6 +763,13 @@ Puppet::Type.newtype(:firewall) do
       When combined with jump => "LOG" specifies the log prefix to use when
       logging.
     PUPPETCODE
+
+    munge do |value|
+      if value == ''
+        raise('log_prefix should not be an empty string')
+      end
+      value
+    end
   end
 
   newproperty(:log_uid, required_features: :log_uid) do
@@ -2303,7 +2310,7 @@ Puppet::Type.newtype(:firewall) do
       end
     end
 
-    if value(:log_prefix) || value(:log_level) || value(:log_uid)
+    if value(:log_prefix) || value(:log_level) || value(:log_uid) == :true
       unless value(:jump).to_s == 'LOG'
         raise 'Parameter log_prefix, log_level and log_uid require jump => LOG'
       end
@@ -2343,13 +2350,13 @@ Puppet::Type.newtype(:firewall) do
       raise "Parameter 'stat_probability' requires 'stat_mode' to be set to 'random'"
     end
 
-    if value(:checksum_fill)
+    if value(:checksum_fill) == :true
       unless value(:jump).to_s == 'CHECKSUM' && value(:table).to_s == 'mangle'
         raise 'Parameter checksum_fill requires jump => CHECKSUM and table => mangle'
       end
     end
 
-    if value(:queue_num) || value(:queue_bypass)
+    if value(:queue_num) || value(:queue_bypass) == :true
       unless value(:jump).to_s == 'NFQUEUE'
         raise 'Paramter queue_number and queue_bypass require jump => NFQUEUE'
       end