facter 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101e10975c853baea839c1f0b5afc9d409f85df720a581d2987cf61cb50101af
-  data.tar.gz: 828a50d3cf221d2bec58e90400684d25c9adff0b3fe93c39535e1136dc628e34
+  metadata.gz: 512cdd220f22069dbf686592dfc08d3b4ecccf97702313117b333d5e568ebe8e
+  data.tar.gz: 373406fac7fe5ec363b13e6afa26acabfb6bb62716d9f0b977b1f2e768e6381d
 SHA512:
-  metadata.gz: 4d367e6d5b5b248767d77464e02f99951219bdd99108990fb2b4af0724c769f9dba18073e382ba244b81413d486547a284ae949779f31a2a0a5299d1b7a448cf
-  data.tar.gz: af8d6958c1cc05eb883fc5479c863c6613fb49737ea38c251cb7facd3c05ab6c57990334f419604b3102a05736182756daed55492c5644c849c3f71e1d7acd76
+  metadata.gz: ed2f2ac6dcec58364ba37df4acee50fb44f90f46f6de28f8f2524aa89d8d5634e7499be547234e65e4930126e59652b0d6b56f2d602e74598227d7808c504bf7
+  data.tar.gz: ef408018f71cd5884a56cf0dc3aab243fe119978e45c99e4b8069242d4ecf27011a3c106b53f12960665729bc0209aee452a02138e6642749f2c2b51e46a67bc

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

@@ -109,7 +109,7 @@ module Facter
       # @api private
       def evaluate(&block)
         if @last_evaluated
-          msg = "Already evaluated #{@name}"
+          msg = +"Already evaluated #{@name}"
           msg << " at #{@last_evaluated}" if msg.is_a? String
           msg << ', reevaluating anyways'
           log.warn msg
@@ -197,6 +197,10 @@ module Facter
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       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

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

@@ -35,7 +35,7 @@ module LegacyFacter
       end
 
       # Evaluate the fact, returning true or false.
-      # if we have a block paramter then we only evaluate that instead
+      # if we have a block parameter then we only evaluate that instead
       def true?
         if @block && !@fact
           begin
@@ -54,9 +54,11 @@ module LegacyFacter
 
         return false if value.nil?
 
+        # We call the block with both the downcased and raw fact value for
+        # backwards-compatibility.
         if @block
           begin
-            return !!@block.call(value)
+            return !!@block.call(value) || !!@block.call(fact.value) # rubocop:disable Style/DoubleNegation
           rescue StandardError => e
             log.debug "Confine raised #{e.class} #{e}"
             return false

data/lib/facter/framework/logging/logger.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'logger'
+require 'set'
 
 module Facter
   RED     = "\e[31m"
@@ -15,8 +16,8 @@ module Facter
     @@logger = nil
     @@message_callback = nil
     @@has_errors = false
-    @@debug_messages = []
-    @@warn_messages = []
+    @@debug_messages = Set.new
+    @@warn_messages = Set.new
     @@timing = false
 
     class << self

data/lib/facter/resolvers/az.rb

@@ -26,7 +26,7 @@ module Facter
 
         def get_data_from(url)
           headers = { Metadata: 'true' }
-          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
+          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout }, false)
         end
 
         def determine_session_timeout

data/lib/facter/resolvers/base_resolver.rb

@@ -3,8 +3,8 @@
 module Facter
   module Resolvers
     class BaseResolver
-      def self.log
-        @log ||= Log.new(self)
+      class << self
+        attr_reader :log
       end
 
       def self.invalidate_cache
@@ -14,6 +14,7 @@ module Facter
       def self.init_resolver
         @fact_list = {}
         @semaphore = Mutex.new
+        @log = Log.new(self)
       end
 
       def self.subscribe_to_manager

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

@@ -5,7 +5,6 @@ module Facter
     module Bsd
       class Processors < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

data/lib/facter/resolvers/disks.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class Disks < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         DIR = '/sys/block'

data/lib/facter/resolvers/dmi.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class DmiBios < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self

data/lib/facter/resolvers/ec2.rb

@@ -52,7 +52,7 @@ module Facter
         def get_data_from(url)
           headers = {}
           headers['X-aws-ec2-metadata-token'] = v2_token if v2_token
-          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
+          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout }, false)
         end
 
         def determine_session_timeout

data/lib/facter/resolvers/filesystems.rb

@@ -8,8 +8,6 @@ module Facter
 
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

data/lib/facter/resolvers/fips_enabled.rb

@@ -8,8 +8,6 @@ module Facter
 
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

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

@@ -7,7 +7,6 @@ module Facter
     module Freebsd
       class Processors < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

data/lib/facter/resolvers/gce.rb

@@ -22,7 +22,7 @@ module Facter
         end
 
         def query_for_metadata
-          gce_data = extract_to_hash(Facter::Util::Resolvers::Http.get_request(METADATA_URL, HEADERS))
+          gce_data = extract_to_hash(Facter::Util::Resolvers::Http.get_request(METADATA_URL, HEADERS, false))
           parse_instance(gce_data)
 
           gce_data.empty? ? nil : gce_data

data/lib/facter/resolvers/hostname.rb

@@ -19,6 +19,11 @@ module Facter
         def retrieve_info(fact_name)
           require 'socket'
           output = Socket.gethostname
+          unless output
+            log.debug('Socket.gethostname failed to return hostname')
+            return
+          end
+
           hostname, domain = retrieve_from_fqdn(output)
 
           fqdn = retrieve_with_addrinfo(hostname) if hostname_and_no_domain?(hostname, domain)

data/lib/facter/resolvers/identity.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class PosxIdentity < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

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

@@ -7,8 +7,6 @@ module Facter
         include Facter::Util::Resolvers::FilesystemHelper
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

data/lib/facter/resolvers/memory.rb

@@ -6,8 +6,6 @@ module Facter
       class Memory < BaseResolver
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

data/lib/facter/resolvers/mountpoints.rb

@@ -7,8 +7,6 @@ module Facter
 
       init_resolver
 
-      @log = Facter::Log.new(self)
-
       class << self
         private
 

data/lib/facter/resolvers/processors.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class Processors < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         MHZ_TO_HZ = 1_000_000

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

@@ -7,8 +7,6 @@ module Facter
         include Facter::Util::Resolvers::FilesystemHelper
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

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

@@ -6,7 +6,6 @@ module Facter
     module Solaris
       class Networking < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

data/lib/facter/resolvers/ssh.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Ssh < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub].freeze

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

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DMIBios < BaseResolver
-      @log = Facter::Log.new(self)
       init_resolver
 
       class << self

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

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DMIComputerSystem < BaseResolver
-      @log = Facter::Log.new(self)
       init_resolver
 
       class << self

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

@@ -24,7 +24,6 @@ module Facter
           build_facts_list(hardware: hard, architecture: arch)
           @fact_list[fact_name]
         rescue LoadError => e
-          log = Facter::Log.new(self)
           log.debug("The ffi gem has not been installed: #{e}")
         end
 

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Identity < BaseResolver
       NAME_SAM_COMPATIBLE = 2
-      @log = Facter::Log.new(self)
 
       init_resolver
 

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

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Kernel < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

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

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Memory < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Windows
       class Networking < BaseResolver
-        @log = Facter::Log.new(self)
         init_resolver
 
         class << self

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

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Windows
       class Ssh < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub

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

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class System32 < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

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

@@ -34,7 +34,6 @@ module Facter
             require_relative '../../../facter/resolvers/windows/ffi/winnls_ffi'
             WinnlsFFI.GetACP.to_s
           rescue LoadError => e
-            log = Facter::Log.new(self)
             log.debug("Could not retrieve codepage: #{e}")
           end
         end

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

@@ -6,8 +6,6 @@ module Facter
   module Resolvers
     module Windows
       class Uptime < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self

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

@@ -4,16 +4,21 @@ module Facter
   module Resolvers
     module Windows
       class Virtualization < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self
           # Virtual
           # Is_Virtual
 
-          MODEL_HASH = { 'VirtualBox' => 'virtualbox', 'VMware' => 'vmware', 'KVM' => 'kvm',
-                         'Bochs' => 'bochs', 'Google' => 'gce', 'OpenStack' => 'openstack' }.freeze
+          MODEL_HASH = {
+            'VirtualBox' => 'virtualbox',
+            'VMware' => 'vmware',
+            'KVM' => 'kvm',
+            'Bochs' => 'bochs',
+            'Google' => 'gce',
+            'OpenStack' => 'openstack',
+            'AHV' => 'ahv'
+          }.freeze
 
           private
 

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

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class WinOsDescription < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

data/lib/facter/resolvers/xen.rb

@@ -66,6 +66,8 @@ module Facter
           return XEN_TOOLSTACK if num_stacks > 1 && File.exist?(XEN_TOOLSTACK)
 
           XEN_COMMANDS.each { |command| return command if File.exist?(command) }
+
+          nil
         end
       end
     end

data/lib/facter/templates/man.erb

@@ -1,11 +1,14 @@
 <%# encoding: UTF-8%>
+facter - collect and display facts about the current system
+===========================================================
+
 SYNOPSIS
 --------
-  facter [options] [query] [query] [...]
+<b>facter</b> [options] [query] [query] [...]
 
 DESCRIPTION
 -----------
-Collect and display facts about the current system. The library behind Facter is easy to extend, making Facter an easy way to collect information about a system.
+<b>facter</b> is a command-line tool that gathers basic facts about nodes (systems) such as hardware details, network settings, OS type and version, and more. These facts are made available as variables in your Puppet manifests and can be used to inform conditional expressions in Puppet.
 
 If no queries are given, then all facts will be returned.
 

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

@@ -10,34 +10,37 @@ module Facter
           CONNECTION_TIMEOUT = 0.6
           SESSION_TIMEOUT = 5
 
-          # Makes a GET http request and returns its response.
+          # Makes a GET HTTP request and returns its response.
           #
-          # Params:
-          # url: String which contains the address to which the request will be made
-          # headers: Hash which contains the headers you need to add to your request.
-          #          Default headers is an empty hash
-          #          Example: { "Accept": 'application/json' }
-          # timeouts: Hash that includes the values for the session and connection timeouts.
-          #          Example: { session: 2.4. connection: 5 }
-          #
-          # Return value:
-          # is a string with the response body if the response code is 200.
-          # If the response code is not 200, an empty string is returned.
-          def get_request(url, headers = {}, timeouts = {})
-            make_request(url, headers, timeouts, 'GET')
+          # @param url [String] the address to which the request will be made.
+          # @param headers [Hash] the headers you need to add to your request.
+          #   Defaults to an empty hash.
+          # @param timeouts [Hash] Values for the session and connection
+          #   timeouts.
+          # @param proxy [Boolean] Whether to use proxy settings when calling
+          #   Net::HTTP.new. Defaults to true.
+          # @returns [String] the response body if the response code is 200.
+          #   If the response code is not 200, an empty string is returned.
+          # @example
+          #   get_request('https://example.com', { "Accept": 'application/json' }, { session: 2.4, connection: 5 })
+          def get_request(url, headers = {}, timeouts = {}, proxy = true)
+            make_request(url, headers, timeouts, 'GET', proxy)
           end
 
-          def put_request(url, headers = {}, timeouts = {})
-            make_request(url, headers, timeouts, 'PUT')
+          # Makes a PUT HTTP request and returns its response
+          # @param (see #get_request)
+          # @return (see #get_request)
+          def put_request(url, headers = {}, timeouts = {}, proxy = true)
+            make_request(url, headers, timeouts, 'PUT', proxy)
           end
 
           private
 
-          def make_request(url, headers, timeouts, request_type)
+          def make_request(url, headers, timeouts, request_type, proxy)
             require 'net/http'
 
             uri = URI.parse(url)
-            http = http_obj(uri, timeouts)
+            http = http_obj(uri, timeouts, proxy)
             request = request_obj(headers, uri, request_type)
 
             # The Windows implementation of sockets does not respect net/http
@@ -56,8 +59,16 @@ module Facter
             ''
           end
 
-          def http_obj(parsed_url, timeouts)
-            http = Net::HTTP.new(parsed_url.host)
+          def http_obj(parsed_url, timeouts, proxy)
+            # If get_request or put_request are called and set proxy to false,
+            # manually set Net::HTTP.new's p_addr (proxy address) positional
+            # argument to nil to override anywhere else a proxy may be set
+            # (e.g. the http_proxy environment variable).
+            http = if proxy
+                     Net::HTTP.new(parsed_url.host)
+                   else
+                     Net::HTTP.new(parsed_url.host, 80, nil)
+                   end
             http.read_timeout = timeouts[:session] || SESSION_TIMEOUT
             http.open_timeout = timeouts[:connection] || CONNECTION_TIMEOUT
 

data/lib/facter/version.rb

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

metadata

@@ -1,29 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-09 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.16.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement