facter 4.6.1 → 4.7.1

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/api_debugger.rb

@@ -34,9 +34,9 @@ module Facter
 
         options.split(',').each do |option|
           if option.start_with?('-')
-            exclude << option[1..].to_sym
+            exclude << option[1..-1].to_sym
           elsif option.start_with?('+')
-            print_caller << option[1..].to_sym
+            print_caller << option[1..-1].to_sym
           end
         end
 

data/lib/facter/util/facts/posix/virtual_detector.rb

@@ -8,7 +8,7 @@ module Facter
           class << self
             def platform
               @fact_value ||= # rubocop:disable Naming/MemoizedInstanceVariableName
-                check_docker_lxc || check_freebsd || check_gce || check_illumos_lx || \
+                check_docker_lxc || check_freebsd || check_openbsd || check_gce || check_illumos_lx || \
                 retrieve_from_virt_what || check_vmware || check_open_vz || check_vserver || \
                 check_xen || check_other_facts || check_lspci || 'physical'
             end
@@ -54,6 +54,12 @@ module Facter
               Facter::Resolvers::Freebsd::Virtual.resolve(:vm)
             end
 
+            def check_openbsd
+              return unless Object.const_defined?('Facter::Resolvers::Openbsd::Virtual')
+
+              Facter::Resolvers::Openbsd::Virtual.resolve(:vm)
+            end
+
             def check_other_facts
               bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
               return 'kvm' if bios_vendor&.include?('Amazon EC2')

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.6.1' 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.6.1
+  version: 4.7.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-01 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
@@ -64,42 +88,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +203,7 @@ dependencies:
         version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,7 +213,7 @@ dependencies:
         version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 description: You can prove anything with facts!
 email:
 - team-nw@puppet.com
@@ -669,6 +693,64 @@ files:
 - 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/openbsd/augeas/version.rb
+- lib/facter/facts/openbsd/dmi/bios/vendor.rb
+- lib/facter/facts/openbsd/dmi/bios/version.rb
+- lib/facter/facts/openbsd/dmi/manufacturer.rb
+- lib/facter/facts/openbsd/dmi/product/name.rb
+- lib/facter/facts/openbsd/dmi/product/serial_number.rb
+- lib/facter/facts/openbsd/dmi/product/uuid.rb
+- lib/facter/facts/openbsd/ec2_metadata.rb
+- lib/facter/facts/openbsd/ec2_userdata.rb
+- lib/facter/facts/openbsd/facterversion.rb
+- lib/facter/facts/openbsd/identity/gid.rb
+- lib/facter/facts/openbsd/identity/group.rb
+- lib/facter/facts/openbsd/identity/privileged.rb
+- lib/facter/facts/openbsd/identity/uid.rb
+- lib/facter/facts/openbsd/identity/user.rb
+- lib/facter/facts/openbsd/ipaddress6_interfaces.rb
+- lib/facter/facts/openbsd/ipaddress_interfaces.rb
+- lib/facter/facts/openbsd/is_virtual.rb
+- lib/facter/facts/openbsd/kernel.rb
+- lib/facter/facts/openbsd/kernelrelease.rb
+- lib/facter/facts/openbsd/mountpoints.rb
+- lib/facter/facts/openbsd/netmask6_interfaces.rb
+- lib/facter/facts/openbsd/netmask_interfaces.rb
+- lib/facter/facts/openbsd/network6_interfaces.rb
+- lib/facter/facts/openbsd/network_interfaces.rb
+- lib/facter/facts/openbsd/networking/dhcp.rb
+- lib/facter/facts/openbsd/networking/domain.rb
+- lib/facter/facts/openbsd/networking/fqdn.rb
+- lib/facter/facts/openbsd/networking/hostname.rb
+- lib/facter/facts/openbsd/networking/interfaces.rb
+- lib/facter/facts/openbsd/networking/ip.rb
+- lib/facter/facts/openbsd/networking/ip6.rb
+- lib/facter/facts/openbsd/networking/mac.rb
+- lib/facter/facts/openbsd/networking/mtu.rb
+- lib/facter/facts/openbsd/networking/netmask.rb
+- lib/facter/facts/openbsd/networking/netmask6.rb
+- lib/facter/facts/openbsd/networking/network.rb
+- lib/facter/facts/openbsd/networking/network6.rb
+- lib/facter/facts/openbsd/networking/primary.rb
+- lib/facter/facts/openbsd/networking/scope6.rb
+- lib/facter/facts/openbsd/os/architecture.rb
+- lib/facter/facts/openbsd/os/hardware.rb
+- lib/facter/facts/openbsd/os/name.rb
+- lib/facter/facts/openbsd/os/release.rb
+- lib/facter/facts/openbsd/path.rb
+- lib/facter/facts/openbsd/processors/isa.rb
+- lib/facter/facts/openbsd/ruby/platform.rb
+- lib/facter/facts/openbsd/ruby/sitedir.rb
+- lib/facter/facts/openbsd/ruby/version.rb
+- lib/facter/facts/openbsd/ssh.rb
+- lib/facter/facts/openbsd/sshalgorithmkey.rb
+- lib/facter/facts/openbsd/sshfp_algorithm.rb
+- lib/facter/facts/openbsd/system_uptime/days.rb
+- lib/facter/facts/openbsd/system_uptime/hours.rb
+- lib/facter/facts/openbsd/system_uptime/seconds.rb
+- lib/facter/facts/openbsd/system_uptime/uptime.rb
+- lib/facter/facts/openbsd/timezone.rb
+- lib/facter/facts/openbsd/virtual.rb
 - lib/facter/facts/openwrt/os/release.rb
 - lib/facter/facts/ovs/os/release.rb
 - lib/facter/facts/photon/os/release.rb
@@ -982,6 +1064,10 @@ files:
 - lib/facter/resolvers/mountpoints.rb
 - lib/facter/resolvers/networking.rb
 - lib/facter/resolvers/open_vz.rb
+- lib/facter/resolvers/openbsd/dhcp.rb
+- lib/facter/resolvers/openbsd/dmi.rb
+- lib/facter/resolvers/openbsd/mountpoints.rb
+- lib/facter/resolvers/openbsd/virtual.rb
 - lib/facter/resolvers/os_release.rb
 - lib/facter/resolvers/partitions.rb
 - lib/facter/resolvers/path.rb
@@ -1093,7 +1179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'