facter 4.0.13 → 4.0.14

data/lib/facts/solaris/solaris_zones/zone.rb

@@ -21,6 +21,8 @@ module Facts
           zones = {}
 
           results = Facter::Resolvers::SolarisZone.resolve(:zone)
+          return Facter::ResolvedFact.new(FACT_NAME, nil) unless results
+
           results&.each do |result|
             zones.merge!(parse_result(result))
             resolved_facts << create_legacy_zone_facts(result)

data/lib/framework/core/fact_loaders/internal_fact_loader.rb

@@ -16,13 +16,13 @@ module Facter
       @facts = []
 
       os_descendents = OsDetector.instance.hierarchy
-      load_all_oses(os_descendents)
+      load_all_oses_in_descending_order(os_descendents)
     end
 
     private
 
-    def load_all_oses(os_descendents)
-      os_descendents.each do |os|
+    def load_all_oses_in_descending_order(os_descendents)
+      os_descendents.reverse_each do |os|
         load_for_os(os)
       end
     end
@@ -34,15 +34,19 @@ module Facter
       classes.each do |class_name|
         fact_name = class_name::FACT_NAME
 
-        load_fact(fact_name, class_name)
+        # if fact is already loaded, skip it
+        next if @facts.any? { |fact| fact.name == fact_name }
+
+        type = fact_name.end_with?('.*') ? :legacy : :core
+        load_fact(fact_name, class_name, type)
         next unless class_name.const_defined?('ALIASES')
 
-        [*class_name::ALIASES].each { |fact_alias| load_fact(fact_alias, class_name) }
+        [*class_name::ALIASES].each { |fact_alias| load_fact(fact_alias, class_name, :legacy) }
       end
     end
 
-    def load_fact(fact_name, klass)
-      loaded_fact = LoadedFact.new(fact_name, klass)
+    def load_fact(fact_name, klass, type)
+      loaded_fact = LoadedFact.new(fact_name, klass, type)
       @facts << loaded_fact
     end
   end

data/lib/framework/core/{cache_manager.rb → session_cache.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facter
-  class CacheManager
+  class SessionCache
     @semaphore = Mutex.new
     @resolvers = []
 

data/lib/framework/detector/os_detector.rb

@@ -54,6 +54,8 @@ class OsDetector
       %w[Debian]
     when :elementary
       %w[Debian]
+    when :raspbian
+      %w[Debian]
     when :fedora
       %w[El]
     when :amzn

data/lib/framework/logging/logger.rb

@@ -6,9 +6,8 @@ module Facter
   RED = 31
 
   class Log
-    @@file_logger = Logger.new(File.new("#{ROOT_DIR}/example.log", 'a'))
     @@legacy_logger = nil
-    @@logger = MultiLogger.new([@@file_logger])
+    @@logger = MultiLogger.new([])
     @@logger.level = :warn
     @@message_callback = nil
     @@has_errors = false
@@ -33,7 +32,6 @@ module Facter
 
     def initialize(logged_class)
       determine_callers_name(logged_class)
-      set_format_for_file_logger
     end
 
     def self.add_legacy_logger(output)
@@ -57,13 +55,6 @@ module Facter
                     end
     end
 
-    def set_format_for_file_logger
-      @@file_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
-
     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 ')

data/lib/resolvers/aix/mountpoints.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Mountpoints < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        BLOCK_SIZE = 512
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_mount(fact_name) }
+          end
+
+          def read_mount(fact_name)
+            @fact_list[:mountpoints] = {}
+            output, _status = Open3.capture2('mount 2>/dev/null')
+            output.split("\n").map do |line|
+              next if line =~ /\snode\s|---|procfs|ahafs/
+
+              elem = line.split("\s")
+
+              @fact_list[:mountpoints][elem[1]] = { device: elem[0], filesystem: elem[2],
+                                                    options: elem.last.split(',') }
+            end
+
+            retrieve_sizes_for_mounts
+            @fact_list[fact_name]
+          end
+
+          def retrieve_sizes_for_mounts
+            output, _status = Open3.capture2('df -P 2>/dev/null')
+            output.split("\n").map do |line|
+              next if line =~ /Filesystem|-\s+-\s+-/
+
+              mount_info = line.split("\s")
+              mount_info[3] = translate_to_bytes(mount_info[3])
+              mount_info[2] = translate_to_bytes(mount_info[2])
+              mount_info[1] = translate_to_bytes(mount_info[1])
+              compute_sizes(mount_info)
+            end
+          end
+
+          def translate_to_bytes(strin_size)
+            strin_size.to_i * BLOCK_SIZE
+          end
+
+          def compute_sizes(info)
+            available_bytes = info[3]
+            used_bytes = info[2]
+            size_bytes = info[1]
+            @fact_list[:mountpoints][info.last].merge!(
+              capacity: FilesystemHelper.compute_capacity(used_bytes, size_bytes),
+              available_bytes: available_bytes,
+              used_bytes: used_bytes,
+              size_bytes: size_bytes,
+              available: BytesToHumanReadable.convert(available_bytes),
+              used: BytesToHumanReadable.convert(used_bytes),
+              size: BytesToHumanReadable.convert(size_bytes)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/base_resolver.rb

@@ -12,7 +12,7 @@ module Facter
       end
 
       def self.subscribe_to_manager
-        Facter::CacheManager.subscribe(self)
+        Facter::SessionCache.subscribe(self)
       end
 
       def self.resolve(fact_name)

data/lib/resolvers/{debian_version_resolver.rb → debian_version.rb}

@@ -18,13 +18,11 @@ module Facter
         end
 
         def read_debian_version(fact_name)
-          output, _status = Open3.capture2('cat /etc/debian_version')
-          full_version = output.delete("\n")
-          versions = full_version.split('.')
+          return unless File.readable?('/etc/debian_version')
 
-          @fact_list[:full] = full_version
-          @fact_list[:major] = versions[0]
-          @fact_list[:minor] = versions[1].gsub(/^0([1-9])/, '\1')
+          verion = File.read('/etc/debian_version')
+
+          @fact_list[:version] = verion.strip
 
           @fact_list[fact_name]
         end

data/lib/resolvers/partitions.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Partitions < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+      BLOCK_PATH = '/sys/block'
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { read_partitions(fact_name) }
+        end
+
+        def read_partitions(fact_name)
+          @fact_list[:partitions] = {}
+          return {} unless File.readable?(BLOCK_PATH)
+
+          block_devices = Dir.entries(BLOCK_PATH).reject { |dir| dir =~ /^\.+/ }
+          block_devices.each do |block_device|
+            block_path = "#{BLOCK_PATH}/#{block_device}"
+            if File.directory?("#{block_path}/device")
+              extract_from_device(block_path)
+            elsif File.directory?("#{block_path}/dm")
+              extract_from_dm(block_path)
+            elsif File.directory?("#{block_path}/loop")
+              extract_from_loop(block_path)
+            end
+          end
+          @fact_list[fact_name]
+        end
+
+        def extract_from_device(block_path)
+          subdirs = browse_subdirectories(block_path)
+          subdirs.each do |subdir|
+            name = "/dev/#{subdir.split('/').last}"
+            populate_partitions(name, subdir)
+          end
+        end
+
+        def extract_from_dm(block_path)
+          map_name = File.readable?("#{block_path}/dm/name") ? File.read("#{block_path}/dm/name").chomp : ''
+          if map_name.empty?
+            populate_partitions("/dev/#{block_path}", block_path)
+          else
+            populate_partitions("/dev/mapper/#{map_name}", block_path)
+          end
+        end
+
+        def extract_from_loop(block_path)
+          populate_partitions("/dev/#{block_path}", block_path) if File.readable?("#{block_path}/loop/backing_file")
+          backing_file = File.read("#{block_path}/loop/backing_file").chomp
+          populate_partitions("/dev/#{block_path}", block_path, backing_file)
+        end
+
+        def populate_partitions(partition_name, block_path, backing_file = nil)
+          @fact_list[:partitions][partition_name] = {}
+          size_bytes = File.readable?("#{block_path}/size") ? File.read("#{block_path}/size").chomp.to_i * 512 : 0
+          info_hash = { size_bytes: size_bytes,
+                        size: Facter::BytesToHumanReadable.convert(size_bytes), backing_file: backing_file }
+          info_hash.merge!(populate_from_blkid(partition_name))
+          @fact_list[:partitions][partition_name] = info_hash.reject { |_key, value| value.nil? }
+        end
+
+        def populate_from_blkid(partition_name)
+          return {} unless blkid_command?
+
+          @blkid_content ||= execute_and_extract_blkid_info
+          return {} unless @blkid_content[partition_name]
+
+          filesys = @blkid_content[partition_name]['TYPE']
+          uuid = @blkid_content[partition_name]['UUID']
+          label = @blkid_content[partition_name]['LABEL']
+          part_uuid = @blkid_content[partition_name]['PARTUUID']
+          part_label = @blkid_content[partition_name]['PARTLABEL']
+          { filesystem: filesys, uuid: uuid, label: label, partuuid: part_uuid, partlabel: part_label }
+        end
+
+        def blkid_command?
+          return @blkid_exists unless @blkid_exists.nil?
+
+          stdout, _stderr, _status = Open3.capture3('which blkid')
+          @blkid_exists = stdout && !stdout.empty?
+        end
+
+        def execute_and_extract_blkid_info
+          stdout, _stderr, _status = Open3.capture3('blkid')
+          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
+          output_hash.each { |key, value| output_hash[key] = Hash[*value.delete('"').chomp.split(/ ([^= ]+)=/)[1..-1]] }
+        end
+
+        def browse_subdirectories(path)
+          dirs = Dir[File.join(path, '**', '*')].select { |p| File.directory? p }
+          dirs.select { |subdir| subdir.split('/').last.include?(path.split('/').last) }.reject(&:nil?)
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/solaris/solaris_zone_name.rb

@@ -14,6 +14,8 @@ module Facter
         end
 
         def build_current_zone_name_fact(fact_name)
+          return unless File.executable?('/bin/zonename')
+
           zone_name_output, status = Open3.capture2('/bin/zonename')
           unless status.to_s.include?('exit 0')
             @log.debug("Command #{command} returned status: #{status}")

data/lib/resolvers/solaris/zone_resolver.rb

@@ -14,6 +14,8 @@ module Facter
         end
 
         def build_zone_fact(fact_name)
+          return unless File.executable?('/usr/sbin/zoneadm')
+
           command = '/usr/sbin/zoneadm list -cp'
           zone_adm_output, status = Open3.capture2(command)
           unless status.to_s.include?('exit 0')

data/lib/util/api_debugger.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module ApiDebugger
+  def self.prepended(receiver) # rubocop:disable Metrics/AbcSize
+    exclude, print_caller = parse_options(ENV['API_DEBUG'])
+
+    receiver_methods = receiver.instance_methods - Object.methods
+    receiver_methods.each do |meth|
+      ApiDebugger.class_eval do
+        define_method(meth) do |*args|
+          method_call = super(*args)
+
+          unless exclude.include?(meth)
+            puts '#' * 80
+            puts "Method call: #{meth}"
+            puts "Called with: #{args.inspect}"
+            if print_caller.include?(meth)
+              puts '-' * 80
+              puts caller
+            end
+            puts '#' * 80
+          end
+          method_call
+        end
+      end
+    end
+  end
+
+  def self.parse_options(options)
+    exclude = []
+    print_caller = []
+
+    options.split(',').each do |option|
+      if option.start_with?('-')
+        exclude << option[1..-1].to_sym
+      elsif option.start_with?('+')
+        print_caller << option[1..-1].to_sym
+      end
+    end
+
+    [exclude, print_caller]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.0.14
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -260,6 +260,7 @@ files:
 - lib/facts/aix/kernelrelease.rb
 - lib/facts/aix/kernelversion.rb
 - lib/facts/aix/load_averages.rb
+- lib/facts/aix/mountpoints.rb
 - lib/facts/aix/networking/domain.rb
 - lib/facts/aix/networking/fqdn.rb
 - lib/facts/aix/networking/hostname.rb
@@ -348,6 +349,7 @@ files:
 - lib/facts/debian/os/selinux/enabled.rb
 - lib/facts/debian/os/selinux/enforced.rb
 - lib/facts/debian/os/selinux/policy_version.rb
+- lib/facts/debian/partitions.rb
 - lib/facts/debian/path.rb
 - lib/facts/debian/processors/count.rb
 - lib/facts/debian/processors/isa.rb
@@ -429,6 +431,7 @@ files:
 - lib/facts/el/os/selinux/enabled.rb
 - lib/facts/el/os/selinux/enforced.rb
 - lib/facts/el/os/selinux/policy_version.rb
+- lib/facts/el/partitions.rb
 - lib/facts/el/path.rb
 - lib/facts/el/processor.rb
 - lib/facts/el/processors/count.rb
@@ -597,6 +600,7 @@ files:
 - lib/facts/sles/os/selinux/enabled.rb
 - lib/facts/sles/os/selinux/enforced.rb
 - lib/facts/sles/os/selinux/policy_version.rb
+- lib/facts/sles/partitions.rb
 - lib/facts/sles/path.rb
 - lib/facts/sles/processor.rb
 - lib/facts/sles/processors/count.rb
@@ -739,7 +743,6 @@ files:
 - lib/framework/cli/cli_launcher.rb
 - lib/framework/config/block_list.rb
 - lib/framework/config/config_reader.rb
-- lib/framework/core/cache_manager.rb
 - lib/framework/core/fact/external/external_fact_manager.rb
 - lib/framework/core/fact/internal/core_fact.rb
 - lib/framework/core/fact/internal/internal_fact_manager.rb
@@ -758,6 +761,7 @@ files:
 - lib/framework/core/options/options_validator.rb
 - lib/framework/core/options/priority_options.rb
 - lib/framework/core/options/validate_options.rb
+- lib/framework/core/session_cache.rb
 - lib/framework/detector/os_detector.rb
 - lib/framework/formatters/formatter_factory.rb
 - lib/framework/formatters/formatter_helper.rb
@@ -779,12 +783,13 @@ files:
 - lib/resolvers/aix/filesystem_resolver.rb
 - lib/resolvers/aix/hardware_resolver.rb
 - lib/resolvers/aix/load_averages_resolver.rb
+- lib/resolvers/aix/mountpoints.rb
 - lib/resolvers/aix/networking_resolver.rb
 - lib/resolvers/aix/os_level_resolver.rb
 - lib/resolvers/aix/utils/odm_query.rb
 - lib/resolvers/augeas_resolver.rb
 - lib/resolvers/base_resolver.rb
-- lib/resolvers/debian_version_resolver.rb
+- lib/resolvers/debian_version.rb
 - lib/resolvers/disk_resolver.rb
 - lib/resolvers/dmi_resolver.rb
 - lib/resolvers/eos_release_resolver.rb
@@ -810,6 +815,7 @@ files:
 - lib/resolvers/networking_linux_resolver.rb
 - lib/resolvers/os_level_resolver.rb
 - lib/resolvers/os_release_resolver.rb
+- lib/resolvers/partitions.rb
 - lib/resolvers/path_resolver.rb
 - lib/resolvers/processors_resolver.rb
 - lib/resolvers/puppet_version_resolver.rb
@@ -861,7 +867,7 @@ files:
 - lib/resolvers/windows/virtualization_resolver.rb
 - lib/resolvers/windows/win_os_description_resolver.rb
 - lib/resolvers/wpar_resolver.rb
-- lib/util/fact.rb
+- lib/util/api_debugger.rb
 - tasks/create_fact.rake
 - tasks/fact_generator/fact.erb
 - tasks/fact_generator/fact_creator.rb