facter 4.0.44 → 4.0.50

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -24,11 +24,27 @@ module Facter
       @internal_facts = load_internal_facts(options)
       @external_facts = load_external_facts(options)
 
+      filter_env_facts
+
       @facts = @internal_facts + @external_facts
     end
 
     private
 
+    def filter_env_facts
+      env_fact_names = @external_facts.select { |fact| fact.is_env == true }.map(&:name)
+      return unless env_fact_names.any?
+
+      @internal_facts.delete_if do |fact|
+        if env_fact_names.include?(fact.name)
+          @log.debug("Reading #{fact.name} fact from environment variable")
+          true
+        else
+          false
+        end
+      end
+    end
+
     def load_internal_facts(options)
       @log.debug('Loading internal facts')
       internal_facts = []
@@ -67,6 +83,8 @@ module Facter
     def block_facts(facts, options)
       blocked_facts = options[:blocked_facts] || []
 
+      facts.reject! { |fact| fact.type == :legacy } if options[:block_list]&.include?('legacy')
+
       reject_list_core, reject_list_legacy = construct_reject_lists(blocked_facts, facts)
 
       facts = facts.reject do |fact|
@@ -84,7 +102,7 @@ module Facter
 
       blocked_facts.each do |blocked|
         facts.each do |fact|
-          next unless fact.name =~ /^#{blocked}/
+          next unless fact.name =~ /^#{blocked}\..*|^#{blocked}$/
 
           if fact.type == :core
             reject_list_core << fact

data/lib/facter/framework/core/fact_manager.rb

@@ -17,8 +17,7 @@ module Facter
     end
 
     def resolve_facts(user_query = [])
-      loaded_facts = @fact_loader.load(Options.get)
-      searched_facts = QueryParser.parse(user_query, loaded_facts)
+      searched_facts = parse_user_query(user_query)
 
       cache_manager = Facter::CacheManager.new
       searched_facts, cached_facts = cache_manager.resolve_facts(searched_facts)
@@ -27,11 +26,12 @@ module Facter
 
       resolved_facts = override_core_facts(internal_facts, external_facts)
 
-      cache_manager.cache_facts(resolved_facts)
       resolved_facts = resolved_facts.concat(cached_facts)
+      cache_manager.cache_facts(resolved_facts)
 
       FactFilter.new.filter_facts!(resolved_facts)
 
+      log_resolved_facts(resolved_facts)
       resolved_facts
     end
 
@@ -47,6 +47,12 @@ module Facter
 
     private
 
+    def parse_user_query(user_query)
+      loaded_facts = @fact_loader.load(Options.get)
+
+      QueryParser.parse(user_query, loaded_facts)
+    end
+
     def override_core_facts(core_facts, custom_facts)
       return core_facts unless custom_facts
 
@@ -60,5 +66,11 @@ module Facter
     def root_fact_name(fact)
       fact.name.split('.').first
     end
+
+    def log_resolved_facts(resolved_facts)
+      resolved_facts.each do |fact|
+        @log.debug("fact \"#{fact.name}\" has resolved to: #{fact.value}") unless fact.value.nil?
+      end
+    end
   end
 end

data/lib/facter/framework/core/file_loader.rb

@@ -34,7 +34,11 @@ require 'facter/framework/config/fact_groups'
 
 load_dir(['config'])
 
-load_dir(%w[resolvers utils])
+load_dir(['util'])
+load_dir(%w[util resolvers])
+load_dir(%w[util facts])
+load_dir(%w[util resolvers networking])
+
 load_dir(['resolvers'])
 load_dir(['facts_utils'])
 load_dir(%w[framework core])
@@ -47,12 +51,12 @@ load_dir(%w[framework core fact external])
 load_dir(%w[framework formatters])
 
 os_hierarchy = OsDetector.instance.hierarchy
+os_hierarchy.each { |operating_system| load_dir(['util', operating_system.downcase, '**']) }
 os_hierarchy.each { |operating_system| load_dir(['facts', operating_system.downcase, '**']) }
 os_hierarchy.each { |operating_system| load_dir(['resolvers', operating_system.downcase, '**']) }
 
 require 'facter/custom_facts/core/legacy_facter'
 load_dir(%w[framework utils])
-load_dir(['util'])
 
 require 'facter/framework/core/fact_augmenter'
 require 'facter/framework/parsers/query_parser'

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

@@ -19,14 +19,18 @@ module Facter
       private
 
       def augment_all
-        if Options.cli?
-          augment_cli(Facter::ConfigReader.cli)
-          augment_ruby(Facter::ConfigReader.global)
-        end
+        augment_cli(Facter::ConfigReader.cli) if Options.cli?
+        augment_globals
+        augment_facts(Facter::ConfigReader.ttls, Facter::ConfigReader.fact_groups)
+      end
+
+      def augment_globals
+        augment_ruby(Facter::ConfigReader.global)
+
         augment_custom(Facter::ConfigReader.global)
         augment_external(Facter::ConfigReader.global)
         augment_show_legacy(Facter::ConfigReader.global)
-        augment_facts(Facter::ConfigReader.ttls, Facter::ConfigReader.fact_groups)
+        augment_sequential(Facter::ConfigReader.global)
       end
 
       def augment_config_path(config_path)
@@ -68,6 +72,7 @@ module Facter
 
       def augment_ruby(global_conf)
         return unless global_conf
+        return unless Options.cli?
 
         @options[:no_ruby] = global_conf['no-ruby'].nil? ? false : global_conf['no-ruby']
       end
@@ -78,6 +83,12 @@ module Facter
         @options[:show_legacy] = global_conf['show-legacy'] unless global_conf['show-legacy'].nil?
       end
 
+      def augment_sequential(global_conf)
+        return unless global_conf
+
+        @options[:sequential] = global_conf['sequential'] unless global_conf['sequential'].nil?
+      end
+
       def augment_facts(ttls, groups)
         fact_groups = Facter::FactGroups.new
 

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

@@ -26,12 +26,15 @@ module Facter
     @config_file_external_dir = []
     @default_external_dir = []
     @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,
@@ -40,7 +43,7 @@ module Facter
       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
 
@@ -169,17 +172,18 @@ module Facter
         @ruby = true
         @user_query = []
         @json = false
+        @hocon = false
         @cache = true
         @yaml = false
         @puppet = false
         @ttls = []
         @block = true
         @cli = nil
+        @custom_facts = true
         reset_config
       end
 
       def reset_config
-        @custom_facts = true
         @blocked_facts = []
         @external_facts = true
         @config = nil
@@ -188,8 +192,10 @@ module Facter
         @config_file_external_dir = []
         @default_external_dir = []
         @fact_groups = {}
-        @block_list = []
+        @block_list = {}
         @color = true
+        @sequential = true
+        @ttls = []
         @trace = false
         @timing = false
         @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?
@@ -63,7 +64,14 @@ class OsDetector
     Facter::Resolvers::OsRelease.resolve(:id_like)
   end
 
+  def detect_based_on_release_file
+    @identifier = :devuan if File.readable?('/etc/devuan_version')
+  end
+
   def detect_distro
+    detect_based_on_release_file
+    return @identifier if @identifier
+
     [Facter::Resolvers::OsRelease,
      Facter::Resolvers::RedHatRelease,
      Facter::Resolvers::SuseRelease].each do |resolver|

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,17 +3,17 @@
 module Facter
   module Resolvers
     class AioAgentVersion < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_agent_version }
         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,19 +4,20 @@ module Facter
   module Resolvers
     class Architecture < BaseResolver
       # :architecture
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_architecture(fact_name) }
         end
 
         def read_architecture(fact_name)
-          require_relative 'utils/odm_query'
+          require 'facter/util/aix/odm_query'
 
           proc_number = read_proc
-          odmquery = ODMQuery.new
+          odmquery = Facter::Util::Aix::ODMQuery.new
           odmquery
             .equals('name', proc_number)
             .equals('attribute', 'type')
@@ -36,7 +37,7 @@ module Facter
         end
 
         def read_proc
-          odmquery = ODMQuery.new
+          odmquery = Facter::Util::Aix::ODMQuery.new
           odmquery
             .equals('PdDvLn', 'processor/sys/proc_rspc')
             .equals('status', '1')

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

@@ -4,11 +4,12 @@ module Facter
   module Resolvers
     module Aix
       class Disks < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { execute_lspv(fact_name) }
           end
 
@@ -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/ffi/ffi.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      module FFI
+        RTM_IFINFO = 0xe
+        RTM_NEWADDR = 0xc
+
+        RTAX_DST = 0
+        RTAX_GATEWAY = 1
+        RTAX_NETMASK = 2
+        RTAX_GENMASK = 3
+        RTAX_IFP = 4
+        RTAX_IFA = 5
+        RTAX_AUTHOR = 6
+        RTAX_BRD = 7
+        RTAX_MAX = 8
+
+        RTA_DST = 0x1
+        RTA_GATEWAY = 0x2
+        RTA_NETMASK = 0x4
+        RTA_GENMASK = 0x8
+        RTA_IFP = 0x10
+        RTA_IFA = 0x20
+        RTA_AUTHOR = 0x40
+        RTA_BRD = 0x80
+        RTA_DOWNSTREAM = 0x100
+
+        AF_UNSPEC = 0
+        AF_INET = 2
+        AF_INET6 = 24
+        AF_MAX = 30
+
+        INET_ADDRSTRLEN = 16
+        INET6_ADDRSTRLEN = 46
+
+        RTAX_LIST = [
+          RTAX_DST,
+          RTAX_GATEWAY,
+          RTAX_NETMASK,
+          RTAX_GENMASK,
+          RTAX_IFP,
+          RTAX_IFA,
+          RTAX_AUTHOR,
+          RTAX_BRD
+        ].freeze
+
+        RTA_LIST = [
+          RTA_DST,
+          RTA_GATEWAY,
+          RTA_NETMASK,
+          RTA_GENMASK,
+          RTA_IFP,
+          RTA_IFA,
+          RTA_AUTHOR,
+          RTA_BRD,
+          RTA_DOWNSTREAM
+        ].freeze
+      end
+    end
+  end
+end