facter 4.5.1 → 4.6.0

data/lib/facter/framework/core/options/config_file_options.rb

@@ -60,10 +60,8 @@ module Facter
       def augment_custom(file_global_conf)
         return unless file_global_conf
 
-        if Options.cli?
-          unless file_global_conf['no-custom-facts'].nil?
-            @options[:no_custom_facts] = file_global_conf['no-custom-facts']
-          end
+        if Options.cli? && !file_global_conf['no-custom-facts'].nil?
+          @options[:no_custom_facts] = file_global_conf['no-custom-facts']
         end
 
         @options[:custom_dir] = file_global_conf['custom-dir'] unless file_global_conf['custom-dir'].nil?
@@ -73,8 +71,8 @@ module Facter
       def augment_external(global_conf)
         return unless global_conf
 
-        if Options.cli?
-          @options[:no_external_facts] = global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+        if Options.cli? && !global_conf['no-external-facts'].nil?
+          @options[:no_external_facts] = global_conf['no-external-facts']
         end
 
         @options[:external_dir] = [global_conf['external-dir']].flatten unless global_conf['external-dir'].nil?

data/lib/facter/framework/formatters/hocon_fact_formatter.rb

@@ -14,7 +14,8 @@ module Facter
 
       user_query = user_queries.first
       return format_for_no_query(resolved_facts) if user_query.empty?
-      return format_for_single_user_query(user_queries.first, resolved_facts) unless user_query.empty?
+
+      format_for_single_user_query(user_queries.first, resolved_facts) unless user_query.empty?
     end
 
     private
@@ -39,7 +40,7 @@ module Facter
 
       return '' unless fact_value
 
-      fact_value.class == Hash ? hash_to_hocon(fact_value) : fact_value
+      fact_value.instance_of?(Hash) ? hash_to_hocon(fact_value) : fact_value
     end
 
     def hash_to_hocon(fact_collection)

data/lib/facter/framework/formatters/legacy_fact_formatter.rb

@@ -42,7 +42,7 @@ module Facter
       pretty_json = handle_newlines(pretty_json)
 
       @log.debug('Remove quotes from value if value is a string')
-      pretty_json.gsub(/^(\S*) => \"(.*)\"/, '\1 => \2')
+      pretty_json.gsub(/^(\S*) => "(.*)"/, '\1 => \2')
     end
 
     def format_for_single_user_query(user_query, resolved_facts)
@@ -55,7 +55,7 @@ module Facter
       pretty_json = fact_value.nil? ? '' : hash_to_facter_format(fact_value)
 
       @log.debug('Remove quotes from value if it is a simple string')
-      pretty_json.gsub(/^"(.*)\"/, '\1')
+      pretty_json.gsub(/^"(.*)"/, '\1')
     end
 
     def hash_to_facter_format(facts_hash)
@@ -66,7 +66,7 @@ module Facter
       pretty_json.gsub!(/":\s/, '" => ')
 
       @log.debug('Remove quotes from parent nodes')
-      pretty_json.gsub!(/\"(.*)\"\ =>/, '\1 =>')
+      pretty_json.gsub!(/"(.*)"\ =>/, '\1 =>')
 
       @log.debug('Remove double backslashes from paths')
       pretty_json.gsub(/\\\\/, '\\')
@@ -95,7 +95,7 @@ module Facter
       # quotation marks that come after \ are not removed
       @log.debug('Remove unnecessary comma and quotation marks on root facts')
       output.split("\n")
-            .map! { |line| /^[\s]+/.match?(line) ? line : line.gsub(/,$|(?<!\\)\"/, '').gsub('\\"', '"') }.join("\n")
+            .map! { |line| /^\s+/.match?(line) ? line : line.gsub(/,$|(?<!\\)"/, '').gsub('\\"', '"') }.join("\n")
     end
   end
 end

data/lib/facter/framework/logging/logger.rb

@@ -107,7 +107,7 @@ module Facter
         @@message_callback.call(:debug, msg)
       else
         msg = colorize(msg, CYAN) if Options[:color]
-        @@logger.debug(@class_name + ' - ' + msg)
+        @@logger.debug("#{@class_name} - #{msg}")
       end
     end
 
@@ -128,7 +128,7 @@ module Facter
         @@message_callback.call(:info, msg)
       else
         msg = colorize(msg, GREEN) if Options[:color]
-        @@logger.info(@class_name + ' - ' + msg)
+        @@logger.info("#{@class_name} - #{msg}")
       end
     end
 
@@ -137,7 +137,7 @@ module Facter
         @@message_callback.call(:warn, msg)
       else
         msg = colorize(msg, YELLOW) if Options[:color]
-        @@logger.warn(@class_name + ' - ' + msg)
+        @@logger.warn("#{@class_name} - #{msg}")
       end
     end
 
@@ -149,20 +149,20 @@ module Facter
       warn(message_string)
     end
 
-    def error(msg, colorize = false)
+    def error(msg, colorize = false) # rubocop:disable Style/OptionalBooleanParameter
       @@has_errors = true
 
       if @@message_callback && Options[:allow_external_loggers]
         @@message_callback.call(:error, msg)
       else
         msg = colorize(msg, RED) if colorize || Options[:color]
-        @@logger.error(@class_name + ' - ' + msg)
+        @@logger.error("#{@class_name} - #{msg}")
       end
     end
 
     def log_exception(exception)
       msg = exception.message
-      msg += "\n" + exception.backtrace.join("\n") if Options[:trace]
+      msg += "\n#{exception.backtrace.join("\n")}" if Options[:trace]
 
       error(msg, true)
     end

data/lib/facter/framework/logging/logger_helper.rb

@@ -3,17 +3,16 @@
 class LoggerHelper
   class << self
     def determine_callers_name(sender_self)
-      class_name = case sender_self
-                   when String
-                     sender_self
-                   when Class
-                     sender_self.name
-                   when Module
-                     sender_self.name
-                   else # when class is singleton
-                     sender_self.class.name
-                   end
-      class_name
+      case sender_self
+      when String
+        sender_self
+      when Class
+        sender_self.name
+      when Module
+        sender_self.name
+      else # when class is singleton
+        sender_self.class.name
+      end
     end
   end
 end

data/lib/facter/framework/parsers/query_parser.rb

@@ -18,18 +18,18 @@ module Facter
       # Because a root fact will always be resolved by a collection of child facts,
       # we can return one or more child facts for each parent.
       #
-      # query -  is the user input used to search for facts
-      # loaded_fact - is a list with all facts for the current operating system
+      # @param query_list [Array] The list of facts to search for
+      # @param loaded_facts [Array] All of the fact definitions for the current operating system
       #
-      # Returns a list of SearchedFact objects that resolve the users query.
-      def parse(query_list, loaded_fact)
+      # @return [Array<SearchedFact>] a list of searchable facts that resolve the user's query
+      def parse(query_list, loaded_facts)
         matched_facts = []
         @query_list = query_list
 
-        return no_user_query(loaded_fact) unless query_list.any?
+        return no_user_query(loaded_facts) unless query_list.any?
 
         query_list.each do |query|
-          found_facts = search_for_facts(query, loaded_fact)
+          found_facts = search_for_facts(query, loaded_facts)
           matched_facts << found_facts
         end
 
@@ -44,15 +44,17 @@ module Facter
         searched_facts
       end
 
-      def search_for_facts(query, loaded_fact_hash)
+      def search_for_facts(query, loaded_facts)
         resolvable_fact_list = []
         query = query.to_s
         query_tokens = query.end_with?('.*') ? [query] : query.split('.')
         size = query_tokens.size
 
+        # Try to match the most specific query_tokens to the least, returning the first match
         size.times do |i|
           query_token_range = 0..size - i - 1
-          resolvable_fact_list = get_facts_matching_tokens(query_tokens, query_token_range, loaded_fact_hash)
+          query_fact = query_tokens[query_token_range].join('.')
+          resolvable_fact_list = get_facts_matching_tokens(query_tokens, query_fact, loaded_facts)
 
           return resolvable_fact_list if resolvable_fact_list.any?
         end
@@ -62,12 +64,10 @@ module Facter
         resolvable_fact_list
       end
 
-      def get_facts_matching_tokens(query_tokens, query_token_range, loaded_fact_hash)
+      def get_facts_matching_tokens(query_tokens, query_fact, loaded_facts)
         resolvable_fact_list = []
 
-        loaded_fact_hash.each do |loaded_fact|
-          query_fact = query_tokens[query_token_range].join('.')
-
+        loaded_facts.each do |loaded_fact|
           next unless found_fact?(loaded_fact.name, query_fact)
 
           searched_fact = construct_loaded_fact(query_tokens, loaded_fact)
@@ -79,16 +79,20 @@ module Facter
       end
 
       def found_fact?(fact_name, query_fact)
+        # This is the case where the fact_name contains a wildcard like
+        # blockdevice_.*_model and we're querying for the legacy fact
+        # specifically using 'blockdevice_sba_model' and we don't want the query
+        # 'blockdevice.sba.model' to match
         fact_with_wildcard = fact_name.include?('.*') && !query_fact.include?('.')
 
-        processed_equery_fact = query_fact.gsub('\\', '\\\\\\\\')
-
-        return false if fact_with_wildcard && !query_fact.match("^#{fact_name}$")
-
-        # Must escape metacharacters (like dots) to ensure the correct fact is found
-        return false unless fact_with_wildcard || fact_name.match("^#{Regexp.escape(processed_equery_fact)}($|\\.)")
-
-        true
+        if fact_with_wildcard
+          # fact_name contains wildcard, so we're intentially not escaping.
+          query_fact.match("^#{fact_name}$")
+        else
+          processed_equery_fact = query_fact.gsub('\\', '\\\\\\\\')
+          # Must escape metacharacters (like dots) to ensure the correct fact is found
+          fact_name.match("^#{Regexp.escape(processed_equery_fact)}($|\\.)")
+        end
       end
 
       def construct_loaded_fact(query_tokens, loaded_fact)

data/lib/facter/resolvers/aix/disks.rb

@@ -47,7 +47,7 @@ module Facter
           end
 
           def compute_size(size_hash)
-            physical_partitions = size_hash['TOTAL PPs'].to_i + size_hash['FREE PPs'].to_i
+            physical_partitions = size_hash['TOTAL PPs'].to_i
             size_physical_partition = size_hash['PP SIZE']
             exp = if size_physical_partition[/mega/]
                     Facter::Util::Aix::InfoExtractor::MEGABYTES_EXPONENT

data/lib/facter/resolvers/aix/ffi/ffi_helper.rb

@@ -77,7 +77,7 @@ module Facter
 
               family = FFI::AF_UNSPEC
 
-              addresses.each do |_k, addr|
+              addresses.each_value do |addr|
                 if family != FFI::AF_UNSPEC &&
                    addr[:sa_family] != FFI::AF_UNSPEC &&
                    family != addr[:sa_family]

data/lib/facter/resolvers/aix/networking.rb

@@ -47,7 +47,7 @@ module Facter
 
               info = line.split("\s")
               interface_name = info[0]
-              mac = info[3][/^([0-9a-f]{1,2}[\.:-]){5}([0-9a-f]{1,2})$/]
+              mac = info[3][/^([0-9a-f]{1,2}[.:-]){5}([0-9a-f]{1,2})$/]
               if interfaces[interface_name]
                 interfaces[interface_name][:mtu] = info[1].to_i
                 interfaces[interface_name][:mac] = format_mac_address(mac) if mac

data/lib/facter/resolvers/aix/partitions.rb

@@ -56,14 +56,14 @@ module Facter
           end
 
           def compute_size(info_hash)
-            physical_partitions = info_hash['PPs'].to_i
+            logical_partitions = info_hash['LPs'].to_i
             size_physical_partition = info_hash['PP SIZE']
             exp = if size_physical_partition[/mega/]
                     Facter::Util::Aix::InfoExtractor::MEGABYTES_EXPONENT
                   else
                     Facter::Util::Aix::InfoExtractor::GIGABYTES_EXPONENT
                   end
-            size_physical_partition.to_i * physical_partitions * exp
+            size_physical_partition.to_i * logical_partitions * exp
           end
         end
       end

data/lib/facter/resolvers/aix/serialnumber.rb

@@ -22,7 +22,7 @@ module Facter
 
             result.each_line do |line|
               if line.include?('value')
-                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..]
                 break
               end
             end

data/lib/facter/resolvers/amzn/os_release_rpm.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Amzn
+      class OsReleaseRpm < BaseResolver
+        init_resolver
+
+        class << self
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { rpm_system_call(fact_name) }
+          end
+
+          def rpm_system_call(fact_name)
+            output = Facter::Core::Execution.execute(
+              'rpm -q --qf \'%<NAME>s\n%<VERSION>s\n%<RELEASE>s\n%<VENDOR>s\' -f /etc/os-release',
+              logger: log
+            )
+            build_fact_list(output)
+
+            @fact_list[fact_name]
+          end
+
+          def build_fact_list(output)
+            rpm_results = output.split("\n")
+
+            return if rpm_results.empty?
+
+            @fact_list[:package],
+              @fact_list[:version],
+              @fact_list[:release],
+              @fact_list[:vendor] = rpm_results.map(&:strip)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/dmi.rb

@@ -22,6 +22,7 @@ module Facter
           # :product_serial
           # :product_name
           # :product_uuid
+          # :product_version
 
           private
 
@@ -32,7 +33,7 @@ module Facter
           def read_facts(fact_name)
             files = %w[bios_date bios_vendor bios_version board_asset_tag board_vendor board_name
                        board_serial chassis_asset_tag chassis_type sys_vendor product_name
-                       product_serial product_uuid]
+                       product_serial product_uuid product_version]
             return unless File.directory?('/sys/class/dmi')
 
             file_content = Facter::Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)

data/lib/facter/resolvers/fips_enabled.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Linux
       class FipsEnabled < BaseResolver
-        #:fips_enabled
+        # :fips_enabled
 
         init_resolver
 

data/lib/facter/resolvers/freebsd/dmi.rb

@@ -7,7 +7,7 @@ module Facter
         init_resolver
 
         class << self
-          #:model
+          # :model
 
           private
 

data/lib/facter/resolvers/freebsd/swap_memory.rb

@@ -15,7 +15,7 @@ module Facter
 
           def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
-            data = output.split("\n")[1..-1].map { |line| line.split(/\s+/) }
+            data = output.split("\n")[1..].map { |line| line.split(/\s+/) }
 
             unless data.empty?
               @fact_list[:total_bytes]     = kilobytes_to_bytes(data.map { |line| line[1].to_i }.inject(:+))

data/lib/facter/resolvers/freebsd/system_memory.rb

@@ -15,25 +15,33 @@ module Facter
 
           def calculate_system_memory(fact_name)
             read_total_memory_in_bytes
-            read_available_memory_in_bytes
+            read_used_memory_in_bytes
 
-            @fact_list[:used_bytes] = @fact_list[:total_bytes] - @fact_list[:available_bytes]
+            @fact_list[:available_bytes] = @fact_list[:total_bytes] - @fact_list[:used_bytes]
             @fact_list[:capacity] = Facter::Util::Resolvers::FilesystemHelper
                                     .compute_capacity(@fact_list[:used_bytes], @fact_list[:total_bytes])
 
             @fact_list[fact_name]
           end
 
-          def read_available_memory_in_bytes
-            output = Facter::Core::Execution.execute('vmstat -H --libxo json', logger: log)
-            data = JSON.parse(output)
-            @fact_list[:available_bytes] = data['memory']['free-memory'] * 1024
+          def pagesize
+            @pagesize ||= Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'vm.stats.vm.v_page_size')
+          end
+
+          def read_used_memory_in_bytes
+            require_relative 'ffi/ffi_helper'
+
+            @fact_list[:used_bytes] = pagesize * (
+              Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'vm.stats.vm.v_active_count') +
+              Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'vm.stats.vm.v_wire_count')
+            )
           end
 
           def read_total_memory_in_bytes
             require_relative 'ffi/ffi_helper'
 
-            @fact_list[:total_bytes] = Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'hw.physmem')
+            @fact_list[:total_bytes] = pagesize *
+                                       Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'vm.stats.vm.v_page_count')
           end
         end
       end

data/lib/facter/resolvers/freebsd/virtual.rb

@@ -7,7 +7,7 @@ module Facter
         init_resolver
 
         class << self
-          #:model
+          # :model
 
           VM_GUEST_SYSCTL_NAMES = {
             'hv' => 'hyperv',

data/lib/facter/resolvers/linux/hostname.rb

@@ -50,7 +50,7 @@ module Facter
             end
 
             log.debug("Tried to retrieve hostname and got: #{output}")
-            return output unless output&.empty?
+            output unless output&.empty?
           end
 
           def parse_fqdn(output)

data/lib/facter/resolvers/macosx/dmi.rb

@@ -7,7 +7,7 @@ module Facter
         init_resolver
 
         class << self
-          #:model
+          # :model
 
           private
 

data/lib/facter/resolvers/macosx/filesystems.rb

@@ -16,7 +16,7 @@ module Facter
 
           def read_filesystems(fact_name)
             output = Facter::Core::Execution.execute('mount', logger: log)
-            filesystems = output.scan(/\(([a-z]+)\,*/).flatten
+            filesystems = output.scan(/\(([a-z]+),*/).flatten
             @fact_list[:macosx_filesystems] = filesystems.uniq.sort.join(',')
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/memory.rb

@@ -57,7 +57,7 @@ module Facter
           end
 
           def compute_capacity(used, total)
-            format('%<computed_capacity>.2f', computed_capacity: (used / total.to_f * 100)) + '%'
+            "#{format('%<computed_capacity>.2f', computed_capacity: (used / total.to_f * 100))}%"
           end
 
           def compute_used(total, free)

data/lib/facter/resolvers/networking.rb

@@ -39,12 +39,12 @@ module Facter
           # convert ip ranges into single ip. eg. 10.16.132.213 -->  10.16.132.213 is converted to 10.16.132.213
           # convert ip6 ranges into single ip. eg. 2001:db8:cafe::132:213 -->
           # 2001:db8:cafe::132:213 is converted to 2001:db8:cafe::132:213
-          response.gsub!(/([\da-fA-F]+([\.:]+[\da-fA-F]+)*)\s+-->\s+[\da-fA-F]+([\.:]+[\da-fA-F]+)*/, '\\1')
+          response.gsub!(/([\da-fA-F]+([.:]+[\da-fA-F]+)*)\s+-->\s+[\da-fA-F]+([.:]+[\da-fA-F]+)*/, '\\1')
         end
 
         def parse_interfaces_response(response)
           parsed_interfaces_data = {}
-          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_\.]+): /)[1..-1]]
+          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_.]+): /)[1..]]
 
           interfaces_data.each do |interface_name, raw_data|
             parsed_interface_data = {}
@@ -66,7 +66,7 @@ module Facter
 
         def extract_mac(raw_data, parsed_interface_data)
           mac = raw_data.match(/(?:ether|lladdr)\s+((?:\w?\w:){5}\w?\w)|(?:infiniband)\s+((?:\w?\w:){19}\w?\w)/)
-                       &.captures&.compact&.first
+                        &.captures&.compact&.first
           parsed_interface_data[:mac] = mac unless mac.nil?
         end
 

data/lib/facter/resolvers/os_release.rb

@@ -110,7 +110,7 @@ module Facter
 
         def append_linux_to_os_name
           os_name = @fact_list[:name]
-          @fact_list[:name] = os_name + 'Linux' if os_name.downcase.start_with?('virtuozzo')
+          @fact_list[:name] = "#{os_name}Linux" if os_name.downcase.start_with?('virtuozzo')
         end
       end
     end

data/lib/facter/resolvers/partitions.rb

@@ -112,9 +112,9 @@ module Facter
 
         def execute_and_extract_blkid_info
           stdout = Facter::Core::Execution.execute('blkid', logger: log)
-          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
+          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..]]
           output_hash.each do |key, value|
-            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
+            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..]]
           end
         end
 

data/lib/facter/resolvers/processors_lscpu.rb

@@ -10,8 +10,8 @@ module Facter
                   cores_per_socket: "-e 'Core(s)'" }.freeze
 
         class << self
-          #:cores_per_socket
-          #:threads_per_core
+          # :cores_per_socket
+          # :threads_per_core
 
           private
 

data/lib/facter/resolvers/solaris/ffi/ffi.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'ffi'
-require_relative 'structs.rb'
-require_relative 'functions.rb'
+require_relative 'structs'
+require_relative 'functions'
 
 module Facter
   module Resolvers

data/lib/facter/resolvers/solaris/ffi/functions.rb

@@ -10,7 +10,7 @@ module Facter
 
           attach_function :ioctl_base, :ioctl, %i[int int pointer], :int
           attach_function :open_socket, :socket, %i[int int int], :int
-          attach_function :close_socket, :shutdown, %i[int int], :int
+          attach_function :close_socket, :close, %i[int], :int
           attach_function :inet_ntop, %i[int pointer pointer uint], :string
 
           def self.ioctl(call_const, pointer, address_family = AF_INET)
@@ -18,7 +18,7 @@ module Facter
             begin
               ioctl_base(fd, call_const, pointer)
             ensure
-              Ioctl.close_socket(fd, 2)
+              Ioctl.close_socket(fd)
             end
           end
         end

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -23,7 +23,7 @@ module Facter
             end
           end
 
-          def read_mounts(fact_name) # rubocop:disable Metrics/MethodLength
+          def read_mounts(fact_name)
             @mounts = []
             @auto_home_paths = []
             begin

data/lib/facter/resolvers/solaris/networking.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ffi/ffi.rb'
+require_relative 'ffi/ffi'
 module Facter
   module Resolvers
     module Solaris
@@ -79,7 +79,7 @@ module Facter
             ioctl = FFI::Ioctl.ioctl(FFI::SIOCGLIFMTU, lifreq, lifreq.ss_family)
 
             if ioctl == -1
-              @log.error("Cold not read MTU, error code is #{::FFI::LastError.error}")
+              @log.error("Could not read MTU, error code is: #{::FFI::LastError.error}")
               return
             end
 

data/lib/facter/resolvers/solaris/os_release.rb

@@ -26,7 +26,7 @@ module Facter
 
               @fact_list[:major] = major
               @fact_list[:minor] = minor
-              @fact_list[:full] = major == '10' ? major + '_u' + minor : major + '.' + minor
+              @fact_list[:full] = major == '10' ? "#{major}_u#{minor}" : "#{major}.#{minor}"
               break
             end
             @fact_list[fact_name]
@@ -36,7 +36,7 @@ module Facter
             result = text.match(regex_pattern)
             major, minor = result.captures if result
             minor = regex_pattern == /Solaris (\d+)/ ? '0' : minor
-            return [major, minor] if major && minor
+            [major, minor] if major && minor
           end
         end
       end

data/lib/facter/resolvers/uname.rb

@@ -28,12 +28,16 @@ module Facter
         def build_fact_list(output)
           uname_results = output.split("\n")
 
-          @fact_list[:machine] = uname_results[0].strip
-          @fact_list[:nodename] = uname_results[1].strip
-          @fact_list[:processor] = uname_results[2].strip
-          @fact_list[:kernelrelease] = uname_results[3].strip
-          @fact_list[:kernelname] = uname_results[4].strip
-          @fact_list[:kernelversion] = uname_results[5].strip
+          if !uname_results.empty?
+            @fact_list[:machine],
+            @fact_list[:nodename],
+            @fact_list[:processor],
+            @fact_list[:kernelrelease],
+            @fact_list[:kernelname],
+            @fact_list[:kernelversion] = uname_results.map(&:strip)
+          else
+            log.warn('Request to uname returned no output. Uname related facts are not populated.')
+          end
         end
       end
     end