facter 4.0.43 → 4.0.49

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 → ssh.rb}

@@ -2,11 +2,14 @@
 
 module Facter
   module Resolvers
-    class SshResolver < BaseResolver
+    class Ssh < 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,15 +19,16 @@ 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_content = Util::FileHelper.safe_read(File.join(file_path, file_name), nil)
+            FILE_NAMES.each do |file_name|
+              file_content = Facter::Util::FileHelper.safe_read(File.join(file_path, file_name), nil)
               next unless file_content
 
               key_type, key = file_content.split(' ')
-              ssh_list << ::Resolvers::Utils::SshHelper.create_ssh(key_type, key)
+              ssh = Facter::Util::Resolvers::SshHelper.create_ssh(key_type, key)
+              ssh_list << ssh if ssh
             end
           end
           @fact_list[:ssh] = ssh_list

data/lib/facter/resolvers/{suse_release_resolver.rb → suse_release.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_suse_release(fact_name)
-          output = Util::FileHelper.safe_read('/etc/SuSE-release', nil)
+          output = Facter::Util::FileHelper.safe_read('/etc/SuSE-release', nil)
           return @fact_list[fact_name] = nil if output.nil?
 
           output_strings = output.split(' ')

data/lib/facter/resolvers/{sw_vers_resolver.rb → sw_vers.rb}

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

data/lib/facter/resolvers/{timezone_resolver.rb → timezone.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 → uname.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 → uptime.rb}

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Uptime < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -13,7 +13,7 @@ module Facter
         end
 
         def uptime_system_call(fact_name)
-          seconds = Facter::UptimeParser.uptime_seconds_unix
+          seconds = Facter::Util::Facts::UptimeParser.uptime_seconds_unix
           build_fact_list(seconds)
 
           @fact_list[fact_name]
@@ -22,7 +22,7 @@ module Facter
         def build_fact_list(seconds)
           return @fact_list[:uptime] = 'unknown' unless seconds
 
-          @fact_list = Utils::UptimeHelper.create_uptime_hash(seconds)
+          @fact_list = Facter::Util::Resolvers::UptimeHelper.create_uptime_hash(seconds)
         end
       end
     end

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
@@ -30,7 +30,7 @@ module Facter
             return if puppet_aio_path.nil? || puppet_aio_path.empty?
 
             puppet_aio_version_path = File.join(puppet_aio_path, 'VERSION')
-            aio_agent_version = Util::FileHelper.safe_read(puppet_aio_version_path, nil)&.chomp
+            aio_agent_version = Facter::Util::FileHelper.safe_read(puppet_aio_version_path, nil)&.chomp
 
             @fact_list[:aio_agent_version] = aio_agent_version&.match(/^\d+\.\d+\.\d+(\.\d+){0,2}/)&.to_s
           end

data/lib/facter/resolvers/windows/{dmi_bios_resolver.rb → dmi_bios.rb}

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     class DMIBios < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         # Manufacturer
@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_fact_from_bios(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
 
           bios = win.return_first('SELECT Manufacturer,SerialNumber from Win32_BIOS')
           unless bios

data/lib/facter/resolvers/windows/{dmi_computersystem_resolver.rb → dmi_computersystem.rb}

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     class DMIComputerSystem < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         # Name
@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_fact_from_computer_system(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           computersystem = win.return_first('SELECT Name,UUID FROM Win32_ComputerSystemProduct')
           unless computersystem
             @log.debug 'WMI query returned no results for Win32_ComputerSystemProduct with values Name and UUID.'

data/lib/facter/resolvers/windows/{fips_resolver.rb → fips.rb}

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

data/lib/facter/resolvers/windows/{hardware_architecture_resolver.rb → hardware_architecture.rb}

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

data/lib/facter/resolvers/windows/{identity_resolver.rb → identity.rb}

@@ -5,7 +5,8 @@ module Facter
     class Identity < BaseResolver
       NAME_SAM_COMPATIBLE = 2
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/windows/{kernel_resolver.rb → kernel.rb}

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

data/lib/facter/resolvers/windows/{memory_resolver.rb → memory.rb}

@@ -4,7 +4,9 @@ module Facter
   module Resolvers
     class Memory < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
+
       class << self
         private
 
@@ -21,6 +23,10 @@ module Facter
             return
           end
 
+          # we need to enlarge the scope of this pointer so that Ruby GC will not free the memory.
+          # If the pointer if freed, Lifreq structures will contain garbage from memory.
+          @long_living_pointer = state_ptr
+
           PerformanceInformation.new(state_ptr)
         end
 

data/lib/facter/resolvers/windows/{netkvm_resolver.rb → netkvm.rb}

@@ -5,7 +5,8 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class NetKVM < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 

data/lib/facter/resolvers/windows/{networking_resolver.rb → networking.rb}

@@ -5,7 +5,8 @@ module Facter
     module Windows
       class Networking < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
@@ -25,7 +26,9 @@ module Facter
 
             iterate_list(adapter_addresses)
 
-            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
+
+            retrieve_domain_from_registry if !@fact_list[:domain] || @fact_list[:domain].empty?
 
             @fact_list[fact_name]
           end
@@ -119,16 +122,27 @@ module Facter
           def find_bindings(sock_addr, unicast, addr)
             return unless [NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family])
 
-            ::Resolvers::Utils::Networking.build_binding(addr, unicast[:OnLinkPrefixLength])
+            Facter::Util::Resolvers::Networking.build_binding(addr, unicast[:OnLinkPrefixLength])
           end
 
           def find_primary_interface(sock_addr, name, addr)
             if !@fact_list[:primary_interface] &&
                ([NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family]) &&
-               !::Resolvers::Utils::Networking.ignored_ip_address(addr))
+               !::Facter::Util::Resolvers::Networking.ignored_ip_address(addr))
               @fact_list[:primary_interface] = name.to_s
             end
           end
+
+          def retrieve_domain_from_registry
+            ::Win32::Registry::HKEY_LOCAL_MACHINE.open('SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters') do |rg|
+              rg.each do |name, _value|
+                @fact_list[:domain] = rg[name] if name == 'Domain'
+              end
+            end
+          rescue Win32::Registry::Error
+            @log.debug('Could not read TCPIP Parameters from registry')
+            nil
+          end
         end
       end
     end

data/lib/facter/resolvers/windows/{processors_resolver.rb → processors.rb}

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class Processors < BaseResolver
-      @fact_list = {}
+      init_resolver
+
       class << self
         # Count
         # Isa
@@ -17,7 +18,7 @@ module Facter
         end
 
         def read_fact_from_win32_processor(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           proc = win.exec_query('SELECT Name,Architecture,NumberOfLogicalProcessors FROM Win32_Processor')
           unless proc
             log.debug 'WMI query returned no results'\

data/lib/facter/resolvers/windows/{product_release_resolver.rb → product_release.rb}

@@ -5,7 +5,8 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class ProductRelease < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 

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

@@ -5,7 +5,9 @@ module Facter
     module Windows
       class Ssh < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        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
         class << self
@@ -22,11 +24,11 @@ module Facter
             ssh_list = []
 
             FILE_NAMES.each do |file_name|
-              output = Util::FileHelper.safe_read(File.join(ssh_dir, file_name))
+              output = Facter::Util::FileHelper.safe_read(File.join(ssh_dir, file_name))
               next if output.empty?
 
               key_type, key = output.split(' ')
-              ssh_list << ::Resolvers::Utils::SshHelper.create_ssh(key_type, key)
+              ssh_list << Facter::Util::Resolvers::SshHelper.create_ssh(key_type, key)
             end
             @fact_list[:ssh] = ssh_list.empty? ? nil : ssh_list
             @fact_list[fact_name]

data/lib/facter/resolvers/windows/{system32_resolver.rb → system32.rb}

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

data/lib/facter/resolvers/windows/{uptime_resolver.rb → uptime.rb}

@@ -7,7 +7,8 @@ module Facter
     module Windows
       class Uptime < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
 
         class << self
           private
@@ -17,7 +18,7 @@ module Facter
           end
 
           def substract_system_uptime_from_ole
-            win = Win32Ole.new
+            win = Facter::Util::Windows::Win32Ole.new
             opsystem = win.return_first('SELECT LocalDateTime,LastBootUpTime FROM Win32_OperatingSystem')
             unless opsystem
               @log.debug 'WMI query returned no results'\

data/lib/facter/resolvers/windows/{virtualization_resolver.rb → virtualization.rb}

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Virtualization < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
 
       class << self
         # Virtual
@@ -20,7 +21,7 @@ module Facter
         end
 
         def read_fact_from_computer_system(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           comp = win.exec_query('SELECT Manufacturer,Model,OEMStringArray FROM Win32_ComputerSystem')
           unless comp
             @log.debug 'WMI query returned no results for Win32_ComputerSystem with values'\