facter 4.5.1 → 4.6.0

data/lib/facter/resolvers/virt_what.rb

@@ -30,7 +30,8 @@ module Facter
           xen_info = xen_info.to_s
           return 'xenu' if /xen-domu/.match?(xen_info)
           return 'xenhvm' if /xen-hvm/.match?(xen_info)
-          return 'xen0' if /xen-dom0/.match?(xen_info)
+
+          'xen0' if /xen-dom0/.match?(xen_info)
         end
 
         def determine_other(output)

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

@@ -58,8 +58,9 @@ module Facter
           @fact_list[:total_bytes] = result[:total_bytes]
           @fact_list[:available_bytes] = result[:available_bytes]
           @fact_list[:used_bytes] = result[:used_bytes]
-          @fact_list[:capacity] = format('%<capacity>.2f',
-                                         capacity: (result[:used_bytes] / result[:total_bytes].to_f * 100)) + '%'
+          @fact_list[:capacity] = format(
+            '%<capacity>.2f%%', capacity: (result[:used_bytes] / result[:total_bytes].to_f * 100)
+          )
         end
       end
     end

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

@@ -23,19 +23,19 @@ module Facter
         end
 
         def build_fact_list(reg)
-          reg.each do |name, _value|
+          reg.each do |name, value|
             case name
             when 'EditionID'
-              @fact_list[:edition_id] = reg[name]
+              @fact_list[:edition_id] = value
             when 'InstallationType'
-              @fact_list[:installation_type] = reg[name]
+              @fact_list[:installation_type] = value
             when 'ProductName'
-              @fact_list[:product_name] = reg[name]
+              @fact_list[:product_name] = value
             when 'DisplayVersion'
-              @fact_list[:release_id] = reg[name]
-              @fact_list[:display_version] = reg[name]
+              @fact_list[:release_id] = value
+              @fact_list[:display_version] = value
             when 'ReleaseId'
-              @fact_list[:release_id] = reg[name] unless @fact_list[:release_id]
+              @fact_list[:release_id] = value unless @fact_list[:release_id]
             end
           end
         end

data/lib/facter/resolvers/xen.rb

@@ -26,7 +26,9 @@ module Facter
 
         def detect_xen_type
           xen_type = 'xen0' if File.exist?('/dev/xen/evtchn')
-          xen_type = 'xenu' if !xen_type && (File.exist?('/proc/xen') || File.exist?('/dev/xvda1'))
+          if !xen_type && (File.exist?('/proc/xen') || (File.exist?('/dev/xvda1') && !File.symlink?('/dev/xvda1')))
+            xen_type = 'xenu'
+          end
 
           xen_type
         end

data/lib/facter/util/aix/info_extractor.rb

@@ -61,7 +61,7 @@ module Facter
           properties = PROPERTIES[cmd]
           properties.each do |property|
             str = (properties - [property]).join('|')
-            matcher = content.match(/#{Regexp.escape(property)}([^\n]*?)(#{str}|\n|$)/s)
+            matcher = content.match(/(?:^|^[^:]+:[^:]+)#{Regexp.escape(property)}([^\n]*?)(#{str}|\n|$)/s)
             if matcher
               value = matcher[1].strip
               property_hash[property.split(':').first] = value

data/lib/facter/util/aix/odm_query.rb

@@ -38,7 +38,7 @@ module Facter
         end
 
         def query
-          'odmget -q "' + @conditions.join(' AND ') + '"'
+          "odmget -q \"#{@conditions.join(' AND ')}\""
         end
       end
     end

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..-1].to_sym
+            exclude << option[1..].to_sym
           elsif option.start_with?('+')
-            print_caller << option[1..-1].to_sym
+            print_caller << option[1..].to_sym
           end
         end
 

data/lib/facter/util/facts/facts_utils.rb

@@ -25,7 +25,7 @@ module Facter
           os
         end
 
-        def release_hash_from_string(output)
+        def release_hash_from_string(output, include_patch: false)
           return unless output
 
           versions = output.split('.')
@@ -33,6 +33,7 @@ module Facter
             release['full'] = output
             release['major'] = versions[0]
             release['minor'] = versions[1] if versions[1]
+            release['patch'] = versions[2] if versions[2] && include_patch
           end
         end
 

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

@@ -7,11 +7,10 @@ module Facter
         module VirtualDetector
           class << self
             def platform
-              @@fact_value ||= check_docker_lxc || check_freebsd || check_gce || retrieve_from_virt_what
-              @@fact_value ||= check_vmware || check_open_vz || check_vserver || check_xen || check_other_facts
-              @@fact_value ||= check_lspci || 'physical'
-
-              @@fact_value
+              @fact_value ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+                check_docker_lxc || check_freebsd || 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
 
             private
@@ -25,6 +24,10 @@ module Facter
               'gce' if bios_vendor&.include?('Google')
             end
 
+            def check_illumos_lx
+              'illumos-lx' if Facter::Resolvers::Uname.resolve(:kernelversion) == 'BrandZ virtual linux'
+            end
+
             def check_vmware
               Facter::Resolvers::Vmware.resolve(:vm)
             end

data/lib/facter/util/facts/unit_converter.rb

@@ -19,12 +19,12 @@ module Facter
 
             validated_speed, metric_prefix = determine_metric_prefix(speed)
 
-            format('%<displayed_speed>.2f', displayed_speed: validated_speed.round(2)).to_s + ' ' + metric_prefix + 'Hz'
+            "#{format('%<displayed_speed>.2f', displayed_speed: validated_speed.round(2))} #{metric_prefix}Hz"
           end
 
           def bytes_to_human_readable(bytes)
             return unless bytes
-            return bytes.to_s + ' bytes' if bytes < 1024
+            return "#{bytes} bytes" if bytes < 1024
 
             number, multiple = determine_exponent(bytes)
 

data/lib/facter/util/file_helper.rb

@@ -27,8 +27,7 @@ module Facter
         # method, we can't remove it entirely until the next major Facter
         # release (presumably Facter 5).
         def dir_children(path)
-          children = Dir.children(path)
-          children
+          Dir.children(path)
         end
 
         private

data/lib/facter/util/macosx/system_profile_executor.rb

@@ -23,12 +23,12 @@ module Facter
           private
 
           def output_to_hash(output)
-            output.scan(/.*:[ ].*$/).map { |e| e.strip.match(/(.*?): (.*)/).captures }.to_h
+            output.scan(/.*: .*$/).map { |e| e.strip.match(/(.*?): (.*)/).captures }.to_h
           end
 
           def normalize_keys(system_profiler_hash)
-            system_profiler_hash.map do |k, v|
-              [k.downcase.tr(' ', '_').delete("\(\)").to_sym, v]
+            system_profiler_hash.transform_keys do |k|
+              k.downcase.tr(' ', '_').delete("\(\)").to_sym
             end.to_h
           end
         end

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

@@ -3,13 +3,7 @@
 module Facter
   module Util
     module Resolvers
-      class FingerPrint
-        attr_accessor :sha1, :sha256
-        def initialize(sha1, sha256)
-          @sha1 = sha1
-          @sha256 = sha256
-        end
-      end
+      FingerPrint = Struct.new(:sha1, :sha256)
     end
   end
 end

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

@@ -54,7 +54,8 @@ module Facter
                         'site'
                       elsif addrinfo.ipv6_loopback?
                         'host'
-                      else 'global'
+                      else
+                        'global'
                       end
             scope6.join
           end
@@ -102,7 +103,7 @@ module Facter
           def expand_interfaces(interfaces)
             interfaces.each_value do |values|
               expand_binding(values, values[:bindings]) if values[:bindings]
-              expand_binding(values, values[:bindings6], false) if values[:bindings6]
+              expand_binding(values, values[:bindings6], ipv4_type: false) if values[:bindings6]
             end
           end
 
@@ -112,7 +113,7 @@ module Facter
             end
           end
 
-          def expand_binding(values, bindings, ipv4_type = true)
+          def expand_binding(values, bindings, ipv4_type: true)
             binding = find_valid_binding(bindings)
             ip_protocol_type = ipv4_type ? '' : '6'
 

data/lib/facter/util/resolvers/networking/primary_interface.rb

@@ -57,6 +57,8 @@ module Facter
             end
 
             def find_in_interfaces(interfaces)
+              return if interfaces.nil?
+
               interfaces.each do |iface_name, interface|
                 interface[:bindings]&.each do |binding|
                   return iface_name unless Facter::Util::Resolvers::Networking.ignored_ip_address(binding[:address])

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

@@ -3,15 +3,7 @@
 module Facter
   module Util
     module Resolvers
-      class Ssh
-        attr_accessor :fingerprint, :type, :key, :name
-        def initialize(fingerprint, type, key, name)
-          @fingerprint = fingerprint
-          @type = type
-          @key = key
-          @name = name
-        end
-      end
+      Ssh = Struct.new(:fingerprint, :type, :key, :name)
     end
   end
 end

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

@@ -9,6 +9,7 @@ module Facter
       class SshHelper
         class << self
           SSH_NAME = { 'ssh-dss' => 'dsa', 'ecdsa-sha2-nistp256' => 'ecdsa',
+                       'ecdsa-sha2-nistp384' => 'ecdsa', 'ecdsa-sha2-nistp521' => 'ecdsa',
                        'ssh-ed25519' => 'ed25519', 'ssh-rsa' => 'rsa' }.freeze
           SSH_FINGERPRINT = { 'rsa' => 1, 'dsa' => 2, 'ecdsa' => 3, 'ed25519' => 4 }.freeze
 
@@ -16,6 +17,7 @@ module Facter
             key_name = SSH_NAME[key_type]
             return unless key_name
 
+            # decode64 ignores non-base64 characters including newlines
             decoded_key = Base64.decode64(key)
             ssh_fp = SSH_FINGERPRINT[key_name]
             sha1 = "SSHFP #{ssh_fp} 1 #{Digest::SHA1.new.update(decoded_key)}"

data/lib/facter/util/utils.rb

@@ -3,10 +3,10 @@
 module Facter
   module Utils
     # Sort nested hash.
-    def self.sort_hash_by_key(hash, recursive = true, &block)
+    def self.sort_hash_by_key(hash, recursive: true, &block)
       hash.keys.sort(&block).each_with_object(hash.class.new) do |key, seed|
         seed[key] = hash[key]
-        seed[key] = sort_hash_by_key(seed[key], true, &block) if recursive && seed[key].is_a?(Hash)
+        seed[key] = sort_hash_by_key(seed[key], recursive: true, &block) if recursive && seed[key].is_a?(Hash)
 
         seed
       end

data/lib/facter/version.rb

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

data/lib/facter.rb

@@ -653,6 +653,13 @@ module Facter
       nil
     end
 
+    # We don't respond to any missing methods
+    #
+    # @api private
+    def respond_to_missing?(_method, *)
+      false
+    end
+
     prepend ApiDebugger if ENV['API_DEBUG']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -64,42 +64,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: '1.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: '1.50'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.38'
+        version: '2.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.38'
+        version: '2.20'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -444,6 +444,7 @@ files:
 - lib/facter/facts/linux/dmi/product/name.rb
 - lib/facter/facts/linux/dmi/product/serial_number.rb
 - lib/facter/facts/linux/dmi/product/uuid.rb
+- lib/facter/facts/linux/dmi/product/version.rb
 - lib/facter/facts/linux/ec2_metadata.rb
 - lib/facter/facts/linux/ec2_userdata.rb
 - lib/facter/facts/linux/facterversion.rb
@@ -934,6 +935,7 @@ files:
 - lib/facter/resolvers/aix/partitions.rb
 - lib/facter/resolvers/aix/processors.rb
 - lib/facter/resolvers/aix/serialnumber.rb
+- lib/facter/resolvers/amzn/os_release_rpm.rb
 - lib/facter/resolvers/augeas.rb
 - lib/facter/resolvers/az.rb
 - lib/facter/resolvers/base_resolver.rb
@@ -1091,7 +1093,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'