facter 4.8.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1b586ac7fd5ca2a0dbba3e314510199c246eeafcf3238d4450429c07662e2ac
-  data.tar.gz: a3dbb666fd7d0168042df86ba3f85bd5d487a85ed348bf71fc3e0ec2f397a347
+  metadata.gz: 6aeed6f3058d490dd1b3e734c8d8de31efd16a275324e019e619a6084d465722
+  data.tar.gz: 224c4d60e9a71cbce735ee6de290949c73d949580e6e68ae16977b12fbc25517
 SHA512:
-  metadata.gz: 2580f1bb8294a6de8e89402244448362f1657d31db3d9d4d2dba551e103848a5285983fd9f57693d4afc2ea6fd6678d97889490e82c8542d125bddb917fd7c58
-  data.tar.gz: 8c26e42de115a8b5f3bef1b045b8aff8c18b3f28ab1ca431ea7225f71a97114f7bfaddbc9b9d5ebed7c92225a045d225582cd0d667740ab6beabdcad2c1613da
+  metadata.gz: 3c47aaeaf6fafa8cefe84f8e32fd5837d0a138ca6561b96fa7016f633e7fbc9920c0e0986334dd012d5adc34a2fecd281529a997f51a6af5db25bcc7a12553e9
+  data.tar.gz: c8af80e38871c4e5261ad91ad858c66a665a2d48094a8c1fe941cfcb4df28b20490abdba6d221fd1b10caa7e3614f04101e87f5fe983c1c8ff40846b5c025ba5

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

@@ -25,8 +25,8 @@ module Facter
             # set the new (temporary) value for the environment variable
             ENV[var] = value
           end
-          # execute the caller's block, capture the return value
-          rv = yield
+          # execute the caller's block, returning its value
+          yield
         # use an ensure block to make absolutely sure we restore the variables
         ensure
           # restore the old values
@@ -38,8 +38,6 @@ module Facter
               ENV.delete(var)
             end
           end
-          # return the captured return value
-          rv
         end
 
         def execute(command, options = {})

data/lib/facter/resolvers/containers.rb

@@ -43,7 +43,7 @@ module Facter
 
           info = {}
           case container
-          when 'lxcroot'
+          when 'lxc'
             vm = 'lxc'
           when 'podman'
             vm = 'podman'
@@ -54,7 +54,7 @@ module Facter
             info = { 'id' => Facter::Util::FileHelper.safe_read('/etc/machine-id', nil).strip }
           else
             vm = 'container_other'
-            log.warn("Container runtime, '#{container}', is unsupported, setting to, '#{vm}'")
+            log.warn("Container runtime, '#{container}', is unsupported, setting to '#{vm}'")
           end
           @fact_list[:vm] = vm
           @fact_list[:hypervisor] = { vm.to_sym => info } if vm

data/lib/facter/resolvers/hostname.rb

@@ -68,9 +68,9 @@ module Facter
 
         def read_domain
           file_content = Facter::Util::FileHelper.safe_read('/etc/resolv.conf')
-          if file_content =~ /^domain\s+(\S+)/
+          if file_content =~ /^domain\s+([^.]\S+)/
             Regexp.last_match(1)
-          elsif file_content =~ /^search\s+(\S+)/
+          elsif file_content =~ /^search\s+([^.]\S+)/
             Regexp.last_match(1)
           end
         end

data/lib/facter/resolvers/linux/hostname.rb

@@ -96,9 +96,9 @@ module Facter
 
           def read_domain
             file_content = Facter::Util::FileHelper.safe_read('/etc/resolv.conf')
-            if file_content =~ /^domain\s+(\S+)/
+            if file_content =~ /^domain\s+([^.]\S+)/
               Regexp.last_match(1)
-            elsif file_content =~ /^search\s+(\S+)/
+            elsif file_content =~ /^search\s+([^.]\S+)/
               Regexp.last_match(1)
             end
           end

data/lib/facter/resolvers/partitions.rb

@@ -69,13 +69,14 @@ module Facter
                         size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes),
                         backing_file: backing_file }
           info_hash.merge!(populate_from_syscalls(partition_name, blkid_and_lsblk))
-          @fact_list[:partitions][partition_name] = info_hash.reject { |_key, value| value.nil? }
+          @fact_list[:partitions][partition_name] = info_hash.compact
         end
 
         def populate_from_syscalls(partition_name, blkid_and_lsblk)
-          part_info = populate_from_blkid(partition_name, blkid_and_lsblk)
+          # Prefer lsblk over blkid since lsblk does not require root, returns more information, and is recommended by blkid
+          part_info = populate_from_lsblk(partition_name, blkid_and_lsblk)
 
-          return populate_from_lsblk(partition_name, blkid_and_lsblk) if part_info.empty?
+          return populate_from_blkid(partition_name, blkid_and_lsblk) if part_info.empty?
 
           part_info
         end
@@ -121,26 +122,47 @@ module Facter
         def populate_from_lsblk(partition_name, blkid_and_lsblk)
           return {} unless available?('lsblk', blkid_and_lsblk)
 
-          blkid_and_lsblk[:lsblk] ||= Facter::Core::Execution.execute('lsblk -fp', logger: log)
+          lsblk_version_raw = Facter::Core::Execution.execute('lsblk --version 2>&1', logger: log)
+          # Return if the version of lsblk is too old (< 2.22) to support the --version flag
+          lsblk_version_raw.match?(/ \d\.\d+/) ? lsblk_version = lsblk_version_raw.match(/ \d\.\d+/)[0].to_f : (return {})
 
-          part_info = blkid_and_lsblk[:lsblk].match(/#{partition_name}.*/).to_s.split(' ')
-          return {} if part_info.empty?
+          # The -p/--paths option was added in lsblk 2.23, return early and fall back to blkid with earlier versions
+          return {} if lsblk_version < 2.23
 
-          parse_part_info(part_info)
-        end
+          blkid_and_lsblk[:lsblk] ||= execute_and_extract_lsblk_info(lsblk_version)
 
-        def parse_part_info(part_info)
-          result = { filesystem: part_info[1] }
+          partition_data = blkid_and_lsblk[:lsblk][partition_name]
+          return {} unless partition_data
 
-          if part_info.count.eql?(5)
-            result[:label] = part_info[2]
-            result[:uuid] = part_info[3]
-          else
-            result[:uuid] = part_info[2]
-          end
+          filesys = partition_data['FSTYPE']
+          uuid = partition_data['UUID']
+          label = partition_data['LABEL']
+          part_uuid = partition_data['PARTUUID']
+          part_label = partition_data['PARTLABEL']
+          part_type = partition_data['PARTTYPE']
+
+          result = { filesystem: filesys, uuid: uuid, label: label, partuuid: part_uuid, partlabel: part_label }
+          result[:parttype] = part_type if part_type
 
           result
         end
+
+        def execute_and_extract_lsblk_info(lsblk_version)
+          # lsblk 2.25 added support for GPT partition type GUIDs
+          stdout = if lsblk_version >= 2.25
+                     Facter::Core::Execution.execute('lsblk -p -P -o NAME,FSTYPE,UUID,LABEL,PARTUUID,PARTLABEL,PARTTYPE', logger: log)
+                   else
+                     Facter::Core::Execution.execute('lsblk -p -P -o NAME,FSTYPE,LABEL,UUID,PARTUUID,PARTLABEL', logger: log)
+                   end
+
+          output_hash = Hash[*stdout.split(/^(NAME=\S+)/)[1..-1]]
+          output_hash.transform_keys! { |key| key.delete('NAME=')[1..-2] }
+          output_hash.each do |key, value|
+            output_hash[key] = Hash[*value.chomp.rstrip.split(/ ([^= ]+)=/)[1..-1].each { |x| x.delete!('"') }]
+          end
+          output_hash.each_value { |value_hash| value_hash.delete_if { |_k, v| v.empty? } }
+          output_hash.delete_if { |_k, v| v.empty? }
+        end
       end
     end
   end

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-19 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -1193,7 +1193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.19
 signing_key: 
 specification_version: 4
 summary: Facter, a system inventory tool