facter 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee51134133739cd64ee9fb160993ddd8ec683af8a2893aa98744709398d7ffce
-  data.tar.gz: d5bf29fc2338094cc267949431222af0cfa186f25998413dc6d50d14af5aafaa
+  metadata.gz: 5fa80567c0c01b5ceed0181b78f9e9e813d4eea3c70905733ba1aa5e9298ad15
+  data.tar.gz: 1541ade4a87eacbbaa569c0ace340312dfde0c8299b12cd1973d8861449a798f
 SHA512:
-  metadata.gz: 71a0943be14cca0cfc2a1cde31f10deae26fad0c2cc845dec8ba981e86c33b97278adc424a92b301b868fddb6213024431fec51a44f090913de58937865906ed
-  data.tar.gz: 13fbe6fc74dccb348d67c274861bf89fce18d4e792801546b63c4b1f260c270afc338fddf355166b27e1bef5c5484541655c70e4c8e7bfcc39468d94ae247d8e
+  metadata.gz: ea3608714cc012b4f64de7f4b472c904152e82387b980d7b3740a318b3b500228dc2e57a41bab27c113d7d6cb9ce8985394d69db2c6ef49d0fd1483b0608b220
+  data.tar.gz: 33f8a676b5a70c964f90f2576e4b1a65d5e2b27c9b2b09edd12145f77da20f303ab295ee3de1998aed74eff967e4765ac0ad48a885a9ffbe175bbda2f6ce3b20

data/lib/facter/custom_facts/core/execution/base.rb

@@ -42,7 +42,7 @@ module Facter
         end
 
         def execute(command, options = {})
-          on_fail, expand, logger, time_limit = extract_options(options)
+          on_fail, expand, logger, timeout = extract_options(options)
 
           expanded_command = if !expand && builtin_command?(command) || logger
                                command
@@ -59,12 +59,12 @@ module Facter
             return on_fail
           end
 
-          out, = execute_command(expanded_command, on_fail, logger, time_limit)
+          out, = execute_command(expanded_command, on_fail, logger, timeout)
           out
         end
 
-        def execute_command(command, on_fail = nil, logger = nil, time_limit = nil)
-          time_limit ||= 300
+        def execute_command(command, on_fail = nil, logger = nil, timeout = nil)
+          timeout ||= 300
           begin
             # Set LC_ALL and LANG to force i18n to C for the duration of this exec;
             # this ensures that any code that parses the
@@ -78,12 +78,12 @@ module Facter
               out_reader = Thread.new { stdout.read }
               err_reader = Thread.new { stderr.read }
               begin
-                Timeout.timeout(time_limit) do
+                Timeout.timeout(timeout) do
                   stdout_messages << out_reader.value
                   stderr_messages << err_reader.value
                 end
               rescue Timeout::Error
-                message = "Timeout encounter after #{time_limit}s, killing process with pid: #{pid}"
+                message = "Timeout encounter after #{timeout}s, killing process with pid: #{pid}"
                 Process.kill('KILL', pid)
                 on_fail == :raise ? (raise StandardError, message) : @log.debug(message)
               ensure
@@ -114,10 +114,15 @@ module Facter
           on_fail = options.fetch(:on_fail, :raise)
           expand = options.fetch(:expand, true)
           logger = options[:logger]
-          time_limit = options[:limit].to_i
-          time_limit = time_limit.positive? ? time_limit : nil
+          timeout = (options[:timeout] || options[:time_limit] || options[:limit]).to_i
+          timeout = timeout.positive? ? timeout : nil
 
-          [on_fail, expand, logger, time_limit]
+          extra_keys = options.keys - %i[on_fail expand logger timeout]
+          unless extra_keys.empty?
+            @log.warn("Unexpected key passed to Facter::Core::Execution.execute option: #{options.keys.join(',')}")
+          end
+
+          [on_fail, expand, logger, timeout]
         end
 
         def log_stderr(msg, command, logger)

data/lib/facter/custom_facts/core/execution.rb

@@ -15,9 +15,9 @@ module Facter
 
       module_function
 
-      # Returns the locations to be searched when looking for a binary. This
-      #   is currently determined by the +PATH+ environment variable plus
-      #   `/sbin` and `/usr/sbin` when run on unix
+      # Returns the locations to be searched when looking for a binary. This is
+      # currently determined by the +PATH+ environment variable plus `/sbin`
+      # and `/usr/sbin` when run on unix
       #
       # @return [Array<String>] The paths to be searched for binaries
       #
@@ -27,8 +27,9 @@ module Facter
       end
 
       # Determines the full path to a binary. If the supplied filename does not
-      #   already describe an absolute path then different locations (determined
-      #   by {search_paths}) will be searched for a match.
+      # already describe an absolute path then different locations (determined
+      # by {search_paths}) will be searched for a match.
+      #
       # @param bin [String] The executable to locate
       #
       # @return [String/nil] The full path to the executable or nil if not
@@ -40,7 +41,8 @@ module Facter
       end
 
       # Determine in a platform-specific way whether a path is absolute. This
-      #   defaults to the local platform if none is specified.
+      # defaults to the local platform if none is specified.
+      #
       # @param path [String] The path to check
 
       # @param platform [:posix/:windows/nil] The platform logic to use
@@ -58,8 +60,9 @@ module Facter
       end
 
       # Given a command line, this returns the command line with the
-      #   executable written as an absolute path. If the executable contains
-      #   spaces, it has to be put in double quotes to be properly recognized.
+      # executable written as an absolute path. If the executable contains
+      # spaces, it has to be put in double quotes to be properly recognized.
+      #
       # @param command [String] the command line
       #
       # @return [String/nil] The command line with the executable's path
@@ -71,8 +74,9 @@ module Facter
       end
 
       # Overrides environment variables within a block of code.  The
-      #   specified values will be set for the duration of the block, after
-      #   which the original values (if any) will be restored.
+      # specified values will be set for the duration of the block, after
+      # which the original values (if any) will be restored.
+      #
       # @param values [Hash<String=>String>] A hash of the environment
       #   variables to override
       #
@@ -84,6 +88,7 @@ module Facter
       end
 
       # Try to execute a command and return the output.
+      #
       # @param command [String] Command to run
       #
       # @return [String/nil] Output of the program, or nil if the command does
@@ -96,16 +101,18 @@ module Facter
       end
 
       # Execute a command and return the output of that program.
+      #
       # @param command [String] Command to run
       #
       # @param options [Hash] Hash with options for the command
       #
-      # Options accepted values :on_fail How to behave when the command could
+      # @option options [Object] :on_fail How to behave when the command could
       #   not be run. Specifying :raise will raise an error, anything else will
       #   return that object on failure. Default is :raise.
-      #   :logger Optional logger used to log the command's stderr.
-      #   :time_limit Optional time out for the specified command. If no time_limit is passed,
-      #   a default of 300 seconds is used.
+      # @option options [Object] :logger Optional logger used to log the
+      #   command's stderr.
+      # @option options :timeout Optional time out for the specified
+      #   command. If no timeout is passed, a default of 300 seconds is used.
       #
       # @raise [Facter::Core::Execution::ExecutionFailure] If the command does
       #   not exist or could not be executed and :on_fail is set to :raise
@@ -119,13 +126,14 @@ module Facter
       end
 
       # Execute a command and return the stdout and stderr of that program.
+      #
       # @param command [String] Command to run
       #
       # @param on_fail[Object] How to behave when the command could
       #   not be run. Specifying :raise will raise an error, anything else will
       #   return that object on failure. Default is :raise.
       # @param logger Optional logger used to log the command's stderr.
-      # @param time_limit Optional time out for the specified command. If no time_limit is passed,
+      # @param timeout Optional time out for the specified command. If no timeout is passed,
       #   a default of 300 seconds is used.
       #
       # @raise [Facter::Core::Execution::ExecutionFailure] If the command does
@@ -135,8 +143,8 @@ module Facter
       #   :on_fail if command execution failed and :on_fail was specified.
       #
       # @api private
-      def execute_command(command, on_fail = nil, logger = nil, time_limit = nil)
-        @@impl.execute_command(command, on_fail, logger, time_limit)
+      def execute_command(command, on_fail = nil, logger = nil, timeout = nil)
+        @@impl.execute_command(command, on_fail, logger, timeout)
       end
 
       class ExecutionFailure < StandardError; end

data/lib/facter/facts/windows/os/windows/display_version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module Os
+      module Windows
+        class DisplayVersion
+          FACT_NAME = 'os.windows.display_version'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::ProductRelease.resolve(:display_version)
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/framework/cli/cli.rb

@@ -97,6 +97,10 @@ module Facter
                  type: :boolean,
                  desc: 'Resolve facts sequentially'
 
+    class_option :http_debug,
+                 type: :boolean,
+                 desc: 'Whether to write HTTP request and responses to stderr. This should never be used in production.'
+
     class_option :puppet,
                  type: :boolean,
                  aliases: '-p',

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

@@ -51,7 +51,9 @@ module Facter
       core_and_external_facts = core_or_external_fact(user_query) || []
       resolved_facts = core_and_external_facts + custom_facts
 
-      resolved_facts = all_custom_facts(user_query) if resolved_facts.empty?
+      if resolved_facts.empty? || resolved_facts.none? { |rf| rf.resolves?(user_query) }
+        resolved_facts.concat(all_custom_facts(user_query))
+      end
 
       @cache_manager.cache_facts(resolved_facts)
 

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

@@ -36,6 +36,7 @@ module Facter
     @hocon = false
     @allow_external_loggers = true
     @force_dot_resolution = false
+    @http_debug = false
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy,
@@ -44,7 +45,7 @@ module Facter
       attr_accessor :config, :strict, :json,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups, :force_dot_resolution,
-                    :block_list, :color, :trace, :sequential, :timing, :hocon, :allow_external_loggers
+                    :block_list, :color, :trace, :sequential, :timing, :hocon, :allow_external_loggers, :http_debug
 
       attr_writer :external_dir
 
@@ -179,6 +180,7 @@ module Facter
         @ttls = []
         @block = true
         @cli = nil
+        @http_debug = false
         reset_config
       end
 

data/lib/facter/models/resolved_fact.rb

@@ -23,5 +23,9 @@ module Facter
     def to_s
       @value.to_s
     end
+
+    def resolves?(user_query)
+      @name == user_query
+    end
   end
 end

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

@@ -42,8 +42,9 @@ module Facter
             return unless result
 
             names = retrieve_from_array(result.scan(/name\s=\s.*/), 1)
+            status = retrieve_from_array(result.scan(/\s+status\s=\s.*/), 1)
 
-            names.each { |elem| query_cuat(elem) }
+            names.each_with_index { |elem, idx| query_cuat(elem) if status[idx] == '1' }
           end
 
           def query_cuat(name)

data/lib/facter/resolvers/windows/product_release.rb

@@ -24,10 +24,19 @@ module Facter
 
         def build_fact_list(reg)
           reg.each do |name, _value|
-            @fact_list[:edition_id] = reg[name] if name == 'EditionID'
-            @fact_list[:installation_type] = reg[name] if name == 'InstallationType'
-            @fact_list[:product_name] = reg[name] if name == 'ProductName'
-            @fact_list[:release_id] = reg[name] if name == 'ReleaseId'
+            case name
+            when 'EditionID'
+              @fact_list[:edition_id] = reg[name]
+            when 'InstallationType'
+              @fact_list[:installation_type] = reg[name]
+            when 'ProductName'
+              @fact_list[:product_name] = reg[name]
+            when 'DisplayVersion'
+              @fact_list[:release_id] = reg[name]
+              @fact_list[:display_version] = reg[name]
+            when 'ReleaseId'
+              @fact_list[:release_id] = reg[name] unless @fact_list[:release_id]
+            end
           end
         end
       end

data/lib/facter/util/facts/windows_release_finder.rb

@@ -23,9 +23,11 @@ module Facter
           private
 
           def check_version_10(consumerrel, kernel_version)
+            return '10' if consumerrel
+
             build_number = kernel_version[/([^.]*)$/].to_i
-            if consumerrel
-              '10'
+            if build_number >= 20_348
+              '2022'
             elsif build_number >= 17_623
               '2019'
             else

data/lib/facter/util/resolvers/http.rb

@@ -60,6 +60,9 @@ module Facter
             http = Net::HTTP.new(parsed_url.host)
             http.read_timeout = timeouts[:session] || SESSION_TIMEOUT
             http.open_timeout = timeouts[:connection] || CONNECTION_TIMEOUT
+
+            http.set_debug_output($stderr) if Options[:http_debug]
+
             http
           end
 

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.2.4' unless defined?(VERSION)
+  VERSION = '4.2.5' unless defined?(VERSION)
 end

data/lib/facter.rb

@@ -205,6 +205,25 @@ module Facter
       Facter::Options[:debug] = debug_bool
     end
 
+    # Check whether http debugging is enabled
+    #
+    # @return [bool]
+    #
+    # @api public
+    def http_debug?
+      Options[:http_debug]
+    end
+
+    # Enable or disable http debugging
+    # @param debug_bool [bool] State which http debugging should have
+    #
+    # @return [type] [description]
+    #
+    # @api public
+    def http_debug(http_debug_bool)
+      Facter::Options[:http_debug] = http_debug_bool
+    end
+
     # Enable sequential resolving of facts
     #
     # @return [bool]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -846,6 +846,7 @@ files:
 - lib/facter/facts/windows/os/hardware.rb
 - lib/facter/facts/windows/os/name.rb
 - lib/facter/facts/windows/os/release.rb
+- lib/facter/facts/windows/os/windows/display_version.rb
 - lib/facter/facts/windows/os/windows/edition_id.rb
 - lib/facter/facts/windows/os/windows/installation_type.rb
 - lib/facter/facts/windows/os/windows/product_name.rb