facter 4.0.42 → 4.0.48

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

@@ -8,31 +8,42 @@ module Facter
     # TODO: constant is not yet available when running puppet facts
     @log_level = :warn
     @show_legacy = true
+    @custom_facts = true
+    @blocked_facts = []
+    @ruby = true
+    @external_facts = true
+    @config = nil
+    @user_query = []
+    @strict = false
+    @json = false
+    @cache = true
+    @yaml = false
+    @puppet = false
+    @ttls = []
     @block = true
-    @custom_dir = []
+    @cli = nil
     @config_file_custom_dir = []
-    @custom_facts = true
-    @external_dir = []
     @config_file_external_dir = []
     @default_external_dir = []
-    @external_facts = true
-    @ruby = true
-    @cache = true
-    @blocked_facts = []
-    @user_query = []
-    @block_list = {}
     @fact_groups = {}
+    @sequential = true
+    @ttls = []
+    @block_list = []
     @color = true
+    @trace = false
     @timing = false
+    @external_dir = []
+    @custom_dir = []
+    @hocon = false
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy,
                   :custom_facts, :blocked_facts, :ruby, :external_facts
 
-      attr_accessor :config, :user_query, :strict, :json, :haml,
+      attr_accessor :config, :user_query, :strict, :json,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color, :trace, :timing
+                    :block_list, :color, :trace, :sequential, :timing, :hocon
 
       attr_writer :external_dir
 
@@ -158,26 +169,37 @@ module Facter
         # TODO: constant is not yet available when running puppet facts
         @log_level = :warn
         @show_legacy = true
-        @block = true
         @ruby = true
         @user_query = []
-        @cli = nil
+        @json = false
+        @hocon = false
         @cache = true
-        @trace = false
+        @yaml = false
+        @puppet = false
+        @ttls = []
+        @block = true
+        @cli = nil
+        @custom_facts = true
         reset_config
       end
 
       def reset_config
-        @custom_dir = []
-        @custom_facts = true
-        @external_dir = []
-        @default_external_dir = []
-        @config_file_external_dir = []
-        @external_facts = true
         @blocked_facts = []
+        @external_facts = true
+        @config = nil
+        @strict = false
+        @config_file_custom_dir = []
+        @config_file_external_dir = []
+        @default_external_dir = []
         @fact_groups = {}
         @block_list = {}
+        @color = true
+        @sequential = true
+        @ttls = []
+        @trace = false
         @timing = false
+        @external_dir = []
+        @custom_dir = []
       end
 
       def fallback_external_dir

data/lib/facter/framework/detector/os_detector.rb

@@ -45,6 +45,7 @@ class OsDetector
     if hierarchy.empty?
       @log.debug("Could not detect hierarchy using os identifier: #{identifier} , trying with family")
 
+      # https://www.commandlinux.com/man-page/man5/os-release.5.html
       detect_family.to_s.split.each do |family|
         hierarchy = @os_hierarchy.construct_hierarchy(family)
         return hierarchy unless hierarchy.empty?

data/lib/facter/framework/detector/os_hierarchy.rb

@@ -1,29 +1,25 @@
 # frozen_string_literal: true
 
+require 'facter/config'
+
 module Facter
   class OsHierarchy
     def initialize
       @log = Log.new(self)
-      json_file_path = File.join(File.dirname(__FILE__), '../../os_hierarchy.json')
-      json_file = Util::FileHelper.safe_read(json_file_path)
-      begin
-        @json_os_hierarchy = JSON.parse(json_file)
-      rescue JSON::ParserError => _e
-        @log.error('Could not parse os_hierarchy json')
-      end
+      @os_hierarchy = Facter::Config::OS_HIERARCHY
     end
 
     def construct_hierarchy(searched_os)
       return [] if searched_os.nil?
 
       searched_os = searched_os.to_s.capitalize
-      if @json_os_hierarchy.nil?
+      if @os_hierarchy.nil?
         @log.debug("There is no os_hierarchy, will fall back to: #{searched_os}")
         return [searched_os]
       end
 
       @searched_path = []
-      search(@json_os_hierarchy, searched_os, [])
+      search(@os_hierarchy, searched_os, [])
 
       @searched_path.map { |os_name| os_name.to_s.capitalize }
     end

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

@@ -100,10 +100,10 @@ module Facter
     end
 
     def log_exception(exception)
-      msg = colorize(exception.message, RED) + "\n"
-      msg += exception.backtrace.join("\n") if Options[:trace]
+      msg = exception.message
+      msg += "\n" + exception.backtrace.join("\n") if Options[:trace]
 
-      @@logger.error(@class_name + ' - ' + msg)
+      error(msg, true)
     end
 
     private

data/lib/facter/models/fact_collection.rb

@@ -4,6 +4,7 @@ module Facter
   class FactCollection < Hash
     def initialize
       super
+      @log = Log.new(self)
     end
 
     def build_fact_collection!(facts)
@@ -39,7 +40,16 @@ module Facter
     private
 
     def bury_fact(fact)
-      bury(*fact.name.split('.') + fact.filter_tokens << fact.value)
+      split_fact_name = extract_fact_name(fact)
+      bury(*split_fact_name + fact.filter_tokens << fact.value)
+    rescue NoMethodError
+      @log.error("#{fact.type.to_s.capitalize} fact `#{fact.name}` cannot be added to collection."\
+          ' The format of this fact is incompatible with other'\
+          " facts that belong to `#{fact.name.split('.').first}` group")
+    end
+
+    def extract_fact_name(fact)
+      fact.type == :legacy ? [fact.name] : fact.name.split('.')
     end
   end
 end

data/lib/facter/models/loaded_fact.rb

@@ -3,13 +3,14 @@
 module Facter
   class LoadedFact
     attr_reader :name, :klass, :type
-    attr_accessor :file
+    attr_accessor :file, :is_env
 
     def initialize(name, klass, type = nil, file = nil)
       @name = name
       @klass = klass
       @type = type.nil? ? :core : type
       @file = file
+      @is_env = false
     end
   end
 end

data/lib/facter/resolvers/aio_agent_version.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class AioAgentVersion < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -13,7 +13,7 @@ module Facter
         end
 
         def read_agent_version
-          aio_agent_version = Util::FileHelper.safe_read('/opt/puppetlabs/puppet/VERSION', nil)&.chomp
+          aio_agent_version = Facter::Util::FileHelper.safe_read('/opt/puppetlabs/puppet/VERSION', nil)&.chomp
           aio_agent_version = aio_agent_version&.match(/^\d+\.\d+\.\d+(\.\d+){0,2}/)&.to_s
           @fact_list[:aio_agent_version] = aio_agent_version
         end

data/lib/facter/resolvers/aix/{architecture_resolver.rb → architecture.rb}

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Architecture < BaseResolver
       # :architecture
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
@@ -13,10 +14,12 @@ module Facter
         end
 
         def read_architecture(fact_name)
-          require_relative 'utils/odm_query'
-          odmquery = ODMQuery.new
+          require 'facter/util/aix/odm_query'
+
+          proc_number = read_proc
+          odmquery = Facter::Util::Aix::ODMQuery.new
           odmquery
-            .equals('name', 'proc0')
+            .equals('name', proc_number)
             .equals('attribute', 'type')
 
           result = odmquery.execute
@@ -32,6 +35,18 @@ module Facter
 
           @fact_list[fact_name]
         end
+
+        def read_proc
+          odmquery = Facter::Util::Aix::ODMQuery.new
+          odmquery
+            .equals('PdDvLn', 'processor/sys/proc_rspc')
+            .equals('status', '1')
+
+          result = odmquery.execute
+          result.each_line do |line|
+            return line.split('=')[1].strip.delete('\"') if line.include?('name')
+          end
+        end
       end
     end
   end

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Disks < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
@@ -33,7 +34,7 @@ module Facter
 
             return if stdout.empty?
 
-            info_size = InfoExtractor.extract(stdout, /PP SIZE:|TOTAL PPs:|FREE PPs:|PV STATE:/)
+            info_size = Facter::Util::Aix::InfoExtractor.extract(stdout, /PP SIZE:|TOTAL PPs:|FREE PPs:|PV STATE:/)
 
             return unless info_size['PV STATE']
 
@@ -41,7 +42,7 @@ module Facter
 
             {
               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)
             }
           end
 
@@ -49,9 +50,9 @@ module Facter
             physical_partitions = size_hash['TOTAL PPs'].to_i + size_hash['FREE PPs'].to_i
             size_physical_partition = size_hash['PP SIZE']
             exp = if size_physical_partition[/mega/]
-                    InfoExtractor::MEGABYTES_EXPONENT
+                    Facter::Util::Aix::InfoExtractor::MEGABYTES_EXPONENT
                   else
-                    InfoExtractor::GIGABYTES_EXPONENT
+                    Facter::Util::Aix::InfoExtractor::GIGABYTES_EXPONENT
                   end
             size_physical_partition.to_i * physical_partitions * exp
           end

data/lib/facter/resolvers/aix/{filesystem_resolver.rb → filesystem.rb}

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Filesystem < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -14,7 +14,7 @@ module Facter
           end
 
           def read_vtf_file(fact_name)
-            file_content = Util::FileHelper.safe_readlines('/etc/vfs')
+            file_content = Facter::Util::FileHelper.safe_readlines('/etc/vfs')
             return if file_content.empty?
 
             file_content = file_content.map do |line|

data/lib/facter/resolvers/aix/{hardware_resolver.rb → hardware.rb}

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Hardware < BaseResolver
       # :hardware
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
@@ -13,8 +14,8 @@ module Facter
         end
 
         def read_hardware(fact_name)
-          require_relative 'utils/odm_query'
-          odmquery = Facter::ODMQuery.new
+          require 'facter/util/aix/odm_query'
+          odmquery = Facter::Util::Aix::ODMQuery.new
           odmquery
             .equals('name', 'sys0')
             .equals('attribute', 'modelname')

data/lib/facter/resolvers/aix/{load_averages_resolver.rb → load_averages.rb}

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

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

@@ -4,8 +4,9 @@ module Facter
   module Resolvers
     module Aix
       class Memory < BaseResolver
+        init_resolver
         # :hardware
-        @fact_list ||= {}
+
         class << self
           private
 
@@ -43,7 +44,7 @@ module Facter
             { available_bytes: content[3].to_i * pagesize,
               total_bytes: total,
               used_bytes: used,
-              capacity: FilesystemHelper.compute_capacity(used, total) }
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used, total) }
           end
 
           def populate_swap(content, pagesize)
@@ -55,7 +56,7 @@ module Facter
             { available_bytes: total - used,
               total_bytes: total,
               used_bytes: used,
-              capacity: FilesystemHelper.compute_capacity(used, total) }
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used, total) }
           end
         end
       end

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Mountpoints < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         BLOCK_SIZE = 512
 
         class << self
@@ -52,13 +53,13 @@ module Facter
             used_bytes = info[2]
             size_bytes = info[1]
             @fact_list[:mountpoints][info.last].merge!(
-              capacity: FilesystemHelper.compute_capacity(used_bytes, size_bytes),
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, size_bytes),
               available_bytes: available_bytes,
               used_bytes: used_bytes,
               size_bytes: size_bytes,
-              available: FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes),
-              used: FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes),
-              size: FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+              available: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes),
+              used: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes),
+              size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes)
             )
           end
         end

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Networking < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -21,7 +21,7 @@ module Facter
 
             populate_with_mtu_and_mac!(@fact_list[:interfaces])
             get_primary_interface_info(output)
-            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
             @fact_list[fact_name]
           end
 
@@ -49,7 +49,8 @@ module Facter
             mask_length = mask_length.to_i - 1 unless is_ipv4
             @fact_list[:interfaces][name] ||= {}
             @fact_list[:interfaces][name][bind_to_add] ||= []
-            @fact_list[:interfaces][name][bind_to_add] << ::Resolvers::Utils::Networking.build_binding(ip, mask_length)
+            @fact_list[:interfaces][name][bind_to_add] << Facter::Util::Resolvers::Networking
+                                                          .build_binding(ip, mask_length)
           end
 
           def populate_with_mtu_and_mac!(interfaces)

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

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