facter 4.0.40 → 4.0.46

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
@@ -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|
+              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/puppet_version_resolver.rb

@@ -5,7 +5,7 @@ module Facter
     class PuppetVersionResolver < BaseResolver
       # :puppetversion
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/redhat_release_resolver.rb

@@ -7,7 +7,7 @@ module Facter
       # :version
       # :codename
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

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

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

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
 

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class Mountpoints < BaseResolver
+        include Facter::FilesystemHelper
+        init_resolver
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_mounts(fact_name) }
+          end
+
+          def root_device
+            cmdline = Util::FileHelper.safe_read('/proc/cmdline')
+            match = cmdline.match(/root=([^\s]+)/)
+            match&.captures&.first
+          end
+
+          def compute_device(device)
+            # If the "root" device, lookup the actual device from the kernel options
+            # This is done because not all systems symlink /dev/root
+            device = root_device if device == '/dev/root'
+            device
+          end
+
+          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize
+            mounts = []
+            FilesystemHelper.read_mountpoints.each do |fs|
+              device = compute_device(fs.name)
+              filesystem = fs.mount_type
+              path = fs.mount_point
+              options = fs.options.split(',').map(&:strip)
+
+              stats = FilesystemHelper.read_mountpoint_stats(path)
+              size_bytes = stats.bytes_total.abs
+              available_bytes = stats.bytes_available.abs
+
+              used_bytes = stats.bytes_used.abs
+              total_bytes = used_bytes + available_bytes
+              capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
+
+              size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+              available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
+              used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
+
+              mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
+                .map { |v| binding.local_variable_get(v) })]
+            end
+            @fact_list[:mountpoints] = mounts
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,9 +7,8 @@ module Facter
   module Resolvers
     module Solaris
       class Networking < BaseResolver
+        init_resolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
-        @interfaces = {}
 
         class << self
           private
@@ -66,7 +65,7 @@ module Facter
 
             @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
 
-            @interfaces[lifreq.name][:mtu] = lifreq[:lifr_lifru][:lifru_metric]
+            @interfaces[lifreq.name][:mtu] ||= lifreq[:lifr_lifru][:lifru_metric]
           end
 
           def load_netmask(lifreq)

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

@@ -4,9 +4,11 @@ module Facter
   module Resolvers
     module Solaris
       class OsRelease < BaseResolver
-        @fact_list ||= {}
-        @os_version_regex_patterns = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
-                                      'Solaris (\d+)[.](\d+)', 'Solaris (\d+)']
+        init_resolver
+
+        OS_VERSION_REGEX_PATTERNS = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
+                                     'Solaris (\d+)[.](\d+)', 'Solaris (\d+)'].freeze
+
         class << self
           private
 
@@ -18,7 +20,7 @@ module Facter
             result = Util::FileHelper.safe_read('/etc/release', nil)
             return @fact_list[fact_name] = nil if result.nil?
 
-            @os_version_regex_patterns.each do |os_version_regex|
+            OS_VERSION_REGEX_PATTERNS.each do |os_version_regex|
               major, minor = search_for_os_version(/#{os_version_regex}/, result)
               next unless major || minor
 

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

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

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

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

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

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

data/lib/facter/resolvers/ssh_resolver.rb

@@ -4,9 +4,12 @@ module Facter
   module Resolvers
     class SshResolver < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
-      @file_names = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub]
-      @file_paths = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh]
+
+      init_resolver
+
+      FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub].freeze
+      FILE_PATHS = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh].freeze
+
       class << self
         private
 
@@ -16,10 +19,10 @@ module Facter
 
         def retrieve_info(fact_name)
           ssh_list = []
-          @file_paths.each do |file_path|
+          FILE_PATHS.each do |file_path|
             next unless File.directory?(file_path)
 
-            @file_names.each do |file_name|
+            FILE_NAMES.each do |file_name|
               file_content = Util::FileHelper.safe_read(File.join(file_path, file_name), nil)
               next unless file_content
 

data/lib/facter/resolvers/suse_release_resolver.rb

@@ -7,7 +7,7 @@ module Facter
       # :version
       # :codename
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/sw_vers_resolver.rb

@@ -6,8 +6,8 @@ module Facter
       # :productname
       # :productversion
       # :buildversion
-      #
-      @fact_list ||= {}
+
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/timezone_resolver.rb

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

data/lib/facter/resolvers/uname_resolver.rb

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

data/lib/facter/resolvers/uptime_resolver.rb

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

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

@@ -12,6 +12,8 @@ module Resolvers
         #
         # @return [Hash] Hash containing ip address, netmask and network
         def build_binding(addr, mask_length)
+          return if !addr || !mask_length
+
           ip = IPAddr.new(addr)
           mask_helper = ip.ipv6? ? 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' : '255.255.255.255'
           mask = IPAddr.new(mask_helper).mask(mask_length)

data/lib/facter/resolvers/virt_what.rb

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

data/lib/facter/resolvers/vmware.rb

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

data/lib/facter/resolvers/windows/aio_agent_version.rb

@@ -5,7 +5,7 @@ module Facter
     module Windows
       class AioAgentVersion < BaseResolver
         REGISTRY_PATH = 'SOFTWARE\\Puppet Labs\\Puppet'
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

data/lib/facter/resolvers/windows/dmi_bios_resolver.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     class DMIBios < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         # Manufacturer

data/lib/facter/resolvers/windows/dmi_computersystem_resolver.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     class DMIComputerSystem < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         # Name

data/lib/facter/resolvers/windows/fips_resolver.rb

@@ -7,7 +7,8 @@ module Facter
     module Windows
       class Fips < BaseResolver
         # :fips_enabled
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private