facter 4.0.41 → 4.0.47

data/lib/facter/framework/core/fact/internal/core_fact.rb

@@ -11,7 +11,12 @@ module Facter
 
       return unless fact_class
 
-      fact_class.new.call_the_resolver
+      fact_value = nil
+      Facter::Framework::Benchmarking::Timer.measure(@searched_fact.name) do
+        fact_value = fact_class.new.call_the_resolver
+      end
+
+      fact_value
     end
   end
 end

data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb

@@ -7,7 +7,15 @@ module Facter
     def resolve_facts(searched_facts)
       internal_searched_facts = filter_internal_facts(searched_facts)
 
-      resolved_facts = resolve(internal_searched_facts)
+      resolved_facts = if Options[:sequential]
+                         @@log.debug('Resolving facts sequentially')
+                         resolve_sequentially(internal_searched_facts)
+                       else
+                         @@log.debug('Resolving fact in parallel')
+                         threads = start_threads(internal_searched_facts)
+                         join_threads(threads, internal_searched_facts)
+                       end
+
       nil_resolved_facts = resolve_nil_facts(searched_facts)
 
       resolved_facts.concat(nil_resolved_facts)
@@ -28,7 +36,7 @@ module Facter
       resolved_facts
     end
 
-    def resolve(searched_facts)
+    def resolve_sequentially(searched_facts)
       resolved_facts = []
 
       searched_facts
@@ -36,8 +44,7 @@ module Facter
         .each do |searched_fact|
         begin
           fact = CoreFact.new(searched_fact)
-          fact_value = nil
-          Facter::Framework::Benchmarking::Timer.measure(searched_fact.name) { fact_value = fact.create }
+          fact_value = fact.create
           resolved_facts << fact_value unless fact_value.nil?
         rescue StandardError => e
           @@log.log_exception(e)
@@ -47,5 +54,32 @@ module Facter
       resolved_facts.flatten!
       FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
     end
+
+    def start_threads(searched_facts)
+      # only resolve a fact once, even if multiple search facts depend on that fact
+      searched_facts
+        .uniq { |searched_fact| searched_fact.fact_class.name }
+        .map do |searched_fact|
+        Thread.new do
+          resolve_fact(searched_fact)
+        end
+      end
+    end
+
+    def join_threads(threads, searched_facts)
+      resolved_facts = threads.map(&:value)
+      resolved_facts.compact!
+      resolved_facts.flatten!
+
+      FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
+    end
+
+    def resolve_fact(searched_fact)
+      fact = CoreFact.new(searched_fact)
+      fact.create
+    rescue StandardError => e
+      @@log.log_exception(e)
+      nil
+    end
   end
 end

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

@@ -16,7 +16,7 @@ module Facter
     private_class_method def self.get_resolved_facts_for_searched_fact(searched_fact, resolved_facts)
       if searched_fact.name.include?('.*')
         resolved_facts
-          .select { |resolved_fact| resolved_fact.name.match(searched_fact.user_query) }
+          .select { |resolved_fact| resolved_fact.name.match(searched_fact.name) }
           .reject(&:user_query)
           .uniq(&:name)
       else

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

@@ -21,8 +21,9 @@ module Facter
 
       custom_facts_to_load = LegacyFacter.collection.custom_facts
 
-      custom_facts_to_load&.each do |custom_fact_name|
-        loaded_fact = LoadedFact.new(custom_fact_name.to_s, nil, :custom)
+      custom_facts_to_load&.each do |k, v|
+        loaded_fact = LoadedFact.new(k.to_s, nil, :custom)
+        loaded_fact.is_env = v.options[:is_env] if v.options[:is_env]
         custom_facts << loaded_fact
       end
 
@@ -37,6 +38,7 @@ module Facter
       external_facts_to_load&.each do |k, v|
         loaded_fact = LoadedFact.new(k.to_s, nil, :external)
         loaded_fact.file = v.options[:file]
+        loaded_fact.is_env = v.options[:is_env]
         external_facts << loaded_fact
       end
 

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 = []
@@ -84,7 +100,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

@@ -8,31 +8,41 @@ 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 = []
 
     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
 
       attr_writer :external_dir
 
@@ -158,26 +168,36 @@ 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
         @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_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