facter 4.0.41 → 4.0.47

data/lib/facter/resolvers/open_vz.rb

@@ -5,7 +5,7 @@ module Facter
     class OpenVz < BaseResolver
       # build
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -15,9 +15,7 @@ module Facter
         end
 
         def check_proc_vz(fact_name)
-          if !Dir.exist?('/proc/vz') || !File.executable?('/proc/lve/list') || Dir.entries('/proc/vz').count.equal?(2)
-            return
-          end
+          return if !Dir.exist?('/proc/vz') || File.file?('/proc/lve/list') || Dir.entries('/proc/vz').count.equal?(2)
 
           @fact_list[:vm] = read_proc_status
           @fact_list[fact_name]

data/lib/facter/resolvers/os_release_resolver.rb

@@ -14,7 +14,7 @@ module Facter
       # :support_url
       # :bug_report_url
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -24,7 +24,7 @@ module Facter
         end
 
         def read_os_release_file(fact_name)
-          output = Util::FileHelper.safe_readlines('/etc/os-release')
+          output = Facter::Util::FileHelper.safe_readlines('/etc/os-release')
           return @fact_list[:name] = nil if output.empty?
 
           pairs = []

data/lib/facter/resolvers/partitions.rb

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class Partitions < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       BLOCK_PATH = '/sys/block'
       BLOCK_SIZE = 512
 
@@ -15,98 +16,122 @@ module Facter
         end
 
         def read_partitions(fact_name)
-          @fact_list[:partitions] = {}
-          return {} unless File.readable?(BLOCK_PATH)
+          return unless File.readable?(BLOCK_PATH)
 
           block_devices = Dir.entries(BLOCK_PATH).reject { |dir| dir =~ /^\.+/ }
+          @fact_list[:partitions] = {} unless block_devices.empty?
+          blkid_and_lsblk = {}
+
           block_devices.each do |block_device|
             block_path = "#{BLOCK_PATH}/#{block_device}"
             if File.directory?("#{block_path}/device")
-              extract_from_device(block_path)
+              extract_from_device(block_path, blkid_and_lsblk)
             elsif File.directory?("#{block_path}/dm")
-              extract_from_dm(block_path)
+              extract_from_dm(block_path, block_device, blkid_and_lsblk)
             elsif File.directory?("#{block_path}/loop")
-              extract_from_loop(block_path)
+              extract_from_loop(block_path, block_device, blkid_and_lsblk)
             end
           end
+
           @fact_list[fact_name]
         end
 
-        def extract_from_device(block_path)
+        def extract_from_device(block_path, blkid_and_lsblk)
           subdirs = browse_subdirectories(block_path)
           subdirs.each do |subdir|
             name = "/dev/#{subdir.split('/').last}"
-            populate_partitions(name, subdir)
+            populate_partitions(name, subdir, blkid_and_lsblk)
           end
         end
 
-        def extract_from_dm(block_path)
-          map_name = Util::FileHelper.safe_read("#{block_path}/dm/name").chomp
+        def extract_from_dm(block_path, block_device, blkid_and_lsblk)
+          map_name = Facter::Util::FileHelper.safe_read("#{block_path}/dm/name").chomp
           if map_name.empty?
-            populate_partitions("/dev#{block_path}", block_path)
+            populate_partitions("/dev/#{block_device}", block_path, blkid_and_lsblk)
           else
-            populate_partitions("/dev/mapper/#{map_name}", block_path)
+            populate_partitions("/dev/mapper/#{map_name}", block_path, blkid_and_lsblk)
           end
         end
 
-        def extract_from_loop(block_path)
-          backing_file = Util::FileHelper.safe_read("#{block_path}/loop/backing_file").chomp
+        def extract_from_loop(block_path, block_device, blkid_and_lsblk)
+          backing_file = Facter::Util::FileHelper.safe_read("#{block_path}/loop/backing_file").chomp
           if backing_file.empty?
-            populate_partitions("/dev#{block_path}", block_path)
+            populate_partitions("/dev/#{block_device}", block_path, blkid_and_lsblk)
           else
-            populate_partitions("/dev#{block_path}", block_path, backing_file)
+            populate_partitions("/dev/#{block_device}", block_path, blkid_and_lsblk, backing_file)
           end
         end
 
-        def populate_partitions(partition_name, block_path, backing_file = nil)
-          @fact_list[:partitions][partition_name] = {}
-          size_bytes = Util::FileHelper.safe_read("#{block_path}/size", '0')
-                                       .chomp.to_i * BLOCK_SIZE
+        def populate_partitions(partition_name, block_path, blkid_and_lsblk, backing_file = nil)
+          size_bytes = Facter::Util::FileHelper.safe_read("#{block_path}/size", '0')
+                                               .chomp.to_i * BLOCK_SIZE
           info_hash = { size_bytes: size_bytes,
-                        size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes),
+                        size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes),
                         backing_file: backing_file }
-          info_hash.merge!(populate_from_syscalls(partition_name))
+          info_hash.merge!(populate_from_syscalls(partition_name, blkid_and_lsblk))
           @fact_list[:partitions][partition_name] = info_hash.reject { |_key, value| value.nil? }
         end
 
-        def populate_from_syscalls(partition_name)
-          part_info = populate_from_blkid(partition_name)
+        def populate_from_syscalls(partition_name, blkid_and_lsblk)
+          part_info = populate_from_blkid(partition_name, blkid_and_lsblk)
 
-          return pupulate_from_lsblk(partition_name) if part_info.empty?
+          return populate_from_lsblk(partition_name, blkid_and_lsblk) if part_info.empty?
 
           part_info
         end
 
-        def populate_from_blkid(partition_name)
-          return {} unless blkid_command?
+        def browse_subdirectories(path)
+          dirs = Dir[File.join(path, '**', '*')].select { |p| File.directory? p }
+          dirs.select { |subdir| subdir.split('/').last.include?(path.split('/').last) }.reject(&:nil?)
+        end
+
+        def populate_from_blkid(partition_name, blkid_and_lsblk)
+          return {} unless available?('blkid', blkid_and_lsblk)
+
+          blkid_and_lsblk[:blkid] ||= execute_and_extract_blkid_info
+
+          partition_data = blkid_and_lsblk[:blkid][partition_name]
+          return {} unless partition_data
 
-          @blkid_content ||= execute_and_extract_blkid_info
-          return {} unless @blkid_content[partition_name]
+          filesys = partition_data['TYPE']
+          uuid = partition_data['UUID']
+          label = partition_data['LABEL']
+          part_uuid = partition_data['PARTUUID']
+          part_label = partition_data['PARTLABEL']
 
-          filesys = @blkid_content[partition_name]['TYPE']
-          uuid = @blkid_content[partition_name]['UUID']
-          label = @blkid_content[partition_name]['LABEL']
-          part_uuid = @blkid_content[partition_name]['PARTUUID']
-          part_label = @blkid_content[partition_name]['PARTLABEL']
           { filesystem: filesys, uuid: uuid, label: label, partuuid: part_uuid, partlabel: part_label }
         end
 
-        def blkid_command?
-          return @blkid_exists unless @blkid_exists.nil?
+        def available?(command, blkid_and_lsblk)
+          command_exists_key = command == 'blkid' ? :blkid_exists : :lsblk_exists
 
-          output = Facter::Core::Execution.execute('which blkid', logger: log)
+          return blkid_and_lsblk[command_exists_key] unless blkid_and_lsblk[command_exists_key].nil?
 
-          @blkid_exists = !output.empty?
+          output = Facter::Core::Execution.execute("which #{command}", logger: log)
+
+          blkid_and_lsblk[:command_exists_key] = !output.empty?
+        end
+
+        def execute_and_extract_blkid_info
+          stdout = Facter::Core::Execution.execute('blkid', logger: log)
+          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
+          output_hash.each do |key, value|
+            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
+          end
         end
 
-        def pupulate_from_lsblk(partition_name)
-          return {} unless lsblk_command?
+        def populate_from_lsblk(partition_name, blkid_and_lsblk)
+          return {} unless available?('lsblk', blkid_and_lsblk)
 
-          @lsblk_content ||= Facter::Core::Execution.execute('lsblk -fp', logger: log)
+          blkid_and_lsblk[:lsblk] ||= Facter::Core::Execution.execute('lsblk -fp', logger: log)
 
-          part_info = @lsblk_content.match(/#{partition_name}.*/).to_s.split(' ')
+          part_info = blkid_and_lsblk[:lsblk].match(/#{partition_name}.*/).to_s.split(' ')
           return {} if part_info.empty?
 
+          parse_part_info(part_info)
+        end
+
+        def parse_part_info(part_info)
           result = { filesystem: part_info[1] }
 
           if part_info.count.eql?(5)
@@ -118,27 +143,6 @@ module Facter
 
           result
         end
-
-        def lsblk_command?
-          return @lsblk_exists unless @lsblk_exists.nil?
-
-          output = Facter::Core::Execution.execute('which lsblk', logger: log)
-
-          @lsblk_exists = !output.empty?
-        end
-
-        def execute_and_extract_blkid_info
-          stdout = Facter::Core::Execution.execute('blkid', logger: log)
-          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
-          output_hash.each do |key, value|
-            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
-          end
-        end
-
-        def browse_subdirectories(path)
-          dirs = Dir[File.join(path, '**', '*')].select { |p| File.directory? p }
-          dirs.select { |subdir| subdir.split('/').last.include?(path.split('/').last) }.reject(&:nil?)
-        end
       end
     end
   end

data/lib/facter/resolvers/path_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Path < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/processors_resolver.rb

@@ -5,8 +5,11 @@ module Facter
     module Linux
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
+
         MHZ_TO_HZ = 1_000_000
+
         class << self
           # :count
           # :models
@@ -20,7 +23,7 @@ module Facter
           end
 
           def read_cpuinfo(fact_name)
-            cpuinfo_output = Util::FileHelper.safe_readlines('/proc/cpuinfo')
+            cpuinfo_output = Facter::Util::FileHelper.safe_readlines('/proc/cpuinfo')
             return if cpuinfo_output.empty?
 
             read_processors(cpuinfo_output) # + model names
@@ -60,7 +63,11 @@ module Facter
           def physical_devices_count
             Dir.entries('/sys/devices/system/cpu')
                .select { |dir| dir =~ /cpu[0-9]+$/ }
-               .count { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .map do |dir|
+              Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+            end
+               .uniq.count
           end
 
           def build_speed(tokens)

data/lib/facter/resolvers/redhat_release_resolver.rb

@@ -7,7 +7,7 @@ module Facter
       # :version
       # :codename
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_redhat_release(fact_name)
-          output = Util::FileHelper.safe_read('/etc/redhat-release', nil)
+          output = Facter::Util::FileHelper.safe_read('/etc/redhat-release', nil)
           return @fact_list[fact_name] = nil if output.nil?
 
           build_fact_list(output)

data/lib/facter/resolvers/ruby_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Ruby < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/selinux_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class SELinux < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -40,9 +40,9 @@ module Facter
           enforce_file = "#{mountpoint}/enforce"
           policy_file = "#{mountpoint}/policyvers"
 
-          @fact_list[:policy_version] = Util::FileHelper.safe_read(policy_file, nil)
+          @fact_list[:policy_version] = Facter::Util::FileHelper.safe_read(policy_file, nil)
 
-          enforce = Util::FileHelper.safe_read(enforce_file)
+          enforce = Facter::Util::FileHelper.safe_read(enforce_file)
           if enforce.eql?('1')
             @fact_list[:enforced] = true
             @fact_list[:current_mode] = 'enforcing'
@@ -53,7 +53,7 @@ module Facter
         end
 
         def read_selinux_config
-          file_lines = Util::FileHelper.safe_readlines('/etc/selinux/config')
+          file_lines = Facter::Util::FileHelper.safe_readlines('/etc/selinux/config')
 
           file_lines.map do |line|
             @fact_list[:config_mode] = line.split('=').last.strip if line =~ /^SELINUX=/

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class Disks < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -36,7 +36,7 @@ module Facter
               disk_size = sizes[index].to_i
               disks[name] = {
                 product: products[index],
-                size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(disk_size),
+                size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(disk_size),
                 size_bytes: disk_size,
                 vendor: vendors[index]
               }

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class Dmi < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -37,6 +37,8 @@ module Facter
 
             output = exec_smbios(param[0])
             facts = param[1]
+            return unless output
+
             facts.each do |name, regx|
               @fact_list[name] = output.match(/#{regx}/)&.captures&.first
             end

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class DmiSparc < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class Filesystem < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Solaris
       class Ipaddress < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

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

@@ -14,7 +14,7 @@ module Facter
         # :role_service
         # :role_impl
 
-        @fact_list ||= {}
+        init_resolver
 
         VIRTINFO_MAPPING = {
           chassis_serial: %w[DOMAINCHASSIS serialno],
@@ -36,8 +36,6 @@ module Facter
           end
 
           def call_virtinfo(fact_name)
-            # return unless File.executable?('/usr/sbin/virtinfo')
-
             virtinfo_output = Facter::Core::Execution.execute('/usr/sbin/virtinfo  -a  -p', logger: log)
             return if virtinfo_output.empty?
 

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

@@ -4,10 +4,11 @@ module Facter
   module Resolvers
     module Solaris
       class Memory < BaseResolver
+        init_resolver
         BLOCKSIZE = 512
         # :system
         # :swap
-        @fact_list ||= {}
+
         class << self
           private
 
@@ -31,7 +32,7 @@ module Facter
             sys[:total_bytes] = total
             sys[:available_bytes] = free
             sys[:used_bytes] = total - free
-            sys[:capacity] = FilesystemHelper.compute_capacity(total - free, total)
+            sys[:capacity] = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(total - free, total)
 
             sys
           end
@@ -44,7 +45,7 @@ module Facter
             swap_hash[:total_bytes] = total
             swap_hash[:available_bytes] = free
             swap_hash[:used_bytes] = total - free
-            swap_hash[:capacity] = FilesystemHelper.compute_capacity(total - free, total)
+            swap_hash[:capacity] = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(total - free, total)
 
             swap_hash if total != 0
           end