Refactor code again:

- use Facter-functions

Signed-off-by: Robert Waffen <[email protected]>

Author: rwaffen

lib/facter/puppetdb_version.rb

@@ -2,26 +2,25 @@
   confine { Facter::Util::Resolution.which('puppetdb') }
 
   setcode do
-    require 'open3'
+    command = 'puppetdb --version'
+    splitter = ':'
+    postion = 'last'
 
-    # check if os is debian/ubuntu and the package is not from puppetlabs
-    if Facter.value(:os)('family') == 'Debian'
+    if Facter.value(:os)['family'] == 'Debian'
       package_maintainer = Facter::Core::Execution.execute('apt-cache show puppetdb | grep "Maintainer:" | head -1')
+
       unless package_maintainer.include? 'Puppet Labs'
-        output, status = Open3.capture2('dpkg-query --showformat=\'${Version}\' --show puppetdb')
-        if status.success?
-          output.strip.split('-').first
-        else
-          nil
-        end
-      end
-    else
-      output, status = Open3.capture2('puppetdb --version')
-      if status.success?
-        output.split(':').last.strip
-      else
-        nil
+        command = 'dpkg-query --showformat=\'${Version}\' --show puppetdb'
+        splitter = '-'
+        postion = 'first'
       end
     end
+
+    begin
+      output = Facter::Core::Execution.execute(command)
+      output.split(splitter).send(postion).strip
+    rescue Facter::Core::Execution::ExecutionFailure
+      nil
+    end
   end
 end

spec/unit/facter/puppetdb_version_spec.rb

@@ -1,44 +1,93 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
 require 'facter'
-require 'open3'
 
 describe 'puppetdb_version' do
-  subject(:fact) { Facter.fact(:puppetdb_version) }
-
   before(:each) do
     Facter.clear
   end
 
-  it 'returns a version on non-Debian family with puppetlabs package' do
-    allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return('/usr/bin/puppetdb')
-    allow(Open3).to receive(:capture2).with('puppetdb --version').and_return("puppetdb version: 7.18.0\n")
+  context 'when puppetdb is available' do
+    before do
+      allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return('/usr/bin/puppetdb')
+    end
 
-    expect(Facter.fact(:puppetdb_version).value).to eq('7.18.0')
-  end
+    context 'on a Debian-based system' do
+      before do
+        allow(Facter).to receive(:value).with(:os).and_return({ 'family' => 'Debian' })
+      end
 
-  it 'returns a version on Debian family with non-puppetlabs package' do
-    allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return('/usr/sbin/puppetdb')
-    allow(Facter).to receive(:value).with(:osfamily).and_return('Debian')
-    allow(Facter::Core::Execution).to receive(:execute).with('apt-cache show puppetdb | grep "Maintainer:" | head -1').and_return('Maintainer: Ubuntu Developers')
-    allow(Open3).to receive(:capture2).with('dpkg-query --showformat=\'${Version}\' --show puppetdb').and_return("6.2.0-5")
+      context 'when Puppet Labs is the maintainer' do
+        before do
+          allow(Facter::Core::Execution).to receive(:execute)
+            .with('apt-cache show puppetdb | grep "Maintainer:" | head -1')
+            .and_return('Maintainer: Puppet Labs')
+        end
 
-    expect(Facter.fact(:puppetdb_version).value).to eq('6.2.0')
-  end
+        it 'returns the correct version from puppetdb --version' do
+          expect(Facter::Core::Execution).to receive(:execute)
+            .with('puppetdb --version')
+            .and_return('puppetdb version: 7.19.0')
+
+          expect(Facter.fact(:puppetdb_version).value).to eq('7.19.0')
+        end
+
+        it 'returns nil if the command execution fails' do
+          allow(Facter::Core::Execution).to receive(:execute).with('puppetdb --version').and_raise(Facter::Core::Execution::ExecutionFailure)
+
+          expect(Facter.fact(:puppetdb_version).value).to be_nil
+        end
+      end
+
+      context 'when Puppet Labs is not the maintainer' do
+        before do
+          allow(Facter::Core::Execution).to receive(:execute)
+            .with('apt-cache show puppetdb | grep "Maintainer:" | head -1')
+            .and_return('Maintainer: Other Maintainer')
+        end
+
+        it 'returns the correct version from dpkg-query' do
+          expect(Facter::Core::Execution).to receive(:execute)
+            .with("dpkg-query --showformat='${Version}' --show puppetdb")
+            .and_return('7.9.0-1ubuntu1')
+
+          expect(Facter.fact(:puppetdb_version).value).to eq('7.9.0')
+        end
+
+        it 'returns nil if the command execution fails' do
+          allow(Facter::Core::Execution).to receive(:execute).with("dpkg-query --showformat='${Version}' --show puppetdb").and_raise(Facter::Core::Execution::ExecutionFailure)
+
+          expect(Facter.fact(:puppetdb_version).value).to be_nil
+        end
+      end
+    end
+
+    context 'on a non-Debian-based system' do
+      before do
+        allow(Facter).to receive(:value).with(:os).and_return({ 'family' => 'RedHat' })
+      end
+
+      it 'returns the correct version from puppetdb --version' do
+        expect(Facter::Core::Execution).to receive(:execute)
+          .with('puppetdb --version')
+          .and_return('puppetdb version: 7.19.0')
+
+        expect(Facter.fact(:puppetdb_version).value).to eq('7.19.0')
+      end
 
-  it 'returns a version on Debian family with puppetlabs package' do
-    allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return('/usr/sbin/puppetdb')
-    allow(Facter).to receive(:value).with(:osfamily).and_return('Debian')
-    allow(Facter::Core::Execution).to receive(:execute).with('apt-cache show puppetdb | grep "Maintainer:" | head -1').and_return('Maintainer: Puppet Labs')
-    allow(Open3).to receive(:capture2).with('dpkg-query --showformat=\'${Version}\' --show puppetdb').and_return("7.19.0-1jammy")
+      it 'returns nil if the command execution fails' do
+        allow(Facter::Core::Execution).to receive(:execute).with('puppetdb --version').and_raise(Facter::Core::Execution::ExecutionFailure)
 
-    expect(Facter.fact(:puppetdb_version).value).to eq('7.19.0')
+        expect(Facter.fact(:puppetdb_version).value).to be_nil
+      end
+    end
   end
 
-  it 'returns nil if puppetdb command is not available' do
-    allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return(nil)
+  context 'when puppetdb is not available' do
+    before do
+      allow(Facter::Util::Resolution).to receive(:which).with('puppetdb').and_return(nil)
+    end
 
-    expect(Facter.fact(:puppetdb_version).value).to be_nil
+    it 'returns nil' do
+      expect(Facter.fact(:puppetdb_version).value).to be_nil
+    end
   end
 end