Merge pull request #1084 from corporate-gadfly/replace-deprecated-facter-calls

replace deprecated calls with Facter::Core::Execution

Author: corporate-gadfly

lib/facter/erl_ssl_path.rb

@@ -7,7 +7,7 @@
 
 Facter.add(:erl_ssl_path) do
   setcode do
-    if Facter::Util::Resolution.which('erl')
+    if Facter::Core::Execution.which('erl')
       data = Facter::Core::Execution.execute("erl -eval 'io:format(\"~p\", [code:lib_dir(ssl, ebin)]),halt().' -noshell")
       # erl returns the string with quotes, strip them off
       data.gsub!(%r{\A"|"\Z}, '')

lib/facter/rabbitmq_clustername.rb

@@ -2,7 +2,7 @@
 
 Facter.add(:rabbitmq_clustername) do
   setcode do
-    if Facter::Util::Resolution.which('rabbitmqctl')
+    if Facter::Core::Execution.which('rabbitmqctl')
       ret = nil
       cluster_status = Facter::Core::Execution.execute('rabbitmqctl -q cluster_status 2>&1')
       [%r!{cluster_name,<<"(\S+)">>}!, %r{^Cluster name: (\S+)$}].each do |r|

lib/facter/rabbitmq_nodename.rb

@@ -2,7 +2,7 @@
 
 Facter.add(:rabbitmq_nodename) do
   setcode do
-    if Facter::Util::Resolution.which('rabbitmqctl')
+    if Facter::Core::Execution.which('rabbitmqctl')
       rabbitmq_nodename = Facter::Core::Execution.execute('rabbitmqctl status 2>&1')
       begin
         %r{^Status of node '?([\w.-]+@[\w.-]+)'?}.match(rabbitmq_nodename)[1]

lib/facter/rabbitmq_plugins_dirs.rb

@@ -2,7 +2,7 @@
 
 Facter.add(:rabbitmq_plugins_dirs) do
   setcode do
-    if Facter::Util::Resolution.which('rabbitmqctl')
+    if Facter::Core::Execution.which('rabbitmqctl')
       rabbitmq_pluginsdirs_env = Facter::Core::Execution.execute("rabbitmqctl eval 'application:get_env(rabbit, plugins_dir).'")
       rabbitmq_plugins_dirs_match = %r{^\{ok,"(/.+/\w+)}.match(rabbitmq_pluginsdirs_env)
       rabbitmq_plugins_dirs_match[1].split(':') if rabbitmq_plugins_dirs_match

lib/facter/rabbitmq_version.rb

@@ -2,7 +2,7 @@
 
 Facter.add(:rabbitmq_version) do
   setcode do
-    if Facter::Util::Resolution.which('rabbitmqadmin')
+    if Facter::Core::Execution.which('rabbitmqadmin')
       rabbitmq_version = Facter::Core::Execution.execute('rabbitmqadmin --version 2>&1')
       %r{^rabbitmqadmin ([\w.]+)}.match(rabbitmq_version).to_a[1]
     end

spec/unit/facter/util/fact_erl_ssl_path_spec.rb

@@ -8,23 +8,23 @@
   describe 'erl_ssl_path' do
     context 'with valid value' do
       it do
-        allow(Facter::Util::Resolution).to receive(:which).with('erl').and_return(true)
+        allow(Facter::Core::Execution).to receive(:which).with('erl').and_return(true)
         allow(Facter::Core::Execution).to receive(:execute).with("erl -eval 'io:format(\"~p\", [code:lib_dir(ssl, ebin)]),halt().' -noshell").and_return('"/usr/lib64/erlang/lib/ssl-5.3.3/ebin"')
         expect(Facter.fact(:erl_ssl_path).value).to eq('/usr/lib64/erlang/lib/ssl-5.3.3/ebin')
       end
     end
 
     context 'with error message' do
       it do
-        allow(Facter::Util::Resolution).to receive(:which).with('erl').and_return(true)
+        allow(Facter::Core::Execution).to receive(:which).with('erl').and_return(true)
         allow(Facter::Core::Execution).to receive(:execute).with("erl -eval 'io:format(\"~p\", [code:lib_dir(ssl, ebin)]),halt().' -noshell").and_return('{error,bad_name}')
         expect(Facter.fact(:erl_ssl_path).value).to be_nil
       end
     end
 
     context 'with erl not present' do
       it do
-        allow(Facter::Util::Resolution).to receive(:which).with('erl').and_return(false)
+        allow(Facter::Core::Execution).to receive(:which).with('erl').and_return(false)
         expect(Facter.fact(:erl_ssl_path).value).to be_nil
       end
     end

spec/unit/facter/util/fact_rabbitmq_clustername_spec.rb

@@ -10,31 +10,31 @@
   describe 'rabbitmq_clusternam' do
     context 'with value' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl -q cluster_status 2>&1').and_return(' {cluster_name,<<"monty">>},')
         expect(Facter.fact(:rabbitmq_clustername).value).to eq('monty')
       end
     end
 
     context 'with dashes in hostname' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl -q cluster_status 2>&1').and_return('Cluster name: rabbit-1')
         expect(Facter.fact(:rabbitmq_clustername).value).to eq('rabbit-1')
       end
     end
 
     context 'with dashes in clustername/hostname' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl -q cluster_status 2>&1').and_return(' {cluster_name,<<"monty-python@rabbit-1">>},')
         expect(Facter.fact(:rabbitmq_clustername).value).to eq('monty-python@rabbit-1')
       end
     end
 
     context 'with quotes around node name' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl -q cluster_status 2>&1').and_return("monty\npython\nCluster name: 'monty@rabbit-1'\nend\nof\nfile")
         expect(Facter.fact(:rabbitmq_clustername).value).to eq("'monty@rabbit-1'")
       end
@@ -63,15 +63,15 @@
           - cookie hash: 6WdP0nl6d3HYqA5vTKMkIg==
 
         EOS
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl -q cluster_status 2>&1').and_return(error_string)
         expect(Facter.fact(:rabbitmq_clustername).value).to be_nil
       end
     end
 
     context 'rabbitmqctl is not in path' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(false)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(false)
         expect(Facter.fact(:rabbitmq_clustername).value).to be_nil
       end
     end

spec/unit/facter/util/fact_rabbitmq_nodename_spec.rb

@@ -10,39 +10,39 @@
   describe 'rabbitmq_nodename' do
     context 'with value' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl status 2>&1').and_return('Status of node monty@rabbit1 ...')
         expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit1')
       end
     end
 
     context 'with dashes in hostname' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl status 2>&1').and_return('Status of node monty@rabbit-1 ...')
         expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit-1')
       end
     end
 
     context 'with dashes in nodename/hostname' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl status 2>&1').and_return('Status of node monty-python@rabbit-1 ...')
         expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty-python@rabbit-1')
       end
     end
 
     context 'with quotes around node name' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl status 2>&1').and_return('Status of node \'monty@rabbit-1\' ...')
         expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit-1')
       end
     end
 
     context 'without trailing points' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl status 2>&1').and_return('Status of node monty@rabbit-1')
         expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit-1')
       end
@@ -71,15 +71,15 @@
           - cookie hash: 6WdP0nl6d3HYqA5vTKMkIg==
 
         EOS
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqctl status 2>&1').and_return(error_string)
         expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit-1')
       end
     end
 
     context 'rabbitmqctl is not in path' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(false)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(false)
         expect(Facter.fact(:rabbitmq_nodename).value).to be_nil
       end
     end

spec/unit/facter/util/fact_rabbitmq_plugins_dirs_spec.rb

@@ -10,23 +10,23 @@
   describe 'rabbitmq_plugins_dirs' do
     context 'with multiple plugins dirs' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with("rabbitmqctl eval 'application:get_env(rabbit, plugins_dir).'").and_return('{ok,"/usr/lib/rabbitmq/plugins:/usr/lib/rabbitmq/lib/rabbitmq_server-3.7.10/plugins"}')
         expect(Facter.fact(:rabbitmq_plugins_dirs).value).to contain_exactly('/usr/lib/rabbitmq/plugins', '/usr/lib/rabbitmq/lib/rabbitmq_server-3.7.10/plugins')
       end
     end
 
     context 'with only 1 plugins dir' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with("rabbitmqctl eval 'application:get_env(rabbit, plugins_dir).'").and_return('{ok,"/usr/lib/rabbitmq/lib/rabbitmq_server-0.0.0/plugins"}')
         expect(Facter.fact(:rabbitmq_plugins_dirs).value).to contain_exactly('/usr/lib/rabbitmq/lib/rabbitmq_server-0.0.0/plugins')
       end
     end
 
     context 'rabbitmqctl is not in path' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqctl').and_return(false)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqctl').and_return(false)
         expect(Facter.fact(:rabbitmq_plugins_dirs).value).to be_nil
       end
     end

spec/unit/facter/util/fact_rabbitmq_version_spec.rb

@@ -10,23 +10,23 @@
   describe 'rabbitmq_version' do
     context 'with value' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqadmin').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqadmin').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqadmin --version 2>&1').and_return('rabbitmqadmin 3.6.0')
         expect(Facter.fact(:rabbitmq_version).value).to eq('3.6.0')
       end
     end
 
     context 'with invalid value' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqadmin').and_return(true)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqadmin').and_return(true)
         expect(Facter::Core::Execution).to receive(:execute).with('rabbitmqadmin --version 2>&1').and_return('rabbitmqadmin %%VSN%%')
         expect(Facter.fact(:rabbitmq_version).value).to be_nil
       end
     end
 
     context 'rabbitmqadmin is not in path' do
       it do
-        expect(Facter::Util::Resolution).to receive(:which).with('rabbitmqadmin').and_return(false)
+        expect(Facter::Core::Execution).to receive(:which).with('rabbitmqadmin').and_return(false)
         expect(Facter.fact(:rabbitmq_version).value).to be_nil
       end
     end