facter 4.0.42 → 4.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa55de7f92a74b84788507b7e9667f158edc68abef1412f40ab5d3beb8f6aad
-  data.tar.gz: e92ff5798a9abab30f1887c5e4f934d75cef67975b2485e53ba6dc58b59ee899
+  metadata.gz: 02e89a2638e45004e55f6b0ec4d902946c844b5253ee4e27139ab01d1ee12a92
+  data.tar.gz: bd4405449c4804a3c872510042a33c2cd6cf7fd588df8f95a99893fcb9248291
 SHA512:
-  metadata.gz: 4841268cf5f76f1ad2b0ed2bf16b2527dd73e4d41728c64dbe13986b1a574759f900e2748e72ce72f6c677cf754d8a4f5115530140285412a07943e13b6312a5
-  data.tar.gz: bd48e0942af375429188957956a5555963297d62a9bc6549529ae1713b7670b41bfc5eea6b894d961e3e32507963e394779c372ad3b12a6422b5218f94b0f9e4
+  metadata.gz: 31feabfeb9c2008ae30f16b6469cdf689b78e8711d64e3b614481a3e98b41d8271822b6cb26511a56ba5e19394f2ea811552b29168484d8ee377dbd3697f6655
+  data.tar.gz: f579f81b0dc6fedf937d016e531650c183bc4f89ce66c918f47932af01e97bfc19f0e0f012adcfe36a52e4a9a314685765055fe23bde5aa4cf5b2f92353a450c

data/lib/facter.rb

@@ -17,6 +17,12 @@ module Facter
   @warn_once = []
 
   class << self
+    # Method used by puppet-agent to retrieve facts
+    # @param args_as_string [string] facter cli arguments
+    #
+    # @return nil
+    #
+    # @api private
     def resolve(args_as_string)
       require 'facter/framework/cli/cli_launcher'
 
@@ -36,10 +42,7 @@ module Facter
       else
         cli.invoke(:arg_parser)
       end
-    end
-
-    def clear_messages
-      logger.debug('clear_messages is not implemented')
+      nil
     end
 
     # Alias method for Facter.fact()
@@ -83,8 +86,16 @@ module Facter
       Options[:custom_dir] = []
       LegacyFacter.collection.invalidate_custom_facts
       LegacyFacter.collection.reload_custom_facts
+      SessionCache.invalidate_all_caches
+      nil
     end
 
+    # Gets the value for a core fact, external or custom facts are
+    #   not returned with this call. Returns `nil` if no such fact exists.
+    #
+    # @return [FactCollection] hash with fact names and values
+    #
+    # @api private
     def core_value(user_query)
       user_query = user_query.to_s
       resolved_facts = Facter::FactManager.instance.resolve_core([user_query])
@@ -136,8 +147,16 @@ module Facter
       LegacyFacter.define_fact(name, options, &block)
     end
 
+    # Stores a proc that will be used to output custom messages.
+    #   The proc must receive one parameter that will be the message to log.
+    # @param block [Proc] a block defining messages handler
+    #
+    # @return [nil]
+    #
+    # @api public
     def on_message(&block)
       Facter::Log.on_message(&block)
+      nil
     end
 
     # Check whether debugging is enabled
@@ -170,7 +189,6 @@ module Facter
     def each
       log_blocked_facts
       resolved_facts = Facter::FactManager.instance.resolve_facts
-      SessionCache.invalidate_all_caches
 
       resolved_facts.each do |fact|
         yield(fact.name, fact.value)
@@ -206,6 +224,7 @@ module Facter
       LegacyFacter.reset
       Options[:custom_dir] = []
       Options[:external_dir] = []
+      SessionCache.invalidate_all_caches
       nil
     end
 
@@ -220,26 +239,26 @@ module Facter
     end
 
     # Register directories to be searched for custom facts. The registered directories
-    # must be absolute paths or they will be ignored.
-    #
+    #   must be absolute paths or they will be ignored.
     # @param dirs [Array<String>] An array of searched directories
     #
-    # @return [void]
+    # @return [nil]
     #
     # @api public
     def search(*dirs)
       Options[:custom_dir] += dirs
+      nil
     end
 
     # Registers directories to be searched for external facts.
-    #
     # @param dirs [Array<String>] An array of searched directories
     #
-    # @return [void]
+    # @return [nil]
     #
     # @api public
     def search_external(dirs)
       Options[:external_dir] += dirs
+      nil
     end
 
     # Returns the registered search directories.for external facts.
@@ -263,14 +282,13 @@ module Facter
     # Gets a hash mapping fact names to their values
     # The hash contains core facts, legacy facts, custom facts and external facts (all facts that can be resolved).
     #
-    # @return [FactCollection] the hash of fact names and values
+    # @return [FactCollection] hash with fact names and values
     #
     # @api public
     def to_hash
       log_blocked_facts
 
       resolved_facts = Facter::FactManager.instance.resolve_facts
-      Facter::SessionCache.invalidate_all_caches
       Facter::FactCollection.new.build_fact_collection!(resolved_facts)
     end
 
@@ -286,7 +304,7 @@ module Facter
     # Enable or disable trace
     # @param bool [bool] Set trace on debug state
     #
-    # @return [type] [description]
+    # @return [bool] Value of trace debug state
     #
     # @api public
     def trace(bool)
@@ -305,10 +323,19 @@ module Facter
       @already_searched[user_query]&.value
     end
 
+    # Gets the values for multiple facts.
+    #
+    # @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
+    #
+    # @return [FactCollection] hash with fact names and values
+    #
+    # @api public
     def values(options, user_queries)
       init_cli_options(options, user_queries)
       resolved_facts = Facter::FactManager.instance.resolve_facts(user_queries)
-      Facter::SessionCache.invalidate_all_caches
 
       if user_queries.count.zero?
         Facter::FactCollection.new.build_fact_collection!(resolved_facts)
@@ -336,7 +363,6 @@ module Facter
       logger.info("executed with command line: #{ARGV.drop(1).join(' ')}")
       log_blocked_facts
       resolved_facts = Facter::FactManager.instance.resolve_facts(args)
-      SessionCache.invalidate_all_caches
       fact_formatter = Facter::FormatterFactory.build(Facter::Options.get)
 
       status = error_check(resolved_facts)
@@ -344,6 +370,11 @@ module Facter
       [fact_formatter.format(resolved_facts), status || 0]
     end
 
+    # Logs an exception and an optional message
+    #
+    # @return [nil]
+    #
+    # @api public
     def log_exception(exception, message = nil)
       error_message = []
 
@@ -351,10 +382,10 @@ module Facter
 
       parse_exception(exception, error_message)
       logger.error(error_message.flatten.join("\n"))
+      nil
     end
 
     # Returns a list with the names of all solved facts
-    #
     # @return [Array] the list with all the fact names
     #
     # @api public
@@ -363,7 +394,6 @@ module Facter
     end
 
     # Logs the message parameter as a warning.
-    #
     # @param message [Object] the warning object to be displayed
     #
     # @return [nil]
@@ -375,7 +405,6 @@ module Facter
     end
 
     # Logs only once the same warning message.
-    #
     # @param message [Object] the warning message object
     #
     # @return [nil]
@@ -426,7 +455,6 @@ module Facter
     def resolve_fact(user_query)
       user_query = user_query.to_s
       resolved_facts = Facter::FactManager.instance.resolve_facts([user_query])
-      SessionCache.invalidate_all_caches
       # we must make a distinction between custom facts that return nil and nil facts
       # Nil facts should not be packaged as ResolvedFacts! (add_fact_to_searched_facts packages facts)
       resolved_facts = resolved_facts.reject { |fact| fact.type == :nil }

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

@@ -18,22 +18,31 @@ module Facter
       include LegacyFacter::Core::Resolvable
 
       # @!attribute [r] name
-      #   @return [Symbol] The name of the aggregate resolution
+      #
+      # @return [Symbol] The name of the aggregate resolution
+      #
+      # @api public
       attr_reader :name
 
       # @!attribute [r] deps
-      #   @api private
-      #   @return [LegacyFacter::Core::DirectedGraph]
+      #
+      # @return [LegacyFacter::Core::DirectedGraph]
+      #
+      # @api private
       attr_reader :deps
 
       # @!attribute [r] confines
-      #   @return [Array<LegacyFacter::Core::Confine>] An array of confines restricting
-      #     this to a specific platform
-      #   @see Facter::Core::Suitable
+      #
+      # @return [Array<LegacyFacter::Core::Confine>] An array of confines restricting
+      #  this to a specific platform
+      #
+      # @api private
       attr_reader :confines
 
       # @!attribute [r] fact
+      #
       # @return [Facter::Util::Fact]
+      #
       # @api private
       attr_reader :fact
 
@@ -48,10 +57,20 @@ module Facter
         @deps = LegacyFacter::Core::DirectedGraph.new
       end
 
+      # Compares the weight of two aggregate facts
+      #
+      # @return [bool] Weight comparison result
+      #
+      # @api private
       def <=>(other)
         weight <=> other.weight
       end
 
+      # Sets options for the aggregate fact
+      #
+      # @return [nil]
+      #
+      # @api private
       def options(options)
         accepted_options = %i[name timeout weight fact_type]
         accepted_options.each do |option_name|
@@ -60,14 +79,17 @@ module Facter
         raise ArgumentError, "Invalid aggregate options #{options.keys.inspect}" unless options.keys.empty?
       end
 
+      # Evaluates the given block
+      #
+      # @return [String] Result of the block's evaluation
+      #
+      # @api private
       def evaluate(&block)
         instance_eval(&block)
       end
 
       # Define a new chunk for the given aggregate
       #
-      # @api public
-      #
       # @example Defining a chunk with no dependencies
       #   aggregate.chunk(:mountpoints) do
       #     # generate mountpoint information
@@ -80,14 +102,14 @@ module Facter
       #   end
       #
       # @param name [Symbol] A name unique to this aggregate describing the chunk
-      # @param opts [Hash]
-      # @options opts [Array<Symbol>, Symbol] :require One or more chunks
-      #   to evaluate and pass to this block.
-      # @yield [*Object] Zero or more chunk results
       #
-      # @return [void]
+      # @param opts [Hash] Hash with options for the aggregate fact
+      #
+      # @return [Facter::Core::Aggregate] The aggregate object
+      #
+      # @api public
       def chunk(name, opts = {}, &block)
-        raise ArgumentError, "#{self.class.name}#chunk requires a block" unless block_given?
+        evaluate_params(name, &block)
 
         deps = Array(opts.delete(:require))
 
@@ -97,12 +119,11 @@ module Facter
 
         @deps[name] = deps
         @chunks[name] = block
+        self
       end
 
       # Define how all chunks should be combined
       #
-      # @api public
-      #
       # @example Merge all chunks
       #   aggregate.aggregate do |chunks|
       #     final_result = {}
@@ -124,19 +145,32 @@ module Facter
       # @yield [Hash<Symbol, Object>] A hash containing chunk names and
       #   chunk values
       #
-      # @return [void]
+      # @return [Facter::Core::Aggregate] The aggregate fact
+      #
+      # @api public
       def aggregate(&block)
         raise ArgumentError, "#{self.class.name}#aggregate requires a block" unless block_given?
 
         @aggregate = block
+        self
       end
 
+      # Returns the fact's resolution type
+      #
+      # @return [Symbol] The fact's type
+      #
+      # @api private
       def resolution_type
         :aggregate
       end
 
       private
 
+      def evaluate_params(name)
+        raise ArgumentError, "#{self.class.name}#chunk requires a block" unless block_given?
+        raise ArgumentError, "#{self.class.name}#expected chunk name to be a Symbol" unless name.is_a? Symbol
+      end
+
       # Evaluate the results of this aggregate.
       #
       # @see Facter::Core::Resolvable#value

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

@@ -3,10 +3,6 @@
 module Facter
   module Core
     module Execution
-      # require_relative 'execution/base'
-      # require_relative 'execution/windows'
-      # require_relative 'execution/posix'
-
       @@impl = if LegacyFacter::Util::Config.windows?
                  Facter::Core::Execution::Windows.new
                else
@@ -20,24 +16,22 @@ 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
+      #   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
       #
-      # @return [Array<String>] the paths to be searched for binaries
       # @api private
       def search_paths
         @@impl.search_paths
       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
       #
-      # Returns nil if no matching executable can be found otherwise returns
-      # the expanded pathname.
-      #
-      # @param bin [String] the executable to locate
-      # @return [String,nil] the full path to the executable or nil if not
+      # @return [String/nil] The full path to the executable or nil if not
       #   found
       #
       # @api public
@@ -46,10 +40,12 @@ 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
       #
-      # @param path [String] the path to check
-      # @param platform [:posix,:windows,nil] the platform logic to use
+      # @api private
       def absolute_path?(path, platform = nil)
         case platform
         when :posix
@@ -62,38 +58,35 @@ 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 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
-      # expanded, or nil if the executable cannot be found.
+      # @return [String/nil] The command line with the executable's path
+      #   expanded, or nil if the executable cannot be found.
+      #
+      # @api private
       def expand_command(command)
         @@impl.expand_command(command)
       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.
-      #
-      # @overload with_env(values, { || ... })
-      #
+      #   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
       #
-      # @return [void]
+      # @return [String] The block's return string
       #
-      # @api public
+      # @api private
       def with_env(values, &block)
         @@impl.with_env(values, &block)
       end
 
       # Try to execute a command and return the output.
+      # @param command [String] Command to run
       #
-      # @param code [String] the program to run
-      #
-      # @return [String] the output of the program, or nil if the command does
+      # @return [String/nil] Output of the program, or nil if the command does
       #   not exist or could not be executed.
       #
       # @deprecated Use #{execute} instead
@@ -103,9 +96,9 @@ module Facter
       end
 
       # Execute a command and return the output of that program.
+      # @param command [String] Command to run
       #
-      # @param code [String] the program to run
-      # @param options [Hash]
+      # @param options [Hash] Hash with options for the aggregate fact
       #
       # @option options [Object] :on_fail How to behave when the command could
       #   not be run. Specifying :raise will raise an error, anything else will
@@ -118,7 +111,6 @@ module Facter
       #   command execution failed and :on_fail was specified.
       #
       # @api public
-      # @since 2.0.1
       def execute(command, options = {})
         @@impl.execute(command, options)
       end

data/lib/facter/custom_facts/util/resolution.rb

@@ -14,6 +14,8 @@ module Facter
     class Resolution
       # @api private
       attr_accessor :code, :fact_type
+
+      # @api private
       attr_writer :value
 
       extend Facter::Core::Execution
@@ -24,7 +26,12 @@ module Facter
         # compatibility.
         #
         # @deprecated
-        public :search_paths, :which, :absolute_path?, :expand_command, :with_env, :exec
+        #
+        # @api public
+        public :which, :exec
+
+        # @api private
+        public :with_env
       end
 
       include LegacyFacter::Core::Resolvable
@@ -32,22 +39,27 @@ module Facter
 
       # @!attribute [rw] name
       # The name of this resolution. The resolution name should be unique with
-      # respect to the given fact.
+      #   respect to the given fact.
+      #
       # @return [String]
+      #
       # @api public
       attr_accessor :name
 
       # @!attribute [r] fact
-      # @return [Facter::Util::Fact]
+      #
+      # @return [Facter::Util::Fact] Associated fact with this resolution.
+      #
       # @api private
       attr_reader :fact
 
       # Create a new resolution mechanism.
       #
       # @param name [String] The name of the resolution.
-      # @return [void]
       #
-      # @api private
+      # @return [Facter::Util::Resolution] The created resolution
+      #
+      # @api public
       def initialize(name, fact)
         @name = name
         @fact = fact
@@ -57,6 +69,11 @@ module Facter
         @weight = nil
       end
 
+      # Returns the fact's resolution type
+      #
+      # @return [Symbol] The fact's type
+      #
+      # @api private
       def resolution_type
         :simple
       end
@@ -64,7 +81,9 @@ module Facter
       # Evaluate the given block in the context of this resolution. If a block has
       # already been evaluated emit a warning to that effect.
       #
-      # @return [void]
+      # @return [String] Result of the block's evaluation
+      #
+      # @api private
       def evaluate(&block)
         if @last_evaluated
           msg = "Already evaluated #{@name}"
@@ -85,6 +104,11 @@ module Facter
                           end
       end
 
+      # Sets options for the aggregate fact
+      #
+      # @return [nil]
+      #
+      # @api private
       def options(options)
         accepted_options = %i[name value timeout weight fact_type file]
 
@@ -98,8 +122,6 @@ module Facter
       # Sets the code block or external program that will be evaluated to
       # get the value of the fact.
       #
-      # @return [void]
-      #
       # @overload setcode(string)
       #   Sets an external program to call to get the value of the resolution
       #   @param [String] string the external program to run to get the
@@ -111,6 +133,8 @@ module Facter
       #     This block is run when the fact is evaluated. Errors raised from
       #     inside the block are rescued and printed to stderr.
       #
+      # @return [Facter::Util::Resolution] Returns itself
+      #
       # @api public
       def setcode(string = nil, &block)
         if string
@@ -127,11 +151,16 @@ module Facter
         else
           raise ArgumentError, 'You must pass either code or a block'
         end
+        self
       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
+      # Comparison is done based on weight and fact type.
+      #   The greater the weight, the higher the priority.
+      #   If weights are equal, we consider external facts greater than custom facts.
+      #
+      # @return [bool] Weight comparison result
+      #
+      # @api private
       def <=>(other)
         return compare_equal_weights(other) if weight == other.weight
         return 1 if weight > other.weight

data/lib/facter/facts/solaris/zones.rb

@@ -28,7 +28,7 @@ module Facts
         end
 
         resolved_facts << Facter::ResolvedFact.new('solaris_zones.zones', zones)
-        resolved_facts << Facter::ResolvedFact.new('zones', results.count.to_s, :legacy)
+        resolved_facts << Facter::ResolvedFact.new('zones', results.count, :legacy)
 
         resolved_facts.flatten
       end

data/lib/facter/facts_utils/virtual_detector.rb

@@ -22,7 +22,7 @@ module Facter
       @log.debug('Checking DMI')
       vendor = Facter::Resolvers::DmiDecode.resolve(:vendor)
       @log.debug("dmi detected vendor: #{vendor}")
-      return 'aws' if vendor =~ /Amazon/
+      return 'kvm' if vendor =~ /Amazon/
 
       'xen' if vendor =~ /Xen/
     end

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

@@ -79,6 +79,11 @@ module Facter
                  type: :boolean,
                  desc: 'Show legacy facts when querying all facts.'
 
+    class_option :puppet,
+                 type: :boolean,
+                 aliases: '-p',
+                 desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
+
     class_option :yaml,
                  aliases: '-y',
                  type: :boolean,
@@ -152,12 +157,6 @@ module Facter
       puts cache_groups
     end
 
-    desc '--puppet, -p', '(NOT SUPPORTED)Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
-    map ['--puppet', '-p'] => :puppet
-    def puppet(*_args)
-      puts '`facter --puppet` and `facter -p` are no longer supported, use `puppet facts show` instead'
-    end
-
     desc 'help', 'Help for all arguments'
     def help(*args)
       help_string = +''

data/lib/facter/resolvers/dmi_resolver.rb

@@ -36,9 +36,9 @@ module Facter
 
             file_content = Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)
             if files.include?(fact_name.to_s) && file_content
-              @fact_list[fact_name] = file_content.strip
+              file_content = file_content.strip
+              @fact_list[fact_name] = file_content unless file_content.empty?
               chassis_to_name(@fact_list[fact_name]) if fact_name == :chassis_type
-
             end
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/mountpoints_resolver.rb

@@ -10,7 +10,7 @@ module Facter
         private
 
         def post_resolve(fact_name)
-          @fact_list.fetch(fact_name) { read_mounts }
+          @fact_list.fetch(fact_name) { read_mounts(fact_name) }
         end
 
         def root_device
@@ -26,7 +26,8 @@ module Facter
           device
         end
 
-        def read_mounts # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        def read_mounts(fact_name)
           mounts = []
           FilesystemHelper.read_mountpoints.each do |fs|
             device = compute_device(fs.name)
@@ -52,7 +53,9 @@ module Facter
               .map { |v| binding.local_variable_get(v) })]
           end
           @fact_list[:mountpoints] = mounts
+          @fact_list[fact_name]
         end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
       end
     end
   end

data/lib/facter/resolvers/networking_linux_resolver.rb

@@ -59,9 +59,14 @@ module Facter
           return if !network_info[interface_name] || network_info[interface_name][:dhcp]
 
           index = tokens[0].delete(':')
-          dhcp = Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
-          network_info[interface_name][:dhcp] = dhcp.match(/SERVER_ADDRESS=(.*)/)[1] if dhcp
-          network_info[interface_name][:dhcp] ||= retrieve_from_other_directories(interface_name)
+          file_content = Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
+          dhcp = file_content.match(/SERVER_ADDRESS=(.*)/) if file_content
+          if dhcp
+            network_info[interface_name][:dhcp] = dhcp[1]
+          else
+            alternate_dhcp = retrieve_from_other_directories(interface_name)
+            network_info[interface_name][:dhcp] = alternate_dhcp if alternate_dhcp
+          end
         end
 
         def retrieve_from_other_directories(interface_name)
@@ -75,7 +80,8 @@ module Facter
               content = Util::FileHelper.safe_read("#{dir}#{file}", nil)
               next unless content =~ /interface.*#{interface_name}/
 
-              return content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)[1]
+              dhcp = content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)
+              return dhcp[1] if dhcp
             end
           end
           return unless File.readable?('/var/lib/NetworkManager/')

data/lib/facter/resolvers/processors_resolver.rb

@@ -60,7 +60,11 @@ module Facter
           def physical_devices_count
             Dir.entries('/sys/devices/system/cpu')
                .select { |dir| dir =~ /cpu[0-9]+$/ }
-               .count { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .map do |dir|
+              Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+            end
+               .uniq.count
           end
 
           def build_speed(tokens)

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class Mountpoints < BaseResolver
+        include Facter::FilesystemHelper
+        @fact_list ||= {}
+        @log = Facter::Log.new(self)
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_mounts(fact_name) }
+          end
+
+          def root_device
+            cmdline = Util::FileHelper.safe_read('/proc/cmdline')
+            match = cmdline.match(/root=([^\s]+)/)
+            match&.captures&.first
+          end
+
+          def compute_device(device)
+            # If the "root" device, lookup the actual device from the kernel options
+            # This is done because not all systems symlink /dev/root
+            device = root_device if device == '/dev/root'
+            device
+          end
+
+          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize
+            mounts = []
+            FilesystemHelper.read_mountpoints.each do |fs|
+              device = compute_device(fs.name)
+              filesystem = fs.mount_type
+              path = fs.mount_point
+              options = fs.options.split(',').map(&:strip)
+
+              stats = FilesystemHelper.read_mountpoint_stats(path)
+              size_bytes = stats.bytes_total.abs
+              available_bytes = stats.bytes_available.abs
+
+              used_bytes = stats.bytes_used.abs
+              total_bytes = used_bytes + available_bytes
+              capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
+
+              size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+              available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
+              used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
+
+              mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
+                .map { |v| binding.local_variable_get(v) })]
+            end
+            @fact_list[:mountpoints] = mounts
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/solaris/networking.rb

@@ -66,7 +66,7 @@ module Facter
 
             @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
 
-            @interfaces[lifreq.name][:mtu] = lifreq[:lifr_lifru][:lifru_metric]
+            @interfaces[lifreq.name][:mtu] ||= lifreq[:lifr_lifru][:lifru_metric]
           end
 
           def load_netmask(lifreq)

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.42
+  version: 4.0.43
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -936,6 +936,7 @@ files:
 - lib/facter/resolvers/solaris/ipaddress.rb
 - lib/facter/resolvers/solaris/ldom.rb
 - lib/facter/resolvers/solaris/memory.rb
+- lib/facter/resolvers/solaris/mountpoints.rb
 - lib/facter/resolvers/solaris/networking.rb
 - lib/facter/resolvers/solaris/os_release.rb
 - lib/facter/resolvers/solaris/processors.rb