fixup! Add TLS PSK encryption support to zabbix_host

Author: Jeremy Gutierrez

lib/puppet/type/zabbix_host.rb

@@ -3,6 +3,12 @@
 Puppet::Type.newtype(:zabbix_host) do
   @doc = 'Manage zabbix hosts'
 
+  encryptions = {
+    unencrypted: 0b001,
+    psk: 0b010,
+    cert: 0b100
+  }
+
   ensurable do
     desc 'The basic property that the resource should be in.'
     defaultvalues
@@ -21,11 +27,6 @@ def munge_boolean(value)
   end
 
   def munge_encryption(value)
-    encryptions = {
-      unencrypted: 0b001,
-      psk: 0b010,
-      cert: 0b100
-    }
     case value
     when Array
       value.uniq.reduce(0b0) { |acc, elem| acc | (encryptions[elem.to_sym].nil? ? 0b0 : encryptions[elem.to_sym]) }
@@ -41,7 +42,7 @@ def munge_encryption(value)
   end
 
   validate do
-    raise Puppet::ParseError, _("'tls_psk' and 'tls_psk_identity' are required for 'tls_accept' and/or 'tls_connect' set to PSK") if ((!self[:tls_accept].nil? && (munge_encryption(self[:tls_accept]) & 2) == 2) || (!self[:tls_connect].nil? && munge_encryption(self[:tls_connect]) == 2)) && (self[:tls_psk].nil? || self[:tls_psk_identity].nil?)
+    raise Puppet::ParseError, _("'tls_psk' and 'tls_psk_identity' are required for 'tls_accept' and/or 'tls_connect' set to PSK") if ((!self[:tls_accept].nil? && (munge_encryption(self[:tls_accept]) & encryptions[:psk]) == encryptions[:psk]) || (!self[:tls_connect].nil? && munge_encryption(self[:tls_connect]) == 2)) && (self[:tls_psk].nil? || self[:tls_psk_identity].nil?)
   end
 
   newparam(:hostname, namevar: true) do