facter 4.0.13 → 4.0.14

data/lib/custom_facts/core/execution.rb

@@ -8,9 +8,9 @@ module Facter
       # require_relative 'execution/posix'
 
       @@impl = if LegacyFacter::Util::Config.windows?
-                 LegacyFacter::Core::Execution::Windows.new
+                 Facter::Core::Execution::Windows.new
                else
-                 LegacyFacter::Core::Execution::Posix.new
+                 Facter::Core::Execution::Posix.new
                end
 
       def self.impl

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module LegacyFacter
+module Facter
   module Core
     module Execution
       class Base
@@ -33,12 +33,17 @@ module LegacyFacter
 
         def execute(command, options = {})
           on_fail = options.fetch(:on_fail, :raise)
+          expand = options.fetch(:expand, true)
 
           # Set LC_ALL and LANG to force i18n to C for the duration of this exec;
           # this ensures that any code that parses the
           # output of the command can expect it to be in a consistent / predictable format / locale
           with_env 'LC_ALL' => 'C', 'LANG' => 'C' do
-            expanded_command = expand_command(command)
+            expanded_command = if !expand && builtin_command?(command)
+                                 command
+                               else
+                                 expand_command(command)
+                               end
 
             if expanded_command.nil?
               if on_fail == :raise
@@ -49,17 +54,7 @@ module LegacyFacter
               return on_fail
             end
 
-            begin
-              out, stderr, _status_ = Open3.capture3(expanded_command.to_s)
-              log_stderr_from_file(stderr, expanded_command)
-            rescue StandardError => e
-              return on_fail unless on_fail == :raise
-
-              raise Facter::Core::Execution::ExecutionFailure.new,
-                    "Failed while executing '#{expanded_command}': #{e.message}"
-            end
-
-            out.strip
+            execute_command(expanded_command, on_fail)
           end
         end
 
@@ -72,6 +67,25 @@ module LegacyFacter
           logger = Facter::Log.new(file_name)
           logger.warn(msg.strip)
         end
+
+        def builtin_command?(command)
+          output, _status = Open3.capture2("type #{command}")
+          output.chomp =~ /builtin/ ? true : false
+        end
+
+        def execute_command(command, on_fail)
+          begin
+            out, stderr, _status_ = Open3.capture3(command.to_s)
+            log_stderr_from_file(stderr, command)
+          rescue StandardError => e
+            return on_fail unless on_fail == :raise
+
+            raise Facter::Core::Execution::ExecutionFailure.new,
+                  "Failed while executing '#{command}': #{e.message}"
+          end
+
+          out.strip
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
-module LegacyFacter
+module Facter
   module Core
     module Execution
-      class Posix < LegacyFacter::Core::Execution::Base
+      class Posix < Facter::Core::Execution::Base
         DEFAULT_SEARCH_PATHS = ['/sbin', '/usr/sbin'].freeze
 
         def search_paths

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

@@ -1,7 +1,7 @@
-module LegacyFacter
+module Facter
   module Core
     module Execution
-      class Windows < LegacyFacter::Core::Execution::Base
+      class Windows < Facter::Core::Execution::Base
         def search_paths
           ENV['PATH'].split(File::PATH_SEPARATOR)
         end
@@ -57,6 +57,13 @@ module LegacyFacter
 
           expanded
         end
+
+        def execute(command, options = {})
+          expand = options.fetch(:expand, true)
+          raise ArgumentError.new, 'Unsupported argument on Windows expand with value false' unless expand
+
+          super(command, options)
+        end
       end
     end
   end

data/lib/custom_facts/core/legacy_facter.rb

@@ -73,7 +73,7 @@ module LegacyFacter
   #
   # @param name [String] the name of the fact
   #
-  # @return [LegacyFacter::Util::Fact, nil] The fact object, or nil if no fact
+  # @return [Facter::Util::Fact, nil] The fact object, or nil if no fact
   #   is found.
   #
   # @api public
@@ -131,7 +131,7 @@ module LegacyFacter
   # @param name [Symbol] The name of the fact to define
   # @param options [Hash] A hash of options to set on the fact
   #
-  # @return [LegacyFacter::Util::Fact] The fact that was defined
+  # @return [Facter::Util::Fact] The fact that was defined
   #
   # @api public
   # @see {Facter::Util::Collection#define_fact}
@@ -152,7 +152,7 @@ module LegacyFacter
   #   {Facter::Util::Resolution#timeout timeout} for this resolution
   # @param block [Proc] a block defining a fact resolution
   #
-  # @return [LegacyFacter::Util::Fact] the fact object, which includes any previously
+  # @return [Facter::Util::Fact] the fact object, which includes any previously
   #   defined resolutions
   #
   # @api public

data/lib/custom_facts/util/collection.rb

@@ -24,7 +24,7 @@ module LegacyFacter
       # @param name [Symbol] The name of the fact to define
       # @param options [Hash] A hash of options to set on the fact
       #
-      # @return [LegacyFacter::Util::Fact] The fact that was defined
+      # @return [Facter::Util::Fact] The fact that was defined
       def define_fact(name, options = {}, &block)
         fact = create_or_return_fact(name, options)
 
@@ -41,7 +41,7 @@ module LegacyFacter
       # @param name [Symbol] The name of the fact to define
       # @param options [Hash] A hash of options to set on the fact and resolution
       #
-      # @return [LegacyFacter::Util::Fact] The fact that was defined
+      # @return [Facter::Util::Fact] The fact that was defined
       def add(name, options = {}, &block)
         fact = create_or_return_fact(name, options)
 
@@ -163,7 +163,7 @@ module LegacyFacter
         fact = @facts[name]
 
         if fact.nil?
-          fact = LegacyFacter::Util::Fact.new(name, options)
+          fact = Facter::Util::Fact.new(name, options)
           @facts[name] = fact
         else
           fact.extract_ldapname_option!(options)

data/lib/custom_facts/util/fact.rb

@@ -6,7 +6,7 @@
 # Create facts using {Facter.add}
 #
 # @api public
-module LegacyFacter
+module Facter
   module Util
     class Fact
       # The name of the fact
@@ -201,7 +201,7 @@ module LegacyFacter
           when :simple
             resolve = Facter::Util::Resolution.new(resolution_name, self)
           when :aggregate
-            resolve = LegacyFacter::Core::Aggregate.new(resolution_name, self)
+            resolve = Facter::Core::Aggregate.new(resolution_name, self)
           else
             raise ArgumentError,
                   "Expected resolution type to be one of (:simple, :aggregate) but was #{resolution_type}"

data/lib/custom_facts/util/resolution.rb

@@ -38,7 +38,7 @@ module Facter
       attr_accessor :name
 
       # @!attribute [r] fact
-      # @return [LegacyFacter::Util::Fact]
+      # @return [Facter::Util::Fact]
       # @api private
       attr_reader :fact
 
@@ -115,7 +115,7 @@ module Facter
       def setcode(string = nil, &block)
         if string
           @code = proc do
-            output = LegacyFacter::Core::Execution.execute(string, on_fail: nil)
+            output = Facter::Core::Execution.execute(string, on_fail: nil)
             if output.nil? || output.empty?
               nil
             else

data/lib/facter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require_relative 'util/api_debugger' if ENV['API_DEBUG']
 
 ROOT_DIR = Pathname.new(File.expand_path('..', __dir__)) unless defined?(ROOT_DIR)
 
@@ -24,7 +25,7 @@ module Facter
     # Alias method for Facter.fact()
     # @param name [string] fact name
     #
-    # @return [LegacyFacter::Util::Fact, nil] The fact object, or nil if no fact
+    # @return [Facter::Util::Fact, nil] The fact object, or nil if no fact
     #   is found.
     #
     # @api public
@@ -39,7 +40,7 @@ module Facter
     #   supplied here
     # @param block [Proc] a block defining a fact resolution
     #
-    # @return [LegacyFacter::Util::Fact] the fact object, which includes any previously
+    # @return [Facter::Util::Fact] the fact object, which includes any previously
     #   defined resolutions
     #
     # @api public
@@ -114,7 +115,7 @@ module Facter
     #
     # @param name [String] the name of the fact
     #
-    # @return [LegacyFacter::Util::Fact, nil] The fact object, or nil if no fact
+    # @return [Facter::Util::Fact, nil] The fact object, or nil if no fact
     #   is found.
     #
     # @api public
@@ -192,7 +193,7 @@ module Facter
       log_blocked_facts
 
       resolved_facts = Facter::FactManager.instance.resolve_facts
-      CacheManager.invalidate_all_caches
+      SessionCache.invalidate_all_caches
       FactCollection.new.build_fact_collection!(resolved_facts)
     end
 
@@ -250,7 +251,7 @@ module Facter
       log_blocked_facts
 
       resolved_facts = Facter::FactManager.instance.resolve_facts(args)
-      CacheManager.invalidate_all_caches
+      SessionCache.invalidate_all_caches
       fact_formatter = Facter::FormatterFactory.build(@options)
 
       status = error_check(args, resolved_facts)
@@ -288,7 +289,7 @@ module Facter
       @options.refresh([user_query])
       user_query = user_query.to_s
       resolved_facts = Facter::FactManager.instance.resolve_facts([user_query])
-      CacheManager.invalidate_all_caches
+      SessionCache.invalidate_all_caches
       fact_collection = FactCollection.new.build_fact_collection!(resolved_facts)
       splitted_user_query = Facter::Utils.split_user_query(user_query)
 
@@ -369,5 +370,7 @@ module Facter
       )
       nil
     end
+
+    prepend ApiDebugger if ENV['API_DEBUG']
   end
 end

data/lib/facts/aix/mountpoints.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class Mountpoints
+      FACT_NAME = 'mountpoints'
+
+      def call_the_resolver
+        mountpoints = Facter::Resolvers::Aix::Mountpoints.resolve(:mountpoints)
+
+        Facter::ResolvedFact.new(FACT_NAME, mountpoints)
+      end
+    end
+  end
+end

data/lib/facts/debian/os/distro/release.rb

@@ -9,20 +9,29 @@ module Facts
           ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
+            fact_value = determine_release_for_os
+
             return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
 
             versions = fact_value.split('.')
-            release = {
-              'full' => fact_value,
-              'major' => versions[0],
-              'minor' => versions[1]
-            }
+            release = { 'full' => fact_value, 'major' => versions[0], 'minor' => versions[1].gsub(/^0([1-9])/, '\1') }
 
             [Facter::ResolvedFact.new(FACT_NAME, release),
              Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
-             Facter::ResolvedFact.new(ALIASES[1], versions[0], :legacy),
-             Facter::ResolvedFact.new(ALIASES[2], versions[1], :legacy)]
+             Facter::ResolvedFact.new(ALIASES[1], release['major'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[2], release['minor'], :legacy)]
+          end
+
+          private
+
+          def determine_release_for_os
+            os_name = Facter::Resolvers::OsRelease.resolve(:name)
+
+            if os_name =~ /Debian|Raspbian/
+              Facter::Resolvers::DebianVersion.resolve(:version)
+            else
+              Facter::Resolvers::OsRelease.resolve(:version_id)
+            end
           end
         end
       end

data/lib/facts/debian/os/name.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'operatingsystem'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+          fact_value = Facter::Resolvers::OsRelease.resolve(:name)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facts/debian/os/release.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
+          fact_value = determine_release_for_os
 
           return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
 
@@ -16,13 +16,25 @@ module Facts
           release = {
             'full' => fact_value,
             'major' => versions[0],
-            'minor' => versions[1]
+            'minor' => versions[1].gsub(/^0([1-9])/, '\1')
           }
 
           [Facter::ResolvedFact.new(FACT_NAME, release),
            Facter::ResolvedFact.new(ALIASES.first, versions[0], :legacy),
            Facter::ResolvedFact.new(ALIASES.last, fact_value, :legacy)]
         end
+
+        private
+
+        def determine_release_for_os
+          os_name = Facter::Resolvers::OsRelease.resolve(:name)
+
+          if os_name =~ /Debian|Raspbian/
+            Facter::Resolvers::DebianVersion.resolve(:version)
+          else
+            Facter::Resolvers::OsRelease.resolve(:version_id)
+          end
+        end
       end
     end
   end

data/lib/facts/debian/partitions.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facts
+  module Debian
+    class Partitions
+      FACT_NAME = 'partitions'
+
+      def call_the_resolver
+        Facter::ResolvedFact.new(FACT_NAME, partitions)
+      end
+
+      def partitions
+        parts = Facter::Resolvers::Partitions.resolve(:partitions)
+        mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(:mountpoints)
+        return parts unless mountpoints
+
+        mountpoints.each do |mnt|
+          next unless parts[mnt[:device]]
+
+          parts[mnt[:device]].merge!(mount: mnt[:path])
+        end
+        parts.empty? ? nil : parts
+      end
+    end
+  end
+end

data/lib/facts/el/partitions.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facts
+  module El
+    class Partitions
+      FACT_NAME = 'partitions'
+
+      def call_the_resolver
+        Facter::ResolvedFact.new(FACT_NAME, partitions)
+      end
+
+      def partitions
+        parts = Facter::Resolvers::Partitions.resolve(:partitions)
+        mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(:mountpoints)
+        return parts unless mountpoints
+
+        mountpoints.each do |mnt|
+          next unless parts[mnt[:device]]
+
+          parts[mnt[:device]].merge!(mount: mnt[:path])
+        end
+        parts.empty? ? nil : parts
+      end
+    end
+  end
+end

data/lib/facts/sles/partitions.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facts
+  module Sles
+    class Partitions
+      FACT_NAME = 'partitions'
+
+      def call_the_resolver
+        Facter::ResolvedFact.new(FACT_NAME, partitions)
+      end
+
+      def partitions
+        parts = Facter::Resolvers::Partitions.resolve(:partitions)
+        mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(:mountpoints)
+        return parts unless mountpoints
+
+        mountpoints.each do |mnt|
+          next unless parts[mnt[:device]]
+
+          parts[mnt[:device]].merge!(mount: mnt[:path])
+        end
+        parts.empty? ? nil : parts
+      end
+    end
+  end
+end