Merge pull request #1134 from pjakubcz/ip6tables_const

Change ip6tables_version to constant in provider.

Author: david22swan

lib/puppet/provider/firewall/ip6tables.rb

@@ -53,31 +53,30 @@
 
   confine kernel: :linux
 
-  ip6tables_version = Facter.value('ip6tables_version')
-  mark_flag = if ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.4.1') < 0
+  const_set(:Ip6tables_version, Facter.value('ip6tables_version'))
+  mark_flag = if const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.4.1') < 0
                 '--set-mark'
               else
                 '--set-xmark'
               end
 
   kernelversion = Facter.value('kernelversion')
   if (kernelversion && Puppet::Util::Package.versioncmp(kernelversion, '3.13') >= 0) &&
-     (ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.6.2') >= 0)
+     (const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.6.2') >= 0)
     has_feature :random_fully
   end
 
   if (kernelversion && Puppet::Util::Package.versioncmp(kernelversion, '3.3') >= 0) &&
-     (ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.4.13') >= 0)
+     (const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.4.13') >= 0)
     has_feature :rpfilter
   end
 
-  if ip6tables_version && Puppet::Util::Package.versioncmp(ip6tables_version, '1.6.1') >= 0
+  if const_get(:Ip6tables_version) && Puppet::Util::Package.versioncmp(const_get(:Ip6tables_version), '1.6.1') >= 0
     has_feature :nflog_size
   end
 
   def initialize(*args)
-    ip6tables_version = Facter.value('ip6tables_version')
-    raise ArgumentError, 'The ip6tables provider is not supported on version 1.3 of iptables' if ip6tables_version&.match(%r{1\.3\.\d})
+    raise ArgumentError, 'The ip6tables provider is not supported on version 1.3 of iptables' if Puppet::Type::Firewall::ProviderIp6tables::Ip6tables_version&.match(%r{1\.3\.\d})
     super
   end
 

spec/unit/puppet/provider/ip6tables_spec.rb

@@ -21,7 +21,7 @@ def stub_iptables
 
     allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
     allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Debian')
-    allow(Facter.fact('ip6tables_version')).to receive(:value).and_return(ip6tables_version)
+    stub_const('Puppet::Type::Firewall::ProviderIp6tables::Ip6tables_version', ip6tables_version)
     allow(Puppet::Util::Execution).to receive(:execute).and_return ''
     allow(Puppet::Util).to receive(:which).with('iptables-save')
                                           .and_return '/sbin/iptables-save'