facter 4.0.46 → 4.0.47

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

@@ -26,7 +26,7 @@ module Facter
     @config_file_external_dir = []
     @default_external_dir = []
     @fact_groups = {}
-    @sequential = false
+    @sequential = true
     @ttls = []
     @block_list = []
     @color = true
@@ -192,7 +192,7 @@ module Facter
         @fact_groups = {}
         @block_list = {}
         @color = true
-        @sequential = false
+        @sequential = true
         @ttls = []
         @trace = false
         @timing = false

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

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

@@ -14,10 +14,10 @@ module Facter
         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')
@@ -37,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

@@ -34,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']
 
@@ -42,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
 
@@ -50,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

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

@@ -14,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/memory.rb

@@ -44,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)
@@ -56,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

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

@@ -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/partitions.rb

@@ -14,7 +14,7 @@ module Facter
           end
 
           def query_cudv(fact_name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('PdDvLn', 'logical_volume/lvsubclass/lvtype')
 
             result = odmquery.execute
@@ -40,13 +40,13 @@ module Facter
 
             return if stdout.empty?
 
-            info_hash =  InfoExtractor.extract(stdout, /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/)
+            info_hash =  Facter::Util::Aix::InfoExtractor.extract(stdout, /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/)
             size_bytes = compute_size(info_hash)
 
             part_info = {
               filesystem: info_hash['TYPE'],
               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)
             }
             mount = info_hash['MOUNT POINT']
             label = info_hash['LABEL']
@@ -59,9 +59,9 @@ module Facter
             physical_partitions = info_hash['PPs'].to_i
             size_physical_partition = info_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/processors.rb

@@ -17,7 +17,7 @@ module Facter
             @fact_list[:models] = []
             @fact_list[:logical_count] = 0
 
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('class', 'processor')
 
             result = odmquery.execute
@@ -32,7 +32,7 @@ module Facter
           end
 
           def populate_from_cudv(name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('PdDvLn', name)
 
             result = odmquery.execute
@@ -45,7 +45,7 @@ module Facter
           end
 
           def query_cuat(name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('name', name)
 
             result = odmquery.execute

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

@@ -14,7 +14,7 @@ module Facter
           end
 
           def read_serialnumber(fact_name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery
               .equals('name', 'sys0')
               .equals('attribute', 'systemid')

data/lib/facter/resolvers/base_resolver.rb

@@ -27,6 +27,9 @@ module Facter
 
           cache_nil_for_unresolved_facts(fact_name)
         end
+      rescue NoMethodError => e
+        log.debug("Could not resolve #{fact_name}, got #{e}")
+        @fact_list[fact_name] = nil
       rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil

data/lib/facter/resolvers/cloud.rb

@@ -23,7 +23,7 @@ module Facter
             files.select! { |filename| filename =~ /^dhclient.*lease.*$/ }
             files.each do |file|
               path = File.join([path, file])
-              output = Util::FileHelper.safe_read(path)
+              output = Facter::Util::FileHelper.safe_read(path)
 
               if output.include?('option unknown-245') || output.include?('option 245')
                 @fact_list[:cloud_provider] = 'azure'

data/lib/facter/resolvers/containers.rb

@@ -18,8 +18,8 @@ module Facter
         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)
+          output_cgroup = Facter::Util::FileHelper.safe_read('/proc/1/cgroup', nil)
+          output_environ = Facter::Util::FileHelper.safe_read('/proc/1/environ', nil)
           return unless output_cgroup && output_environ
 
           output_docker = %r{docker/(.+)}.match(output_cgroup)
@@ -49,7 +49,7 @@ module Facter
           nspawn = /container=systemd-nspawn/ =~ output_environ
           if nspawn
             vm = 'systemd_nspawn'
-            info = Util::FileHelper.safe_read('/etc/machine-id', nil)
+            info = Facter::Util::FileHelper.safe_read('/etc/machine-id', nil)
           end
           [info ? { 'id' => info.strip } : {}, vm]
         end

data/lib/facter/resolvers/debian_version.rb

@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_debian_version(fact_name)
-          file_content = Util::FileHelper.safe_read('/etc/debian_version')
+          file_content = Facter::Util::FileHelper.safe_read('/etc/debian_version')
           @fact_list[:version] = file_content.strip unless file_content.empty?
 
           @fact_list[fact_name]

data/lib/facter/resolvers/disk_resolver.rb

@@ -25,7 +25,7 @@ module Facter
               @fact_list[:disks].each do |disk, value|
                 file_path = File.join(DIR, disk, file)
 
-                result = Util::FileHelper.safe_read(file_path).strip
+                result = Facter::Util::FileHelper.safe_read(file_path).strip
                 next if result.empty?
 
                 value[key] = case key
@@ -55,7 +55,7 @@ module Facter
           def construct_size(facts, value)
             value = value.to_i * 512
             facts[:size_bytes] = value
-            facts[:size] = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(value)
+            facts[:size] = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(value)
           end
         end
       end

data/lib/facter/resolvers/dmi_resolver.rb

@@ -35,7 +35,7 @@ module Facter
                        product_serial product_uuid]
             return unless File.directory?('/sys/class/dmi')
 
-            file_content = Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)
+            file_content = Facter::Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)
             if files.include?(fact_name.to_s) && file_content
               file_content = file_content.strip
               @fact_list[fact_name] = file_content unless file_content.empty?

data/lib/facter/resolvers/ec2.rb

@@ -50,7 +50,9 @@ module Facter
         end
 
         def get_data_from(url)
-          Utils::Http.get_request(url, {}, { session: determine_session_timeout })
+          headers = {}
+          headers['X-aws-ec2-metadata-token'] = Facter::Util::Resolvers::AwsToken.get if ENV['AWS_IMDSv2']
+          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
         end
 
         def determine_session_timeout

data/lib/facter/resolvers/eos_release_resolver.rb

@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_eos_release(fact_name)
-          output = Util::FileHelper.safe_read('/etc/Eos-release', nil)
+          output = Facter::Util::FileHelper.safe_read('/etc/Eos-release', nil)
           return @fact_list[fact_name] = nil if output.nil?
 
           output_strings = output.split(' ')

data/lib/facter/resolvers/filesystems_resolver.rb

@@ -18,7 +18,7 @@ module Facter
           end
 
           def read_filesystems(fact_name)
-            output = Util::FileHelper.safe_readlines('/proc/filesystems', nil)
+            output = Facter::Util::FileHelper.safe_readlines('/proc/filesystems', nil)
             return unless output
 
             filesystems = []

data/lib/facter/resolvers/fips_enabled_resolver.rb

@@ -18,7 +18,7 @@ module Facter
           end
 
           def read_fips_file(fact_name)
-            file_output = Util::FileHelper.safe_read('/proc/sys/crypto/fips_enabled')
+            file_output = Facter::Util::FileHelper.safe_read('/proc/sys/crypto/fips_enabled')
             @fact_list[:fips_enabled] = file_output.strip == '1'
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/freebsd/geom_resolver.rb

@@ -51,7 +51,7 @@ module Facter
             mediasize = Integer(mediasize.value)
 
             res[:size_bytes] = mediasize
-            res[:size] = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(mediasize)
+            res[:size] = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(mediasize)
             res
           end
 

data/lib/facter/resolvers/freebsd/swap_memory_resolver.rb

@@ -21,8 +21,9 @@ module Facter
               @fact_list[:total_bytes]     = kilobytes_to_bytes(data.map { |line| line[1].to_i }.inject(:+))
               @fact_list[:used_bytes]      = kilobytes_to_bytes(data.map { |line| line[2].to_i }.inject(:+))
               @fact_list[:available_bytes] = kilobytes_to_bytes(data.map { |line| line[3].to_i }.inject(:+))
-              @fact_list[:capacity] = FilesystemHelper.compute_capacity(@fact_list[:used_bytes],
-                                                                        @fact_list[:total_bytes])
+              @fact_list[:capacity] = Facter::Util::Resolvers::FilesystemHelper
+                                      .compute_capacity(@fact_list[:used_bytes],
+                                                        @fact_list[:total_bytes])
               @fact_list[:encrypted] = data.map { |line| line[0].end_with?('.eli') }.all?
             end
 

data/lib/facter/resolvers/freebsd/system_memory_resolver.rb

@@ -18,7 +18,8 @@ module Facter
             read_available_memory_in_bytes
 
             @fact_list[:used_bytes] = @fact_list[:total_bytes] - @fact_list[:available_bytes]
-            @fact_list[:capacity] = FilesystemHelper.compute_capacity(@fact_list[:used_bytes], @fact_list[:total_bytes])
+            @fact_list[:capacity] = Facter::Util::Resolvers::FilesystemHelper
+                                    .compute_capacity(@fact_list[:used_bytes], @fact_list[:total_bytes])
 
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/freebsd/virtual_resolver.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class Virtual < BaseResolver
+        init_resolver
+
+        class << self
+          #:model
+
+          VM_GUEST_SYSCTL_NAMES = {
+            'hv' => 'hyperv',
+            'microsoft' => 'hyperv',
+            'oracle' => 'virtualbox',
+            'xen' => 'xenu',
+            'none' => nil
+          }.freeze
+
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_facts(fact_name) }
+          end
+
+          def read_facts(fact_name)
+            require_relative 'ffi/ffi_helper'
+
+            if Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'security.jail.jailed').zero?
+              vm = Facter::Freebsd::FfiHelper.sysctl_by_name(:string, 'kern.vm_guest')
+
+              vm = VM_GUEST_SYSCTL_NAMES[vm] if VM_GUEST_SYSCTL_NAMES.key?(vm)
+
+              @fact_list[:vm] = vm
+            else
+              @fact_list[:vm] = 'jail'
+            end
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end