facter 4.0.21 → 4.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f98a392ad6a05f9c7ad8d5ea4b1f95792ccd133c4d4069b737710cb40d5f4bc
-  data.tar.gz: 61d8fb70c31865da5ea20b4e96e8331756cb1babca66dfcb89a369aa7d684326
+  metadata.gz: bac8104b3cb1089d8ec98cb6ce258acd13dd1278893c51a57726b25d2767f9dd
+  data.tar.gz: 93bf171d4bdc05edeca4fb79d8797af52404ce08da575cae8786fb40cd3534dc
 SHA512:
-  metadata.gz: 03a6701d831ba8442ef9680a059781eb1b86f5b8ebd93ec7487b1b556345674d13cf37905fcad3da7f4aede956d82a69c4f3abd8facc0eea9961652e325c6a24
-  data.tar.gz: 7c04baac0acfe2b148e7a0a12adf935e5bc06770f7711f22aa35078c901f18ed0cd5096b403a16071c5150954db8175b521d254c170fc215327e11cb435db6fa
+  metadata.gz: 0e155dd9dd597c9de0a223b45fc6dbe269fcda89d79b80be6527debd407cd22a2dd05c5bd788941fb4e15ef5794a41638da602cdce295495ef513865258d2bd6
+  data.tar.gz: 306c94ffbee046cba1e4dbd351b81f45df23b79383375ec969b1ef72df6f946b1e175758f467eaedc2d5e6bca33f0e6c884827eefb28562a81e88e8017d03c09

data/.github/workflows/acceptance_tests.yml

@@ -57,5 +57,11 @@ jobs:
           sudo chmod a-w /home/runner /usr/share &&
           sudo chmod -R a-w /usr/share/rust /home/runner/.config /home/linuxbrew
 
+      - name: Instal dhclient
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt install dhcpcd5
+          sudo dhclient
+
       - name: Run acceptance tests
         run: sudo -E "PATH=$PATH" ruby facter_4/.github/actions/presuite.rb

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 
 
+## [4.0.22](https://github.com/puppetlabs/facter-ng/tree/4.0.22) (2020-05-20)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.21...4.0.22)
+
+### Added
+
+- \(FACT-2603\) Detect virtual on GCE vms [\#521](https://github.com/puppetlabs/facter-ng/pull/521) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2602\) Add docker/Lxc resolver for Linux [\#520](https://github.com/puppetlabs/facter-ng/pull/520) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2615\) Add Solaris mountpoints fact [\#515](https://github.com/puppetlabs/facter-ng/pull/515) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2532\) Add Aix nim\_type fact [\#513](https://github.com/puppetlabs/facter-ng/pull/513) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2183\) Add Solaris's uptime legacy facts [\#511](https://github.com/puppetlabs/facter-ng/pull/511) ([oanatmaria](https://github.com/oanatmaria))
+
+### Fixed
+
+- \(FACT-2617\) Fix for tests/external\_facts/external\_fact\_stderr\_messages\_output\_to\_stderr.rb [\#522](https://github.com/puppetlabs/facter-ng/pull/522) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2523\) Fix for tests/external\_facts/non\_root\_users\_default\_external\_fact\_directory.rb [\#518](https://github.com/puppetlabs/facter-ng/pull/518) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2522\) Fix for tests/external\_facts/fact\_directory\_precedence.rb [\#517](https://github.com/puppetlabs/facter-ng/pull/517) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2521\) Fix for tests/external\_facts/external\_fact\_overrides\_custom\_fact\_with\_10000\_weight\_or\_less.rb [\#514](https://github.com/puppetlabs/facter-ng/pull/514) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2525\) Fix for tests/options/color.rb [\#512](https://github.com/puppetlabs/facter-ng/pull/512) ([IrimieBogdan](https://github.com/IrimieBogdan))
+
+
+
 ## [4.0.21](https://github.com/puppetlabs/facter-ng/tree/4.0.21) (2020-05-13)
 
 [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.20...4.0.21)

data/VERSION

@@ -1 +1 @@
-4.0.21
+4.0.22

data/lib/custom_facts/util/collection.rb

@@ -95,7 +95,7 @@ module LegacyFacter
         return @external_facts unless @external_facts.nil?
 
         load_external_facts
-        external_facts = @facts.reject { |_k, v| v.options[:fact_type] }
+        external_facts = @facts.select { |_k, v| v.options[:fact_type] == :external }
         @external_facts = Facter::Utils.deep_copy(external_facts.keys)
       end
 

data/lib/custom_facts/util/config.rb

@@ -42,11 +42,16 @@ module LegacyFacter
           Facter::Options[:default_external_dir] = if windows_dir
                                                      [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
                                                    else
-                                                     ['/opt/puppetlabs/facter/facts.d']
+                                                     [
+                                                       '/etc/puppetlabs/facter/facts.d',
+                                                       '/etc/facter/facts.d/',
+                                                       '/opt/puppetlabs/facter/facts.d'
+                                                     ]
                                                    end
         elsif ENV['HOME']
           Facter::Options[:default_external_dir] =
-            [File.expand_path(File.join(ENV['HOME'], '.puppetlabs', 'opt', 'facter', 'facts.d'))]
+            [File.join(ENV['HOME'], '.facter', 'facts.d'),
+             File.join(ENV['HOME'], '.puppetlabs', 'opt', 'facter', 'facts.d')]
         else
           Facter::Options[:default_external_dir] = []
         end

data/lib/custom_facts/util/directory_loader.rb

@@ -64,7 +64,7 @@ module LegacyFacter
           elsif (data == {}) || data.nil?
             LegacyFacter.warn "Fact file #{file} was parsed but returned an empty data set"
           else
-            data.each { |p, v| collection.add(p, value: v) { has_weight(weight) } }
+            data.each { |p, v| collection.add(p, value: v, fact_type: :external) { has_weight(weight) } }
           end
         end
       end

data/lib/custom_facts/util/fact.rb

@@ -161,7 +161,7 @@ module Facter
       end
 
       def sort_by_weight(resolutions)
-        resolutions.sort { |a, b| b.weight <=> a.weight }
+        resolutions.sort { |a, b| b <=> a }
       end
 
       def find_first_real_value(resolutions)

data/lib/custom_facts/util/resolution.rb

@@ -13,7 +13,7 @@ module Facter
   module Util
     class Resolution
       # @api private
-      attr_accessor :code
+      attr_accessor :code, :fact_type
       attr_writer :value
 
       extend Facter::Core::Execution
@@ -129,8 +129,29 @@ module Facter
         end
       end
 
+      # Comparation is done based on weight and fact type.
+      # The greatter the weight, the higher the priority.
+      # If weights are equal, we consider external facts greater than custom facts
+      def <=>(other)
+        return compare_equal_weights(other) if weight == other.weight
+        return 1 if weight > other.weight
+        return -1 if weight < other.weight
+      end
+
       private
 
+      # If the weights are equal, we consider external facts greater tan custom facts
+      def compare_equal_weights(other)
+        # Other is considered greater because self is custom fact and other is external
+        return -1 if fact_type == :custom && other.fact_type == :external
+
+        # Self is considered greater, because it is external fact and other is custom
+        return 1 if fact_type == :external && other.fact_type == :custom
+
+        # They are considered equal
+        0
+      end
+
       def resolve_value
         if @value
           @value

data/lib/facter.rb

@@ -12,7 +12,7 @@ module Facter
   class ResolveCustomFactError < StandardError; end
 
   Options.init
-  Log.add_legacy_logger(STDOUT)
+  Log.output(STDOUT)
   @already_searched = {}
   @trace = false
 

data/lib/facts/aix/nim_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class NimType
+      FACT_NAME = 'nim_type'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Aix::Nim.resolve(:type)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/linux/hypervisors.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    class Hypervisors
+      FACT_NAME = 'hypervisors'
+
+      def call_the_resolver
+        fact_value = check_docker_lxc
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+
+      def check_docker_lxc
+        Facter::Resolvers::DockerLxc.resolve(:hypervisor)
+      end
+    end
+  end
+end

data/lib/facts/linux/virtual.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    class Virtual
+      FACT_NAME = 'virtual'
+
+      def call_the_resolver
+        fact_value = check_docker_lxc || check_gce
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+
+      def check_gce
+        bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
+        'gce' if bios_vendor&.include?('Google')
+      end
+
+      def check_docker_lxc
+        Facter::Resolvers::DockerLxc.resolve(:vm)
+      end
+    end
+  end
+end

data/lib/facts/solaris/mountpoints.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Mountpoints
+      FACT_NAME = 'mountpoints'
+
+      def call_the_resolver
+        mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(FACT_NAME.to_sym)
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless mountpoints
+
+        fact = {}
+        mountpoints.each do |mnt|
+          fact[mnt[:path].to_sym] = mnt.reject { |k| k == :path }
+        end
+
+        Facter::ResolvedFact.new(FACT_NAME, fact)
+      end
+    end
+  end
+end

data/lib/facts/solaris/system_uptime/days.rb

@@ -5,11 +5,12 @@ module Facts
     module SystemUptime
       class Days
         FACT_NAME = 'system_uptime.days'
+        ALIASES = 'uptime_days'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:days)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facts/solaris/system_uptime/hours.rb

@@ -5,11 +5,12 @@ module Facts
     module SystemUptime
       class Hours
         FACT_NAME = 'system_uptime.hours'
+        ALIASES = 'uptime_hours'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:hours)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facts/solaris/system_uptime/seconds.rb

@@ -5,11 +5,12 @@ module Facts
     module SystemUptime
       class Seconds
         FACT_NAME = 'system_uptime.seconds'
+        ALIASES = 'uptime_seconds'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:seconds)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facts/solaris/system_uptime/uptime.rb

@@ -5,11 +5,12 @@ module Facts
     module SystemUptime
       class Uptime
         FACT_NAME = 'system_uptime.uptime'
+        ALIASES = 'uptime'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:uptime)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/framework/cli/cli_launcher.rb

@@ -2,9 +2,8 @@
 # frozen_string_literal: true
 
 require 'thor'
-require "#{ROOT_DIR}/lib/framework/logging/multilogger.rb"
 require "#{ROOT_DIR}/lib/framework/logging/logger.rb"
-Facter::Log.add_legacy_logger(STDERR)
+Facter::Log.output(STDERR)
 require "#{ROOT_DIR}/lib/facter"
 require "#{ROOT_DIR}/lib/framework/cli/cli"
 

data/lib/framework/core/file_loader.rb

@@ -22,7 +22,7 @@ end
 
 load_lib_dirs('framework', 'core', 'options')
 require "#{ROOT_DIR}/lib/framework/core/options"
-require "#{ROOT_DIR}/lib/framework/logging/multilogger"
+require "#{ROOT_DIR}/lib/framework/logging/logger_helper"
 require "#{ROOT_DIR}/lib/framework/logging/logger"
 
 require "#{ROOT_DIR}/lib/util/file_helper"

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

@@ -23,6 +23,7 @@ module Facter
     @user_query = []
     @block_list = {}
     @fact_groups = {}
+    @color = false
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy, :trace, :ruby,
@@ -31,7 +32,7 @@ module Facter
       attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list
+                    :block_list, :color
 
       attr_writer :external_dir
 

data/lib/framework/logging/logger.rb

@@ -4,12 +4,14 @@ require 'logger'
 
 module Facter
   RED = 31
+  GREEN = 32
+  YELLOW = 33
+  CYAN = 36
+
   DEFAULT_LOG_LEVEL = :warn
 
   class Log
-    @@legacy_logger = nil
-    @@logger = MultiLogger.new([])
-    @@logger.level = :warn
+    @@logger = nil
     @@message_callback = nil
     @@has_errors = false
 
@@ -29,78 +31,96 @@ module Facter
       def errors?
         @@has_errors
       end
-    end
 
-    def initialize(logged_class)
-      determine_callers_name(logged_class)
-    end
+      def output(output)
+        return if @@logger
 
-    def self.add_legacy_logger(output)
-      return if @@legacy_logger
+        @@logger = Logger.new(output)
+        set_logger_format
+        @@logger.level = DEFAULT_LOG_LEVEL
+      end
 
-      @@legacy_logger = Logger.new(output)
-      @@legacy_logger.level = DEFAULT_LOG_LEVEL
-      set_format_for_legacy_logger
-      @@logger.add_logger(@@legacy_logger)
+      def set_logger_format
+        @@logger.formatter = proc do |severity, datetime, _progname, msg|
+          datetime = datetime.strftime(@datetime_format || '%Y-%m-%d %H:%M:%S.%6N ')
+          "[#{datetime}] #{severity} #{msg} \n"
+        end
+      end
     end
 
-    def determine_callers_name(sender_self)
-      @class_name = case sender_self
-                    when String
-                      sender_self
-                    when Class
-                      sender_self.name
-                    when Module
-                      sender_self.name
-                    else # when class is singleton
-                      sender_self.class.name
-                    end
-    end
+    def initialize(logged_class)
+      @class_name = LoggerHelper.determine_callers_name(logged_class)
+      return unless @@logger.nil?
 
-    def self.set_format_for_legacy_logger
-      @@legacy_logger.formatter = proc do |severity, datetime, _progname, msg|
-        datetime = datetime.strftime(@datetime_format || '%Y-%m-%d %H:%M:%S.%6N ')
-        "[#{datetime}] #{severity} #{msg} \n"
-      end
+      @@logger = Logger.new(STDOUT)
+      @@logger.level = DEFAULT_LOG_LEVEL
     end
 
     def debug(msg)
       return unless debugging_active?
 
       if msg.nil? || msg.empty?
-        invoker = caller(1..1).first.slice(/.*:\d+/)
-        self.warn "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
+        empty_message_error(msg)
       elsif @@message_callback
         @@message_callback.call(:debug, msg)
       else
+        msg = colorize(msg, CYAN) if Options[:color]
         @@logger.debug(@class_name + ' - ' + msg)
       end
     end
 
     def info(msg)
-      @@logger.info(@class_name + ' - ' + msg)
+      if msg.nil? || msg.empty?
+        empty_message_error(msg)
+      elsif @@message_callback
+        @@message_callback.call(:info, msg)
+      else
+        msg = colorize(msg, GREEN) if Options[:color]
+        @@logger.info(@class_name + ' - ' + msg)
+      end
     end
 
     def warn(msg)
-      @@logger.warn(@class_name + ' - ' + msg)
+      if msg.nil? || msg.empty?
+        empty_message_error(msg)
+      elsif @@message_callback
+        @@message_callback.call(:warn, msg)
+      else
+        msg = colorize(msg, YELLOW) if Options[:color]
+        @@logger.warn(@class_name + ' - ' + msg)
+      end
     end
 
     def error(msg, colorize = false)
       @@has_errors = true
-      msg = colorize(msg, RED) if colorize && !OsDetector.instance.identifier.eql?(:windows)
-      @@logger.error(@class_name + ' - ' + msg)
-    end
 
-    def colorize(msg, color)
-      "\e[#{color}m#{msg}\e[0m"
+      if msg.nil? || msg.empty?
+        empty_message_error(msg)
+      elsif @@message_callback
+        @@message_callback.call(:error, msg)
+      else
+        msg = colorize(msg, RED) if colorize || Options[:color]
+        @@logger.error(@class_name + ' - ' + msg)
+      end
     end
 
     private
 
+    def colorize(msg, color)
+      return msg if OsDetector.instance.identifier.eql?(:windows)
+
+      "\e[0;#{color}m#{msg}\e[0m"
+    end
+
     def debugging_active?
       return true unless Facter.respond_to?(:debugging?)
 
       Facter.debugging?
     end
+
+    def empty_message_error(msg)
+      invoker = caller(1..1).first.slice(/.*:\d+/)
+      @@logger.warn "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
+    end
   end
 end

data/lib/framework/logging/logger_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class LoggerHelper
+  class << self
+    def determine_callers_name(sender_self)
+      class_name = case sender_self
+                   when String
+                     sender_self
+                   when Class
+                     sender_self.name
+                   when Module
+                     sender_self.name
+                   else # when class is singleton
+                     sender_self.class.name
+                   end
+      class_name
+    end
+  end
+end

data/lib/resolvers/aix/nim.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Nim < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_niminfo(fact_name) }
+          end
+
+          def read_niminfo(fact_name)
+            output = Facter::Util::FileHelper.safe_read('/etc/niminfo', nil)
+
+            return unless output
+
+            type = /NIM_CONFIGURATION=(.*)/.match(output)
+            @fact_list[:type] = type[1] if type[1] && /master|standalone/.match?(type[1])
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/docker_lxc.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class DockerLxc < BaseResolver
+      # :virtual
+      # :hypervisor
+
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+      INFO = { 'docker' => 'id', 'lxc' => 'name' }.freeze
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { read_cgroup(fact_name) }
+        end
+
+        def read_cgroup(fact_name)
+          output_cgroup = Util::FileHelper.safe_read('/proc/1/cgroup', nil)
+          output_environ = Util::FileHelper.safe_read('/proc/1/environ', nil)
+          return if output_cgroup.nil? || output_environ.nil?
+
+          output_docker = %r{docker/(.+)}.match(output_cgroup)
+          output_lxc = %r{^/lxc/([^/]+)}.match(output_cgroup)
+          lxc_from_environ = /container=lxc/ =~ output_environ
+
+          info, vm = extract_vm_and_info(output_docker, output_lxc, lxc_from_environ)
+          @fact_list[:vm] = vm
+          @fact_list[:hypervisor] = { vm.to_sym => info } if vm
+          @fact_list[fact_name]
+        end
+
+        def extract_vm_and_info(output_docker, output_lxc, lxc_from_environ)
+          vm = nil
+          if output_docker
+            vm = 'docker'
+            info = output_docker[1]
+          end
+          vm = 'lxc' if output_lxc || lxc_from_environ
+          info = output_lxc[1] if output_lxc
+
+          [info ? { INFO[vm] => info } : {}, vm]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.21
+  version: 4.0.22
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -257,6 +257,7 @@ files:
 - lib/facts/aix/networking/hostname.rb
 - lib/facts/aix/networking/ip.rb
 - lib/facts/aix/networking/primary.rb
+- lib/facts/aix/nim_type.rb
 - lib/facts/aix/os/architecture.rb
 - lib/facts/aix/os/family.rb
 - lib/facts/aix/os/hardware.rb
@@ -311,6 +312,7 @@ files:
 - lib/facts/linux/facterversion.rb
 - lib/facts/linux/filesystems.rb
 - lib/facts/linux/fips_enabled.rb
+- lib/facts/linux/hypervisors.rb
 - lib/facts/linux/identity/gid.rb
 - lib/facts/linux/identity/group.rb
 - lib/facts/linux/identity/privileged.rb
@@ -397,6 +399,7 @@ files:
 - lib/facts/linux/system_uptime/seconds.rb
 - lib/facts/linux/system_uptime/uptime.rb
 - lib/facts/linux/timezone.rb
+- lib/facts/linux/virtual.rb
 - lib/facts/macosx/augeas/version.rb
 - lib/facts/macosx/dmi/product/name.rb
 - lib/facts/macosx/facterversion.rb
@@ -506,6 +509,7 @@ files:
 - lib/facts/solaris/kernelmajversion.rb
 - lib/facts/solaris/kernelrelease.rb
 - lib/facts/solaris/kernelversion.rb
+- lib/facts/solaris/mountpoints.rb
 - lib/facts/solaris/networking/domain.rb
 - lib/facts/solaris/networking/fqdn.rb
 - lib/facts/solaris/networking/hostname.rb
@@ -652,7 +656,7 @@ files:
 - lib/framework/formatters/legacy_fact_formatter.rb
 - lib/framework/formatters/yaml_fact_formatter.rb
 - lib/framework/logging/logger.rb
-- lib/framework/logging/multilogger.rb
+- lib/framework/logging/logger_helper.rb
 - lib/framework/parsers/query_parser.rb
 - lib/framework/utils/utils.rb
 - lib/models/fact_collection.rb
@@ -667,6 +671,7 @@ files:
 - lib/resolvers/aix/load_averages_resolver.rb
 - lib/resolvers/aix/mountpoints.rb
 - lib/resolvers/aix/networking_resolver.rb
+- lib/resolvers/aix/nim.rb
 - lib/resolvers/aix/os_level_resolver.rb
 - lib/resolvers/aix/partitions.rb
 - lib/resolvers/aix/processors.rb
@@ -678,6 +683,7 @@ files:
 - lib/resolvers/debian_version.rb
 - lib/resolvers/disk_resolver.rb
 - lib/resolvers/dmi_resolver.rb
+- lib/resolvers/docker_lxc.rb
 - lib/resolvers/eos_release_resolver.rb
 - lib/resolvers/facterversion_resolver.rb
 - lib/resolvers/filesystems_resolver.rb

data/lib/framework/logging/multilogger.rb

@@ -1,119 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  require 'logger'
-  # MultiLogger is an implementation of Ruby logging which can tee the log to
-  # multiple endpoints.
-  # This class reeks of :reek:TooManyMethods.
-  class MultiLogger < Logger
-    # Array of loggers to be logged to. These can be anything that acts reasonably
-    # like a Logger.
-    attr_reader :loggers
-
-    # For things like level and progname, retrieve from the first active logging.
-    # There's an implicit assumption that these will be the same across all
-    # contained loggers.
-
-    # Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
-    def level
-      loggers.first.level
-    end
-
-    def level=(value)
-      loggers.each { |logger| logger.level = value }
-    end
-
-    # Program name to include in log messages.
-    def progname
-      loggers.first.progname
-    end
-
-    def progname=(value)
-      loggers.each { |logger| logger.progname = value }
-    end
-
-    # Set date-time format.
-    # +datetime_format+:: A string suitable for passing to +strftime+.
-    def datetime_format=(datetime_format)
-      loggers.each { |logger| logger.datetime_format = datetime_format }
-    end
-
-    # Returns the date format being used.  See #datetime_format=
-    def datetime_format
-      loggers.first.datetime_format
-    end
-
-    # Returns +true+ if the current severity level allows for the printing of
-    # +DEBUG+ messages.
-    def debug?
-      loggers.first.level <= DEBUG
-    end
-
-    # Returns +true+ iff the current severity level allows for the printing of
-    # +INFO+ messages.
-    def info?
-      loggers.first.level <= INFO
-    end
-
-    # Returns +true+ iff the current severity level allows for the printing of
-    # +WARN+ messages.
-    def warn?
-      loggers.first.level <= WARN
-    end
-
-    # Returns +true+ iff the current severity level allows for the printing of
-    # +ERROR+ messages.
-    def error?
-      loggers.first.level <= ERROR
-    end
-
-    #
-    # === Synopsis
-    #
-    #   MultiLogger.new([logger1, logger2])
-    #
-    # === Args
-    #
-    # +loggers+::
-    #   An array of loggers. Each one gets every message that is sent to the
-    #   MultiLogger instance.
-    #
-    # === Description
-    #
-    # Create an instance.
-    #
-    def initialize(loggers)
-      @loggers = loggers
-    end
-
-    def add_logger(logger)
-      @loggers << logger
-    end
-
-    # Methods that write to logs just write to each contained logging in turn
-    def add(severity, message = nil, progname = nil, &block)
-      loggers.each { |logger| logger.add(severity, message, progname, &block) }
-    end
-    alias log add
-
-    def debug(progname = nil, &block)
-      loggers.each { |logger| logger.debug(progname, &block) }
-    end
-
-    def info(progname = nil, &block)
-      loggers.each { |logger| logger.info(progname, &block) }
-    end
-
-    def warn(progname = nil, &block)
-      loggers.each { |logger| logger.warn(progname, &block) }
-    end
-
-    def error(progname = nil, &block)
-      loggers.each { |logger| logger.error(progname, &block) }
-    end
-
-    def close
-      loggers.each(&:close)
-    end
-  end
-end