facter 4.7.1 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 512cdd220f22069dbf686592dfc08d3b4ecccf97702313117b333d5e568ebe8e
-  data.tar.gz: 373406fac7fe5ec363b13e6afa26acabfb6bb62716d9f0b977b1f2e768e6381d
+  metadata.gz: 97c091ad872480f9a35f8c56682e89b65cd221d2b7da74b6bab229e37e27dda0
+  data.tar.gz: c55e4ec6c3e39148ca2c8ce0819eecc4dcf33eddd1ece53442d293eddb405955
 SHA512:
-  metadata.gz: ed2f2ac6dcec58364ba37df4acee50fb44f90f46f6de28f8f2524aa89d8d5634e7499be547234e65e4930126e59652b0d6b56f2d602e74598227d7808c504bf7
-  data.tar.gz: ef408018f71cd5884a56cf0dc3aab243fe119978e45c99e4b8069242d4ecf27011a3c106b53f12960665729bc0209aee452a02138e6642749f2c2b51e46a67bc
+  metadata.gz: 8d87380c0d913de5c09f664a5b9a7a35a26434ff806b5788c4712b70cfa6bb85e9fa6670e9bd05dbd275a6f87cd20001d620596e97f732b351d05afe9c5a47d7
+  data.tar.gz: 5900798a818340f42464fff9eec375d2810157f1b73a143fb0191c342149f92634344a4077589af2c19597d3c984aff673bfcb611b14f59a6438c1f2f27eb232

data/lib/facter/config.rb

@@ -26,6 +26,8 @@ module Facter
                 Meego
                 Oel
                 Ovs
+                Mariner
+                Azurelinux
               ]
             },
             {
@@ -34,13 +36,13 @@ module Facter
                 Sled
               ]
             },
+            'Archlinux',
             'Gentoo',
             'Alpine',
             'Photon',
             'Slackware',
             'Mageia',
-            'Openwrt',
-            'Mariner'
+            'Openwrt'
           ]
         },
         {

data/lib/facter/facts/archlinux/os/release.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Archlinux
+    module Os
+      class Release
+        FACT_NAME = 'os.release'
+
+        def call_the_resolver
+          # Arch Linux is rolling release and has no version numbers
+          # For historical reasons facter used the kernel version as OS version on Arch Linux
+          kernelrelease = Facter::Resolvers::Uname.resolve(:kernelrelease)
+          versions = kernelrelease.split('.')
+          hash = { full: kernelrelease, major: versions[0], minor: versions[1] }
+
+          Facter::ResolvedFact.new(FACT_NAME, hash)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/azurelinux/os/release.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Facts
+  module Azurelinux
+    module Os
+      class Release
+        FACT_NAME = 'os.release'
+        ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
+
+        def call_the_resolver
+          version = from_specific_file || from_os_release
+
+          return Facter::ResolvedFact.new(FACT_NAME, nil) unless version
+
+          [Facter::ResolvedFact.new(FACT_NAME, version),
+           Facter::ResolvedFact.new(ALIASES.first, version['major'], :legacy),
+           Facter::ResolvedFact.new(ALIASES.last, version['full'], :legacy)]
+        end
+
+        def from_specific_file
+          version = Facter::Resolvers::SpecificReleaseFile.resolve(:release,
+                                                                   { release_file: '/etc/azurelinux-release',
+                                                                     regex: /AZURELINUX_BUILD_NUMBER=([0-9.]+)/ })
+          Facter::Util::Facts.release_hash_from_matchdata(version)
+        end
+
+        def from_os_release
+          version = Facter::Resolvers::OsRelease.resolve(:version_id)
+
+          Facter::Util::Facts.release_hash_from_string(version)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Processors
+      class Extensions
+        FACT_NAME = 'processors.extensions'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Linux::Processors.resolve(:extensions)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

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

@@ -246,6 +246,12 @@ os_hierarchy.each do |os|
 
     require_relative '../../resolvers/amzn/os_release_rpm'
 
+  when 'archlinux'
+    require_relative '../../facts/archlinux/os/release'
+
+  when 'azurelinux'
+    require_relative '../../facts/azurelinux/os/release'
+
   when 'bsd'
     require_relative '../../facts/bsd/kernelmajversion'
     require_relative '../../facts/bsd/kernelversion'
@@ -372,6 +378,7 @@ os_hierarchy.each do |os|
   when 'linux'
     require_relative '../../util/linux/dhcp'
     require_relative '../../util/linux/if_inet6'
+    require_relative '../../util/linux/proc'
     require_relative '../../util/linux/routing_table'
     require_relative '../../util/linux/socket_parser'
 
@@ -482,6 +489,7 @@ os_hierarchy.each do |os|
     require_relative '../../facts/linux/processor'
     require_relative '../../facts/linux/processors/cores'
     require_relative '../../facts/linux/processors/count'
+    require_relative '../../facts/linux/processors/extensions'
     require_relative '../../facts/linux/processors/isa'
     require_relative '../../facts/linux/processors/models'
     require_relative '../../facts/linux/processors/physicalcount'

data/lib/facter/framework/detector/os_detector.rb

@@ -68,6 +68,7 @@ class OsDetector
 
   def detect_based_on_release_file
     @identifier = :devuan if File.readable?('/etc/devuan_version')
+    @identifier = :archlinux if File.readable?('/etc/arch-release')
   end
 
   def detect_distro

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

@@ -31,9 +31,14 @@ module Facter
           def add_mount_points_fact(line)
             elem = line.split("\s")
 
-            elem.shift unless line[0] == ' '
+            if line[0] != ' '
+              server = elem.shift
+              device = "#{server}:#{elem[0]}"
+            else
+              device = elem[0]
+            end
 
-            @fact_list[:mountpoints][elem[1]] = { device: elem[0], filesystem: elem[2],
+            @fact_list[:mountpoints][elem[1]] = { device: device, filesystem: elem[2],
                                                   options: elem.last.include?(':') ? [] : elem.last.split(',') }
           end
 

data/lib/facter/resolvers/containers.rb

@@ -14,45 +14,65 @@ module Facter
         private
 
         def post_resolve(fact_name, _options)
-          @fact_list.fetch(fact_name) { read_cgroup(fact_name) }
+          @fact_list.fetch(fact_name) do
+            read_environ(fact_name) || read_cgroup(fact_name)
+          end
         end
 
         def read_cgroup(fact_name)
           output_cgroup = Facter::Util::FileHelper.safe_read('/proc/1/cgroup', nil)
-          output_environ = Facter::Util::FileHelper.safe_read('/proc/1/environ', nil)
-          return unless output_cgroup && output_environ
+          return unless output_cgroup
 
           output_docker = %r{docker/(.+)}.match(output_cgroup)
           output_lxc = %r{^/lxc/([^/]+)}.match(output_cgroup)
-          lxc_from_environ = /container=lxc/ =~ output_environ
 
-          info, vm = extract_vm_and_info(output_docker, output_lxc, lxc_from_environ)
-          info, vm = extract_for_nspawn(output_environ) unless vm
+          info, vm = extract_vm_and_info(output_docker, output_lxc)
+          @fact_list[:vm] = vm
+          @fact_list[:hypervisor] = { vm.to_sym => info } if vm
+          @fact_list[fact_name]
+        end
+
+        def read_environ(fact_name)
+          begin
+            container = Facter::Util::Linux::Proc.getenv_for_pid(1, 'container')
+          rescue StandardError => e
+            log.warn("Unable to getenv for pid 1, '#{e}'")
+            return nil
+          end
+          return if container.nil? || container.empty?
+
+          info = {}
+          case container
+          when 'lxc'
+            vm = 'lxc'
+          when 'podman'
+            vm = 'podman'
+          when 'crio'
+            vm = 'crio'
+          when 'systemd-nspawn'
+            vm = 'systemd_nspawn'
+            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}'")
+          end
           @fact_list[:vm] = vm
           @fact_list[:hypervisor] = { vm.to_sym => info } if vm
           @fact_list[fact_name]
         end
 
-        def extract_vm_and_info(output_docker, output_lxc, lxc_from_environ)
+        def extract_vm_and_info(output_docker, output_lxc)
           vm = nil
           if output_docker
             vm = 'docker'
             info = output_docker[1]
+          elsif output_lxc
+            vm = 'lxc'
+            info = output_lxc[1]
           end
-          vm = 'lxc' if output_lxc || lxc_from_environ
-          info = output_lxc[1] if output_lxc
 
           [info ? { INFO[vm] => info } : {}, vm]
         end
-
-        def extract_for_nspawn(output_environ)
-          nspawn = /container=systemd-nspawn/ =~ output_environ
-          if nspawn
-            vm = 'systemd_nspawn'
-            info = Facter::Util::FileHelper.safe_read('/etc/machine-id', nil)
-          end
-          [info ? { 'id' => info.strip } : {}, vm]
-        end
       end
     end
   end

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, false))
+          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/os_release.rb

@@ -96,6 +96,8 @@ module Facter
           @fact_list[:name] = if os_name.downcase.start_with?('red', 'oracle', 'arch', 'manjaro')
                                 os_name = os_name.split(' ')[0..1].join
                                 os_name
+                              elsif os_name.downcase.end_with?('azure linux')
+                                os_name.split(' ')[1..2].join
                               elsif os_name.downcase.end_with?('mariner')
                                 os_name.split(' ')[-1].strip
                               else

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/resolvers/processors.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module Facter
   module Resolvers
     module Linux
@@ -10,6 +12,7 @@ module Facter
 
         class << self
           # :count
+          # :extensions
           # :models
           # :physical_count
           # :speed
@@ -32,6 +35,7 @@ module Facter
           end
 
           def read_processors(cpuinfo_output)
+            @fact_list[:extensions] = Set[Facter::Resolvers::Uname.resolve(:processor)]
             @fact_list[:processors] = 0
             @fact_list[:models] = []
             @fact_list[:physical_processors] = []
@@ -41,7 +45,10 @@ module Facter
               construct_models_list(tokens)
               count_physical_processors(tokens)
               build_speed(tokens)
+              check_extensions(tokens)
             end
+            @fact_list[:extensions] = @fact_list[:extensions].to_a
+            @fact_list[:extensions].sort!
           end
 
           def count_processors(tokens)
@@ -82,6 +89,21 @@ module Facter
             speed = tokens.last.strip.match(/^(\d+).*/)[1]
             @fact_list[:speed] = speed.to_i * MHZ_TO_HZ
           end
+
+          def check_extensions(tokens)
+            return unless tokens.first.strip == 'flags'
+
+            flags = tokens.last.split(' ')
+
+            # TODO: As we gain support for other arches, change the guard
+            # so we only check the flags for the corosponding arches
+            return unless @fact_list[:extensions].include?('x86_64')
+
+            @fact_list[:extensions].add('x86_64-v1') if (%w[cmov cx8 fpu fxsr lm mmx syscall sse2] - flags).empty?
+            @fact_list[:extensions].add('x86_64-v2') if (%w[cx16 lahf_lm popcnt sse4_1 sse4_2 ssse3] - flags).empty?
+            @fact_list[:extensions].add('x86_64-v3') if (%w[abm avx avx2 bmi1 bmi2 f16c fma movbe xsave] - flags).empty?
+            @fact_list[:extensions].add('x86_64-v4') if (%w[avx512f avx512bw avx512cd avx512dq avx512vl] - flags).empty?
+          end
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Facter
 
       PHYSICAL_HYPERVISORS = %w[physical xen0 vmware_server vmware_workstation openvzhn vserver_host].freeze
       REDHAT_FAMILY = %w[redhat rhel fedora centos scientific ascendos cloudlinux psbm
-                         oraclelinux ovs oel amazon xenserver xcp-ng virtuozzo photon mariner].freeze
+                         oraclelinux ovs oel amazon xenserver xcp-ng virtuozzo photon mariner azurelinux].freeze
       DEBIAN_FAMILY = %w[debian ubuntu huaweios linuxmint devuan kde].freeze
       SUSE_FAMILY = %w[sles sled suse].freeze
       GENTOO_FAMILY = ['gentoo'].freeze

data/lib/facter/util/file_helper.rb

@@ -15,12 +15,14 @@ module Facter
           default_return
         end
 
-        def safe_readlines(path, default_return = [])
-          return File.readlines(path, encoding: Encoding::UTF_8) if File.readable?(path)
+        # rubocop:disable Style/SpecialGlobalVars
+        def safe_readlines(path, default_return = [], sep = $/, chomp: false)
+          return File.readlines(path, sep, chomp: chomp, encoding: Encoding::UTF_8) if File.readable?(path)
 
           log_failed_to_read(path)
           default_return
         end
+        # rubocop:enable Style/SpecialGlobalVars
 
         # This previously acted as a helper method for versions of Ruby older
         # than 2.5, before Dir.children was added. As it isn't a private

data/lib/facter/util/linux/proc.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facter
+  module Util
+    module Linux
+      class Proc
+        class << self
+          def getenv_for_pid(pid, field)
+            path = "/proc/#{pid}/environ"
+            lines = Facter::Util::FileHelper.safe_readlines(path, [], "\0", chomp: true)
+            lines.each do |line|
+              key, value = line.split('=', 2)
+              return value if key == field
+            end
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.9.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -346,6 +346,8 @@ files:
 - lib/facter/facts/amzn/os/distro/id.rb
 - lib/facter/facts/amzn/os/distro/release.rb
 - lib/facter/facts/amzn/os/release.rb
+- lib/facter/facts/archlinux/os/release.rb
+- lib/facter/facts/azurelinux/os/release.rb
 - lib/facter/facts/bsd/kernelmajversion.rb
 - lib/facter/facts/bsd/kernelversion.rb
 - lib/facter/facts/bsd/load_averages.rb
@@ -556,6 +558,7 @@ files:
 - lib/facter/facts/linux/processor.rb
 - lib/facter/facts/linux/processors/cores.rb
 - lib/facter/facts/linux/processors/count.rb
+- lib/facter/facts/linux/processors/extensions.rb
 - lib/facter/facts/linux/processors/isa.rb
 - lib/facter/facts/linux/processors/models.rb
 - lib/facter/facts/linux/processors/physicalcount.rb
@@ -1149,6 +1152,7 @@ files:
 - lib/facter/util/file_helper.rb
 - lib/facter/util/linux/dhcp.rb
 - lib/facter/util/linux/if_inet6.rb
+- lib/facter/util/linux/proc.rb
 - lib/facter/util/linux/routing_table.rb
 - lib/facter/util/linux/socket_parser.rb
 - lib/facter/util/macosx/system_profile_executor.rb