facter 4.0.41 → 4.0.47

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
@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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,7 @@ module Facter
 
             iterate_list(adapter_addresses)
 
-            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
 
             @fact_list[fact_name]
           end
@@ -119,13 +120,13 @@ 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

data/lib/facter/resolvers/windows/processors_resolver.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

@@ -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

@@ -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

@@ -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

@@ -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'\

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

@@ -4,7 +4,9 @@ module Facter
   module Resolvers
     class WinOsDescription < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
+
       class << self
         private
 
@@ -13,7 +15,7 @@ module Facter
         end
 
         def read_from_ole(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           op_sys = win.return_first('SELECT ProductType,OtherTypeDescription FROM Win32_OperatingSystem')
           unless op_sys
             @log.debug 'WMI query returned no results for Win32_OperatingSystem'\

data/lib/facter/resolvers/wpar_resolver.rb

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

data/lib/facter/resolvers/xen.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Xen < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       XEN_PATH = '/proc/xen/capabilities'
       XEN_TOOLSTACK = '/usr/lib/xen-common/bin/xen-toolstack'
@@ -32,7 +32,7 @@ module Facter
         end
 
         def privileged?(xen_type)
-          content = Util::FileHelper.safe_read(XEN_PATH, nil)
+          content = Facter::Util::FileHelper.safe_read(XEN_PATH, nil)
           content&.strip == 'control_d' || xen_type == 'xen0'
         end
 

data/lib/facter/resolvers/zfs.rb

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

data/lib/facter/resolvers/zpool.rb

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

data/lib/facter/util/aix/info_extractor.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facter
+  module Util
+    module Aix
+      module InfoExtractor
+        MEGABYTES_EXPONENT = 1024**2
+        GIGABYTES_EXPONENT = 1024**3
+
+        def self.extract(content, regex)
+          content = content.each_line.map do |line|
+            next unless regex =~ line
+
+            line.split(/:\s*|\s{2,}/)
+          end
+
+          content.flatten!.reject!(&:nil?)
+
+          Hash[*content]
+        end
+      end
+    end
+  end
+end

data/lib/facter/util/aix/odm_query.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# CuAt (Customized Attributes) non-default attribute values
+# CuDv (Customized Devices) the devices present on this machine
+# PdAt (Predefined Attributes) default values for all device attributes
+# PdDv (Predefined Devices) the list of all devices supported by this release of AIX
+
+module Facter
+  module Util
+    module Aix
+      class ODMQuery
+        REPOS = %w[CuAt CuDv PdAt PdDv].freeze
+
+        def initialize
+          @query = ''
+          @conditions = []
+          @log = Facter::Log.new(self)
+        end
+
+        def equals(field, value)
+          @conditions << "#{field}='#{value}'"
+          self
+        end
+
+        def like(field, value)
+          @conditions << "#{field} like '#{value}'"
+          self
+        end
+
+        def execute
+          result = nil
+          REPOS.each do |repo|
+            break if result && !result.empty?
+
+            result = Facter::Core::Execution.execute("#{query} #{repo}", logger: @log)
+          end
+          result
+        end
+
+        def query
+          'odmget -q "' + @conditions.join(' AND ') + '"'
+        end
+      end
+    end
+  end
+end

data/lib/facter/util/api_debugger.rb

@@ -1,43 +1,47 @@
 # frozen_string_literal: true
 
-module ApiDebugger
-  def self.prepended(receiver) # rubocop:disable Metrics/AbcSize
-    exclude, print_caller = parse_options(ENV['API_DEBUG'])
+module Facter
+  module Util
+    module ApiDebugger
+      def self.prepended(receiver) # rubocop:disable Metrics/AbcSize
+        exclude, print_caller = parse_options(ENV['API_DEBUG'])
 
-    receiver_methods = receiver.instance_methods - Object.methods
-    receiver_methods.each do |meth|
-      ApiDebugger.class_eval do
-        define_method(meth) do |*args|
-          method_call = super(*args)
+        receiver_methods = receiver.instance_methods - Object.methods
+        receiver_methods.each do |meth|
+          ApiDebugger.class_eval do
+            define_method(meth) do |*args|
+              method_call = super(*args)
 
-          unless exclude.include?(meth)
-            puts '#' * 80
-            puts "Method call: #{meth}"
-            puts "Called with: #{args.inspect}"
-            if print_caller.include?(meth)
-              puts '-' * 80
-              puts caller
+              unless exclude.include?(meth)
+                puts '#' * 80
+                puts "Method call: #{meth}"
+                puts "Called with: #{args.inspect}"
+                if print_caller.include?(meth)
+                  puts '-' * 80
+                  puts caller
+                end
+                puts '#' * 80
+              end
+              method_call
             end
-            puts '#' * 80
           end
-          method_call
         end
       end
-    end
-  end
 
-  def self.parse_options(options)
-    exclude = []
-    print_caller = []
+      def self.parse_options(options)
+        exclude = []
+        print_caller = []
+
+        options.split(',').each do |option|
+          if option.start_with?('-')
+            exclude << option[1..-1].to_sym
+          elsif option.start_with?('+')
+            print_caller << option[1..-1].to_sym
+          end
+        end
 
-    options.split(',').each do |option|
-      if option.start_with?('-')
-        exclude << option[1..-1].to_sym
-      elsif option.start_with?('+')
-        print_caller << option[1..-1].to_sym
+        [exclude, print_caller]
       end
     end
-
-    [exclude, print_caller]
   end
 end