facter 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a329a8e0a2281e2640784c89bd374f16a2cb75dbbde5a19b5608340371d92601
-  data.tar.gz: 9374fd76feb4d7d583b566e6f5c6daffb613fff8c6adeca0fffd9201e6dd676c
+  metadata.gz: 74662429c9115d4eb8feca42d49031fa3be3ff42c200a8c6ee58c664f8afa9da
+  data.tar.gz: e1c21ea94af446c6700c27db8c24f150671f7ee8410b8e070436e709ff85fc87
 SHA512:
-  metadata.gz: 7c1ef71b91e17ba0441a4a56c10fcf1eaea3c09e99754e9a42035e3ddbf41de82268d49b9debef5096eed6673b499b6fd3368473c7cdeaddc0b8ab0a3d0ad4a0
-  data.tar.gz: 7c431855c6d26c5bda0f17f647d80c7c593c455ad8bad56aa0b9d5077bb4d59ea0f34a53b512cfe3569d13c46ff477e887e14c45e01d9e55044e0b3311257d81
+  metadata.gz: 9a1a2529c0fe5df5da517bbcc8b76b2a53c5c138af5d83ebf8dc25b051d28861816ed4b8ab6c1e167ec4c6bcef50df7d68a34abd22f04442f44eaebd499f3bef
+  data.tar.gz: 6c31e966940c2d1a525c5fb1f416b5af15e2b8c57516c92eab6e74be361d198bd6494e26b85316758e7e42ff1eecc6fc3480c3f718b8de2e7d452bcde39911f0

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

@@ -8,7 +8,7 @@ module Facter
       class Base
         STDERR_MESSAGE = 'Command %s completed with the following stderr message: %s'
         VALID_OPTIONS = %i[on_fail expand logger timeout].freeze
-
+        DEFAULT_EXECUTION_TIMEOUT = 300
         def initialize
           @log = Log.new(self)
         end
@@ -65,7 +65,7 @@ module Facter
         end
 
         def execute_command(command, on_fail = nil, logger = nil, timeout = nil)
-          timeout ||= 300
+          timeout ||= DEFAULT_EXECUTION_TIMEOUT
           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
@@ -98,7 +98,7 @@ module Facter
             message = "Failed while executing '#{command}': #{e.message}"
             if logger
               @log.debug(message)
-              return ''
+              return +''
             end
 
             return on_fail unless on_fail == :raise

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

@@ -131,7 +131,7 @@ module Facter
       #
       # @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.
+      #   return that object on failure. Default is to not raise.
       # @param logger Optional logger used to log the command's stderr.
       # @param timeout Optional time out for the specified command. If no timeout is passed,
       #   a default of 300 seconds is used.

data/lib/facter/facts/linux/partitions.rb

@@ -11,6 +11,10 @@ module Facts
 
       def partitions
         parts = Facter::Resolvers::Partitions.resolve(:partitions)
+        # We should exit early if we are running on a node with no partitions
+        # (e.g. a diskless, netbooted VM)
+        return nil unless parts
+
         mountpoints = Facter::Resolvers::Mountpoints.resolve(:mountpoints)
         return parts unless mountpoints
 

data/lib/facter/facts/linux/processors/isa.rb

@@ -9,16 +9,7 @@ module Facts
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:processor)
-          isa = get_isa(fact_value)
-
-          [Facter::ResolvedFact.new(FACT_NAME, isa), Facter::ResolvedFact.new(ALIASES, isa, :legacy)]
-        end
-
-        private
-
-        def get_isa(fact_value)
-          value_split = fact_value.split('.')
-          value_split.last
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facter/facts/ol/lsbdistdescription.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    class Lsbdistdescription
+      FACT_NAME = 'lsbdistdescription'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/ol/lsbdistid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    class Lsbdistid
+      FACT_NAME = 'lsbdistid'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/ol/os/distro/description.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    module Os
+      module Distro
+        class Description
+          FACT_NAME = 'os.distro.description'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::OsRelease.resolve(:pretty_name)
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/ol/os/distro/id.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    module Os
+      module Distro
+        class Id
+          FACT_NAME = 'os.distro.id'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::OsRelease.resolve(:id).capitalize
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/framework/config/config_reader.rb

@@ -38,6 +38,10 @@ module Facter
         @conf = {}
       end
 
+      def clear
+        @conf = {}
+      end
+
       private
 
       def log

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -21,7 +21,19 @@ module Facter
     def load(user_query, options)
       @internal_facts = load_internal_facts(user_query, options)
       @custom_facts = load_custom_facts(options)
-      @external_facts = load_external_facts(options)
+      if ENV['INSIDE_FACTER']
+        @log.debug('INSIDE_FACTER env var detected, not loading external facts to prevent recursion')
+        if options[:external_facts]
+          @log.warn('Recursion detected, skipping external facts. Silence this warning by adding --no-external-facts')
+        end
+      else
+        begin
+          ENV['INSIDE_FACTER'] = 'true'
+          @external_facts = load_external_facts(options)
+        ensure
+          ENV.delete('INSIDE_FACTER')
+        end
+      end
 
       filter_env_facts
 

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

@@ -642,6 +642,10 @@ os_hierarchy.each do |os|
 
   when 'ol'
     require_relative '../../facts/ol/os/release.rb'
+    require_relative '../../facts/ol/lsbdistdescription.rb'
+    require_relative '../../facts/ol/lsbdistid.rb'
+    require_relative '../../facts/ol/os/distro/description.rb'
+    require_relative '../../facts/ol/os/distro/id.rb'
 
   when 'openwrt'
     require_relative '../../facts/openwrt/os/release.rb'
@@ -802,7 +806,6 @@ os_hierarchy.each do |os|
     require_relative '../../util/windows/win32ole.rb'
 
     require_relative '../../facts/windows/aio_agent_version.rb'
-    require_relative '../../facts/windows/augeas/version.rb'
     require_relative '../../facts/windows/az_metadata.rb'
     require_relative '../../facts/windows/cloud/provider.rb'
     require_relative '../../facts/windows/dhcp_servers.rb'

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

@@ -16,6 +16,10 @@ module Facter
         @options || {}
       end
 
+      def clear
+        @options = {}
+      end
+
       private
 
       def augment_structured_facts(global_conf)

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

@@ -55,8 +55,15 @@ module Facter
       no_custom_facts = !options[:custom_facts]
       puppet = options[:puppet]
       custom_dir = options[:custom_dir].nil? ? false : options[:custom_dir].any?
-      external_dir = options[:external_dir].nil? ? false : options[:external_dir].any?
-
+      default_external_dir = Facter::OptionStore.default_external_dir
+      # --puppet/-p option adds an external directory and is not an explicitly
+      # set external_dir from cli or config file
+      default_external_dir += [Puppet[:pluginfactdest]] if puppet && const_defined?('Puppet')
+      external_dir = if options[:external_dir].nil? || options[:external_dir].none?
+                       false
+                     else
+                       options[:external_dir] != default_external_dir
+                     end
       [
         { 'no-ruby' => no_ruby, 'custom-dir' => custom_dir },
         { 'no-external-facts' => !options[:external_facts], 'external-dir' => external_dir },

data/lib/facter/framework/parsers/query_parser.rb

@@ -85,7 +85,8 @@ module Facter
 
         return false if fact_with_wildcard && !query_fact.match("^#{fact_name}$")
 
-        return false unless fact_with_wildcard || fact_name.match("^#{processed_equery_fact}($|\\.)")
+        # Must escape metacharacters (like dots) to ensure the correct fact is found
+        return false unless fact_with_wildcard || fact_name.match("^#{Regexp.escape(processed_equery_fact)}($|\\.)")
 
         true
       end

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

@@ -48,8 +48,10 @@ module Facter
               info = line.split("\s")
               interface_name = info[0]
               mac = info[3][/^([0-9a-f]{1,2}[\.:-]){5}([0-9a-f]{1,2})$/]
-              interfaces[interface_name][:mtu] = info[1].to_i
-              interfaces[interface_name][:mac] = format_mac_address(mac) if mac
+              if interfaces[interface_name]
+                interfaces[interface_name][:mtu] = info[1].to_i
+                interfaces[interface_name][:mac] = format_mac_address(mac) if mac
+              end
             end
           end
 

data/lib/facter/resolvers/freebsd/swap_memory.rb

@@ -13,7 +13,7 @@ module Facter
             @fact_list.fetch(fact_name) { read_swap_memory(fact_name) }
           end
 
-          def read_swap_memory(fact_name) # rubocop:disable Metrics/AbcSize
+          def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
             data = output.split("\n")[1..-1].map { |line| line.split(/\s+/) }
 

data/lib/facter/resolvers/gce.rb

@@ -39,6 +39,15 @@ module Facter
           instance_data = gce_data['instance']
           return if instance_data.nil? || instance_data.empty?
 
+          # See https://cloud.google.com/compute/docs/metadata for information about these values
+          %w[sshKeys ssh-keys].each do |name|
+            keys = gce_data.dig('project', 'attributes', name)
+            gce_data['project']['attributes'][name] = keys.strip.split("\n") if keys
+
+            keys = instance_data.dig('attributes', name)
+            instance_data['attributes'][name] = keys.strip.split("\n") if keys
+          end
+
           %w[image machineType zone].each do |key|
             instance_data[key] = instance_data[key].split('/').last if instance_data[key]
           end

data/lib/facter/resolvers/macosx/swap_memory.rb

@@ -13,7 +13,7 @@ module Facter
             @fact_list.fetch(fact_name) { read_swap_memory(fact_name) }
           end
 
-          def read_swap_memory(fact_name) # rubocop:disable Metrics/AbcSize
+          def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('sysctl -n vm.swapusage', logger: log)
             data = output.match(/^total = ([\d.]+)M  used = ([\d.]+)M  free = ([\d.]+)M  (\(encrypted\))$/)
 

data/lib/facter/resolvers/os_release.rb

@@ -49,7 +49,7 @@ module Facter
 
           pairs = []
           content.each do |line|
-            pairs << line.strip.delete('"').split('=', 2)
+            pairs << line.strip.delete('"').split('=', 2) unless line.start_with?('#')
           end
 
           pairs

data/lib/facter/resolvers/solaris/ffi/functions.rb

@@ -15,9 +15,11 @@ module Facter
 
           def self.ioctl(call_const, pointer, address_family = AF_INET)
             fd = Ioctl.open_socket(address_family, SOCK_DGRAM, 0)
-            result = ioctl_base(fd, call_const, pointer)
-            Ioctl.close_socket(fd, 2)
-            result
+            begin
+              ioctl_base(fd, call_const, pointer)
+            ensure
+              Ioctl.close_socket(fd, 2)
+            end
           end
         end
       end

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

@@ -21,7 +21,7 @@ module Facter
             end
           end
 
-          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def read_mounts(fact_name) # rubocop:disable Metrics/MethodLength
             @mounts = []
             @auto_home_paths = []
 

data/lib/facter/util/api_debugger.rb

@@ -3,7 +3,7 @@
 module Facter
   module Util
     module ApiDebugger
-      def self.prepended(receiver) # rubocop:disable Metrics/AbcSize
+      def self.prepended(receiver)
         exclude, print_caller = parse_options(ENV['API_DEBUG'])
 
         receiver_methods = receiver.instance_methods - Object.methods

data/lib/facter/util/resolvers/ffi/hostname.rb

@@ -36,7 +36,7 @@ module Facter
             raw_hostname.read_string
           end
 
-          def self.getffiaddrinfo(hostname) # rubocop:disable  Metrics/AbcSize
+          def self.getffiaddrinfo(hostname)
             ret = FFI::MemoryPointer.new(:pointer)
 
             hints = Facter::Util::Resolvers::Ffi::AddrInfo.new

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -649,6 +649,10 @@ files:
 - lib/facter/facts/mariner/os/release.rb
 - lib/facter/facts/meego/os/release.rb
 - lib/facter/facts/oel/os/release.rb
+- lib/facter/facts/ol/lsbdistdescription.rb
+- lib/facter/facts/ol/lsbdistid.rb
+- lib/facter/facts/ol/os/distro/description.rb
+- lib/facter/facts/ol/os/distro/id.rb
 - lib/facter/facts/ol/os/release.rb
 - lib/facter/facts/openwrt/os/release.rb
 - lib/facter/facts/ovs/os/release.rb
@@ -776,7 +780,6 @@ files:
 - lib/facter/facts/ubuntu/os/distro/release.rb
 - lib/facter/facts/ubuntu/os/release.rb
 - lib/facter/facts/windows/aio_agent_version.rb
-- lib/facter/facts/windows/augeas/version.rb
 - lib/facter/facts/windows/az_metadata.rb
 - lib/facter/facts/windows/cloud/provider.rb
 - lib/facter/facts/windows/dhcp_servers.rb

data/lib/facter/facts/windows/augeas/version.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Windows
-    module Augeas
-      class Version
-        FACT_NAME = 'augeas.version'
-        ALIASES = 'augeasversion'
-
-        def call_the_resolver
-          fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version)
-
-          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-           Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
-        end
-      end
-    end
-  end
-end