facter 4.0.43 → 4.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e89a2638e45004e55f6b0ec4d902946c844b5253ee4e27139ab01d1ee12a92
-  data.tar.gz: bd4405449c4804a3c872510042a33c2cd6cf7fd588df8f95a99893fcb9248291
+  metadata.gz: 338a079461e5036ff9a33dd608e9b4f0e7472ec68c0351f73bea25a8a5fe0bf9
+  data.tar.gz: b1c9387025dca95f2b5c767885c8747d14569e80f3cb8eb4d6c49ac227b9c145
 SHA512:
-  metadata.gz: 31feabfeb9c2008ae30f16b6469cdf689b78e8711d64e3b614481a3e98b41d8271822b6cb26511a56ba5e19394f2ea811552b29168484d8ee377dbd3697f6655
-  data.tar.gz: f579f81b0dc6fedf937d016e531650c183bc4f89ce66c918f47932af01e97bfc19f0e0f012adcfe36a52e4a9a314685765055fe23bde5aa4cf5b2f92353a450c
+  metadata.gz: 844740e483fa5e3b60e6e12459625c064a505200cc76aba2aece98ccf21f04a855ed3961889eedbdff6e0bf6ac4e22b0ca0685a8738e6605deecae185bad08ff
+  data.tar.gz: 967d8b83f3e511c319c918eb305bb31929bb6d631e877774ec1332e8f394413ed8111d11d9fafb0bd3423a739eb324163d44feab34db1f5d6735f2b690dd8de4

data/lib/docs/generate.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Generates a markdown file containing fact documentation.
+# usage: ruby generate.rb > facts.md
+
+require 'yaml'
+require 'erb'
+require 'ostruct'
+
+PATH_TO_SCHEMA = File.join(File.dirname(__FILE__), '../schema/facter.yaml')
+PATH_TO_TEMPLATE = File.join(File.dirname(__FILE__), 'template.erb')
+
+schema = YAML.load_file(PATH_TO_SCHEMA)
+
+def format_facts(fact_hash)
+  scope = OpenStruct.new({
+                           facts: fact_hash
+                         })
+
+  erb = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+          ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
+        else
+          ERB.new(File.read(PATH_TO_TEMPLATE), nil, '-')
+        end
+  erb.result(scope.instance_eval { binding })
+end
+
+print "## Modern Facts\n\n"
+print format_facts(schema.reject { |_name, info| info['hidden'] == true })
+print "## Legacy Facts\n\n"
+print format_facts(schema.reject { |_name, info| info['hidden'].nil? || info['hidden'] == false })

data/lib/docs/template.erb

@@ -0,0 +1,34 @@
+<%# This template is used to generate a markdown file documenting facts. -%>
+<%# Run 'ruby generate.rb > facts.md' to generate the markdown file. -%>
+<%
+  def format_fact_element(name, info, indent = '')
+    subelements = (info['elements'] || {}).map{|n, i| format_fact_element(n, i, "#{indent}    ")}.join('')
+
+    "#{indent}* `#{name}` (#{info['type']}) --- #{info['description']}\n#{subelements}"
+  end
+-%>
+<% facts.each do |name, schema| -%>
+### `<%= name %>`
+
+<% if schema['hidden'] -%>
+This legacy fact is hidden by default in Facter's command-line output.
+
+<% end -%>
+**Type:** <%= schema['type'] %>
+
+**Purpose:**
+
+<%= schema['description'] %>
+
+<% if schema['elements'] -%>
+**Elements:**
+
+<%= schema['elements'].map{|name, info| format_fact_element(name, info)}.join('') %>
+<% end -%>
+
+<% if schema['details'] -%>
+**Details:**
+
+<%= schema['details'] %>
+<% end -%>
+<% end -%>

data/lib/facter.rb

@@ -20,7 +20,7 @@ module Facter
     # Method used by puppet-agent to retrieve facts
     # @param args_as_string [string] facter cli arguments
     #
-    # @return nil
+    # @return query result
     #
     # @api private
     def resolve(args_as_string)
@@ -42,7 +42,6 @@ module Facter
       else
         cli.invoke(:arg_parser)
       end
-      nil
     end
 
     # Alias method for Facter.fact()
@@ -178,6 +177,18 @@ module Facter
       Facter::Options[:debug] = debug_bool
     end
 
+    def enable_sequential
+      Facter::Options[:sequential] = true
+    end
+
+    def disable_sequential
+      Facter::Options[:sequential] = false
+    end
+
+    def sequential?
+      Facter::Options[:sequential]
+    end
+
     # Iterates over fact names and values
     #
     # @yieldparam [String] name the fact name
@@ -228,6 +239,18 @@ module Facter
       nil
     end
 
+    # Flushes cached values for all facts. This does not cause code to be
+    # reloaded; it only clears the cached results.
+    #
+    # @return [void]
+    #
+    # @api public
+    def flush
+      LegacyFacter.flush
+      SessionCache.invalidate_all_caches
+      nil
+    end
+
     # Loads all facts
     #
     # @return [nil]
@@ -238,6 +261,26 @@ module Facter
       nil
     end
 
+    # Enables/Disables external facts.
+    # @param enable_external [boolean]
+    #
+    #  @return nil
+    #
+    # @api public
+    def load_external(enable_external)
+      # enable_external param needs negation because behind the scene
+      # no_external_facts= method is negating the parameter again.
+      Options[:no_external_facts] = !enable_external
+
+      if enable_external
+        logger.debug('Facter.load_external(true) called. External facts will be loaded')
+      else
+        logger.debug('Facter.load_external(false) called. External facts will NOT be loaded')
+      end
+
+      nil
+    end
+
     # Register directories to be searched for custom facts. The registered directories
     #   must be absolute paths or they will be ignored.
     # @param dirs [Array<String>] An array of searched directories
@@ -287,9 +330,12 @@ module Facter
     # @api public
     def to_hash
       log_blocked_facts
+      logger.debug("Facter version: #{Facter::VERSION}")
 
       resolved_facts = Facter::FactManager.instance.resolve_facts
-      Facter::FactCollection.new.build_fact_collection!(resolved_facts)
+      resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? }
+      collection = Facter::FactCollection.new.build_fact_collection!(resolved_facts)
+      Hash[collection]
     end
 
     # Check whether printing stack trace is enabled
@@ -328,14 +374,16 @@ module Facter
     # @param options [Hash] parameters for the fact - attributes
     #   of {Facter::Util::Fact} and {Facter::Util::Resolution} can be
     #   supplied here
-    # @param user_queries [String] the fact names
+    # @param user_queries [Array] the fact names
     #
     # @return [FactCollection] hash with fact names and values
     #
     # @api public
     def values(options, user_queries)
       init_cli_options(options, user_queries)
+      log_blocked_facts
       resolved_facts = Facter::FactManager.instance.resolve_facts(user_queries)
+      resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? }
 
       if user_queries.count.zero?
         Facter::FactCollection.new.build_fact_collection!(resolved_facts)
@@ -361,13 +409,13 @@ module Facter
     def to_user_output(cli_options, *args)
       init_cli_options(cli_options, args)
       logger.info("executed with command line: #{ARGV.drop(1).join(' ')}")
+      logger.debug("Facter version: #{Facter::VERSION}")
       log_blocked_facts
-      resolved_facts = Facter::FactManager.instance.resolve_facts(args)
+      resolved_facts = resolve_facts_for_user_query(args)
       fact_formatter = Facter::FormatterFactory.build(Facter::Options.get)
-
       status = error_check(resolved_facts)
 
-      [fact_formatter.format(resolved_facts), status || 0]
+      [fact_formatter.format(resolved_facts), status]
     end
 
     # Logs an exception and an optional message
@@ -421,6 +469,15 @@ module Facter
 
     private
 
+    def resolve_facts_for_user_query(user_query)
+      resolved_facts = Facter::FactManager.instance.resolve_facts(user_query)
+      user_querie = resolved_facts.uniq(&:user_query).map(&:user_query).first
+
+      resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? } if user_querie&.empty?
+
+      resolved_facts
+    end
+
     def parse_exception(exception, error_message)
       if exception.is_a?(Exception)
         error_message << exception.message if error_message.empty?
@@ -479,14 +536,13 @@ module Facter
     #
     # @api private
     def error_check(resolved_facts)
+      status = 0
       if Options[:strict]
         missing_names = resolved_facts.select { |fact| fact.type == :nil }.map(&:user_query)
 
         if missing_names.count.positive?
           status = 1
           log_errors(missing_names)
-        else
-          status = nil
         end
       end
 

data/lib/facter/config.rb

@@ -0,0 +1,385 @@
+# frozen_string_literal: true
+
+module Facter
+  module Config
+    unless defined?(OS_HIERARCHY)
+      OS_HIERARCHY = [
+        {
+          'Linux' => [
+            {
+              'Debian' => %w[
+                Elementary
+                Ubuntu
+                Raspbian
+              ]
+            },
+            {
+              'Rhel' => %w[
+                Fedora
+                Amzn
+                Centos
+                Ol
+                Scientific
+              ]
+            },
+            {
+              'Sles' => [
+                'Opensuse'
+              ]
+            }
+          ]
+        },
+        {
+          'Bsd' => [
+            'Freebsd'
+          ]
+        },
+        'Solaris',
+        'Macosx',
+        'Windows',
+        'Aix'
+      ].freeze
+    end
+    unless defined? FACT_GROUPS
+      FACT_GROUPS = {
+        'AIX NIM type' => [
+          'nim_type'
+        ],
+        'EC2' => %w[
+          ec2_metadata
+          ec2_userdata
+        ],
+        'GCE' => [
+          'gce'
+        ],
+        'Xen' => %w[
+          xen
+          xendomains
+        ],
+        'augeas' => %w[
+          augeas
+          augeasversion
+        ],
+        'desktop management interface' => %w[
+          dmi
+          bios_vendor
+          bios_version
+          bios_release_date
+          boardassettag
+          boardmanufacturer
+          boardproductname
+          boardserialnumber
+          chassisassettag
+          manufacturer
+          productname
+          serialnumber
+          uuid
+          chassistype
+        ],
+        'disks' => %w[
+          blockdevices
+          disks
+        ],
+        'file system' => %w[
+          mountpoints
+          filesystems
+          partitions
+        ],
+        'fips' => [
+          'fips_enabled'
+        ],
+        'hypervisors' => [
+          'hypervisors'
+        ],
+        'id' => %w[
+          id
+          gid
+          identity
+        ],
+        'kernel' => %w[
+          kernel
+          kernelversion
+          kernelrelease
+          kernelmajversion
+        ],
+        'load_average' => [
+          'load_averages'
+        ],
+        'memory' => %w[
+          memory
+          memoryfree
+          memoryfree_mb
+          memorysize
+          memorysize_mb
+          swapfree
+          swapfree_mb
+          swapsize
+          swapsize_mb
+          swapencrypted
+        ],
+        'networking' => %w[
+          networking
+          hostname
+          ipaddress
+          ipaddress6
+          netmask
+          netmask6
+          network
+          network6
+          scope6
+          macaddress
+          interfaces
+          domain
+          fqdn
+          dhcp_servers
+        ],
+        'operating system' => %w[
+          os
+          operatingsystem
+          osfamily
+          operatingsystemrelease
+          operatingsystemmajrelease
+          hardwaremodel
+          architecture
+          lsbdistid
+          lsbdistrelease
+          lsbdistcodename
+          lsbdistdescription
+          lsbmajdistrelease
+          lsbminordistrelease
+          lsbrelease
+          macosx_buildversion
+          macosx_productname
+          macosx_productversion
+          macosx_productversion_major
+          macosx_productversion_minor
+          windows_edition_id
+          windows_installation_type
+          windows_product_name
+          windows_release_id
+          system32
+          selinux
+          selinux_enforced
+          selinux_policyversion
+          selinux_current_mode
+          selinux_config_mode
+          selinux_config_policy
+        ],
+        'path' => [
+          'path'
+        ],
+        'processor' => %w[
+          processors
+          processorcount
+          physicalprocessorcount
+          hardwareisa
+        ],
+        'ssh' => %w[
+          ssh
+          sshdsakey
+          sshrsakey
+          sshecdsakey
+          sshed25519key
+          sshfp_dsa
+          sshfp_rsa
+          sshfp_ecdsa
+          sshfp_ed25519
+        ],
+        'system profiler' => %w[
+          system_profiler
+          sp_boot_mode
+          sp_boot_rom_version
+          sp_boot_volume
+          sp_cpu_type
+          sp_current_processor_speed
+          sp_kernel_version
+          sp_l2_cache_core
+          sp_l3_cache
+          sp_local_host_name
+          sp_machine_model
+          sp_machine_name
+          sp_number_processors
+          sp_os_version
+          sp_packages
+          sp_physical_memory
+          sp_platform_uuid
+          sp_secure_vm
+          sp_serial_number
+          sp_smc_version_system
+          sp_uptime
+          sp_user_name
+        ],
+        'timezone' => [
+          'timezone'
+        ],
+        'uptime' => %w[
+          system_uptime
+          uptime
+          uptime_days
+          uptime_hours
+          uptime_seconds
+        ],
+        'virtualization' => %w[
+          virtual
+          is_virtual
+          cloud
+        ],
+        'ldom' => [
+          'ldom'
+        ],
+        'Solaris zone' => %w[
+          zones
+          zonename
+          solaris_zones
+        ],
+        'ZFS' => %w[
+          zfs_version
+          zfs_featurenumbers
+        ],
+        'ZFS storage pool' => %w[
+          zpool_version
+          zpool_featureflags
+          zpool_featurenumbers
+        ],
+        'legacy' => [
+          'architecture',
+          'augeasversion',
+          'bios_release_date',
+          'bios_vendor',
+          'bios_version',
+          'blockdevice_*_model',
+          'blockdevice_*_size',
+          'blockdevice_*_vendor',
+          'blockdevices',
+          'boardassettag',
+          'boardmanufacturer',
+          'boardproductname',
+          'boardserialnumber',
+          'chassisassettag',
+          'chassistype',
+          'dhcp_servers',
+          'domain',
+          'fqdn',
+          'gid',
+          'hardwareisa',
+          'hardwaremodel',
+          'hostname',
+          'id',
+          'interfaces',
+          'ipaddress',
+          'ipaddress_.*',
+          'ipaddress_*',
+          'ipaddress6',
+          'ipaddress6_.*',
+          'ipaddress6_*',
+          'ldom_*',
+          'lsbdistcodename',
+          'lsbdistdescription',
+          'lsbdistid',
+          'lsbdistrelease',
+          'lsbmajdistrelease',
+          'lsbminordistrelease',
+          'lsbrelease',
+          'macaddress',
+          'macaddress_.*',
+          'macaddress_*',
+          'macosx_buildversion',
+          'macosx_productname',
+          'macosx_productversion',
+          'macosx_productversion_major',
+          'macosx_productversion_minor',
+          'manufacturer',
+          'memoryfree',
+          'memoryfree_mb',
+          'memorysize',
+          'memorysize_mb',
+          'mtu_.*',
+          'mtu_*',
+          'netmask',
+          'netmask_.*',
+          'netmask_*',
+          'netmask6',
+          'netmask6_.*',
+          'netmask6_*',
+          'network',
+          'network_.*',
+          'network_*',
+          'network6',
+          'network6_.*',
+          'network6_*',
+          'operatingsystem',
+          'operatingsystemmajrelease',
+          'operatingsystemrelease',
+          'osfamily',
+          'physicalprocessorcount',
+          'processor[0-9]+.*',
+          'processorcount',
+          'productname',
+          'rubyplatform',
+          'rubysitedir',
+          'rubyversion',
+          'scope6',
+          'scope6_.*',
+          'selinux',
+          'selinux_config_mode',
+          'selinux_config_policy',
+          'selinux_current_mode',
+          'selinux_enforced',
+          'selinux_policyversion',
+          'serialnumber',
+          'sp_*',
+          'sp_boot_mode',
+          'sp_boot_rom_version',
+          'sp_boot_volume',
+          'sp_cpu_type',
+          'sp_current_processor_speed',
+          'sp_kernel_version',
+          'sp_l2_cache_core',
+          'sp_l3_cache',
+          'sp_local_host_name',
+          'sp_machine_model',
+          'sp_machine_name',
+          'sp_number_processors',
+          'sp_os_version',
+          'sp_packages',
+          'sp_physical_memory',
+          'sp_platform_uuid',
+          'sp_secure_vm',
+          'sp_serial_number',
+          'sp_smc_version_system',
+          'sp_uptime',
+          'sp_user_name',
+          'ssh.*key',
+          'ssh*key',
+          'sshfp_.*',
+          'sshfp_*',
+          'swapencrypted',
+          'swapfree',
+          'swapfree_mb',
+          'swapsize',
+          'swapsize_mb',
+          'system32',
+          'uptime',
+          'uptime_days',
+          'uptime_hours',
+          'uptime_seconds',
+          'uuid',
+          'windows_edition_id',
+          'windows_installation_type',
+          'windows_product_name',
+          'windows_release_id',
+          'xendomains',
+          'zone_*_brand',
+          'zone_*_id',
+          'zone_*_iptype',
+          'zone_*_name',
+          'zone_*_path',
+          'zone_*_status',
+          'zone_*_uuid',
+          'zonename',
+          'zones'
+        ]
+      }.freeze
+    end
+  end
+end