facter 4.0.38 → 4.0.43

data/lib/facter/patches/sysfilesystem/sys/statvfs.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'sys/filesystem'
+
+module Sys
+  class Filesystem
+    module Structs
+      class Statvfs < FFI::Struct
+        # We must remove the instance variable layout defined by sys-filesystem, because setting
+        # it the second time will make FFI log a warning message.
+        remove_instance_variable(:@layout) if @layout
+
+        if RbConfig::CONFIG['host_os'] =~ /darwin|osx|mach/i
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint,
+            :f_bfree, :uint,
+            :f_bavail, :uint,
+            :f_files, :uint,
+            :f_ffree, :uint,
+            :f_favail, :uint,
+            :f_fsid, :ulong,
+            :f_flag, :ulong,
+            :f_namemax, :ulong
+          )
+        elsif RbConfig::CONFIG['host'] =~ /bsd/i
+          layout(
+            :f_bavail, :uint64,
+            :f_bfree, :uint64,
+            :f_blocks, :uint64,
+            :f_favail, :uint64,
+            :f_ffree, :uint64,
+            :f_files, :uint64,
+            :f_bsize, :ulong,
+            :f_flag, :ulong,
+            :f_frsize, :ulong,
+            :f_fsid, :ulong,
+            :f_namemax, :ulong
+          )
+        elsif RbConfig::CONFIG['host'] =~ /sunos|solaris/i
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint64_t,
+            :f_bfree, :uint64_t,
+            :f_bavail, :uint64_t,
+            :f_files, :uint64_t,
+            :f_ffree, :uint64_t,
+            :f_favail, :uint64_t,
+            :f_fsid, :ulong,
+            :f_basetype, [:char, 16],
+            :f_flag, :ulong,
+            :f_namemax, :ulong,
+            :f_fstr, [:char, 32],
+            :f_filler, [:ulong, 16]
+          )
+        elsif RbConfig::CONFIG['host'] =~ /i686/i
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint,
+            :f_bfree, :uint,
+            :f_bavail, :uint,
+            :f_files, :uint,
+            :f_ffree, :uint,
+            :f_favail, :uint,
+            :f_fsid, :ulong,
+            :f_flag, :ulong,
+            :f_namemax, :ulong,
+            :f_spare, [:int, 6]
+          )
+        else
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint64,
+            :f_bfree, :uint64,
+            :f_bavail, :uint64,
+            :f_files, :uint64,
+            :f_ffree, :uint64,
+            :f_favail, :uint64,
+            :f_fsid, :ulong,
+            :f_flag, :ulong,
+            :f_namemax, :ulong,
+            :f_spare, [:int, 6]
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class OsLevel < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_oslevel(fact_name) }
+          end
+
+          def read_oslevel(fact_name)
+            output = Facter::Core::Execution.execute('/usr/bin/oslevel -s', logger: log)
+            @fact_list[:build] = output unless output.empty?
+            @fact_list[:kernel] = 'AIX'
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/cloud.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Cloud < BaseResolver
+      # cloud_provider
+
+      @fact_list ||= {}
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { detect_azure(fact_name) }
+        end
+
+        def detect_azure(fact_name)
+          search_dirs = %w[/var/lib/dhcp /var/lib/NetworkManager]
+          search_dirs.each do |path|
+            next if !File.readable?(path) || !File.directory?(path)
+
+            files = Dir.entries(path)
+            files.select! { |filename| filename =~ /^dhclient.*lease.*$/ }
+            files.each do |file|
+              path = File.join([path, file])
+              output = Util::FileHelper.safe_read(path)
+
+              if output.include?('option unknown-245') || output.include?('option 245')
+                @fact_list[:cloud_provider] = 'azure'
+                return @fact_list[fact_name]
+              end
+            end
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/dmi_decode.rb

@@ -37,6 +37,7 @@ module Facter
           @fact_list[:virtualbox_version] = output.match(/vboxVer_(\S+)/)&.captures&.first
           @fact_list[:virtualbox_revision] = output.match(/vboxRev_(\S+)/)&.captures&.first
           @fact_list[:vmware_version] = extract_vmware_version(output)
+          @fact_list[:vendor] = output.match(/Vendor: (\S+)/)&.captures&.first
 
           @fact_list[fact_name]
         end

data/lib/facter/resolvers/dmi_resolver.rb

@@ -36,9 +36,9 @@ module Facter
 
             file_content = Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)
             if files.include?(fact_name.to_s) && file_content
-              @fact_list[fact_name] = file_content.strip
+              file_content = file_content.strip
+              @fact_list[fact_name] = file_content unless file_content.empty?
               chassis_to_name(@fact_list[fact_name]) if fact_name == :chassis_type
-
             end
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/memory_resolver.rb

@@ -25,11 +25,21 @@ module Facter
 
           def read_system(output)
             @fact_list[:total] = kilobytes_to_bytes(output.match(/MemTotal:\s+(\d+)\s/)[1])
-            @fact_list[:memfree] = kilobytes_to_bytes(output.match(/MemFree:\s+(\d+)\s/)[1])
-            @fact_list[:used_bytes] = compute_used(@fact_list[:total], reclaimable_memory(output))
+            @fact_list[:memfree] = memfree(output)
+            @fact_list[:used_bytes] = compute_used(@fact_list[:total], @fact_list[:memfree])
             @fact_list[:capacity] = compute_capacity(@fact_list[:used_bytes], @fact_list[:total])
           end
 
+          def memfree(output)
+            available = output.match(/MemAvailable:\s+(\d+)\s/)
+            return kilobytes_to_bytes(available[1]) if available
+
+            buffers = kilobytes_to_bytes(output.match(/Buffers:\s+(\d+)\s/)[1])
+            cached = kilobytes_to_bytes(output.match(/Cached:\s+(\d+)\s/)[1])
+            memfree = kilobytes_to_bytes(output.match(/MemFree:\s+(\d+)\s/)[1])
+            memfree + buffers + cached
+          end
+
           def read_swap(output)
             total = output.match(/SwapTotal:\s+(\d+)\s/)[1]
             return if total.to_i.zero?
@@ -44,18 +54,6 @@ module Facter
             quantity.to_i * 1024
           end
 
-          def reclaimable_memory(output)
-            buffers = kilobytes_to_bytes(output.match(/Buffers:\s+(\d+)\s/)[1])
-            cached = kilobytes_to_bytes(output.match(/Cached:\s+(\d+)\s/)[1])
-            s_reclaimable = output.match(/SReclaimable:\s+(\d+)\s/)
-            s_reclaimable = if s_reclaimable
-                              kilobytes_to_bytes(s_reclaimable[1])
-                            else
-                              0
-                            end
-            @fact_list[:memfree] + buffers + cached + s_reclaimable
-          end
-
           def compute_capacity(used, total)
             format('%<computed_capacity>.2f', computed_capacity: (used / total.to_f * 100)) + '%'
           end

data/lib/facter/resolvers/mountpoints_resolver.rb

@@ -10,7 +10,7 @@ module Facter
         private
 
         def post_resolve(fact_name)
-          @fact_list.fetch(fact_name) { read_mounts }
+          @fact_list.fetch(fact_name) { read_mounts(fact_name) }
         end
 
         def root_device
@@ -26,7 +26,8 @@ module Facter
           device
         end
 
-        def read_mounts # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        def read_mounts(fact_name)
           mounts = []
           FilesystemHelper.read_mountpoints.each do |fs|
             device = compute_device(fs.name)
@@ -52,7 +53,9 @@ module Facter
               .map { |v| binding.local_variable_get(v) })]
           end
           @fact_list[:mountpoints] = mounts
+          @fact_list[fact_name]
         end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
       end
     end
   end

data/lib/facter/resolvers/networking_linux_resolver.rb

@@ -10,7 +10,6 @@ module Facter
         private
 
         def post_resolve(fact_name)
-          log.debug('in networking_linux_resolver')
           @fact_list.fetch(fact_name) { retrieve_network_info(fact_name) }
 
           @fact_list[fact_name]
@@ -60,9 +59,14 @@ module Facter
           return if !network_info[interface_name] || network_info[interface_name][:dhcp]
 
           index = tokens[0].delete(':')
-          dhcp = Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
-          network_info[interface_name][:dhcp] = dhcp.match(/SERVER_ADDRESS=(.*)/)[1] if dhcp
-          network_info[interface_name][:dhcp] ||= retrieve_from_other_directories(interface_name)
+          file_content = Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
+          dhcp = file_content.match(/SERVER_ADDRESS=(.*)/) if file_content
+          if dhcp
+            network_info[interface_name][:dhcp] = dhcp[1]
+          else
+            alternate_dhcp = retrieve_from_other_directories(interface_name)
+            network_info[interface_name][:dhcp] = alternate_dhcp if alternate_dhcp
+          end
         end
 
         def retrieve_from_other_directories(interface_name)
@@ -76,7 +80,8 @@ module Facter
               content = Util::FileHelper.safe_read("#{dir}#{file}", nil)
               next unless content =~ /interface.*#{interface_name}/
 
-              return content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)[1]
+              dhcp = content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)
+              return dhcp[1] if dhcp
             end
           end
           return unless File.readable?('/var/lib/NetworkManager/')

data/lib/facter/resolvers/processors_resolver.rb

@@ -60,7 +60,11 @@ module Facter
           def physical_devices_count
             Dir.entries('/sys/devices/system/cpu')
                .select { |dir| dir =~ /cpu[0-9]+$/ }
-               .count { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .map do |dir|
+              Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+            end
+               .uniq.count
           end
 
           def build_speed(tokens)

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class Mountpoints < BaseResolver
+        include Facter::FilesystemHelper
+        @fact_list ||= {}
+        @log = Facter::Log.new(self)
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_mounts(fact_name) }
+          end
+
+          def root_device
+            cmdline = Util::FileHelper.safe_read('/proc/cmdline')
+            match = cmdline.match(/root=([^\s]+)/)
+            match&.captures&.first
+          end
+
+          def compute_device(device)
+            # If the "root" device, lookup the actual device from the kernel options
+            # This is done because not all systems symlink /dev/root
+            device = root_device if device == '/dev/root'
+            device
+          end
+
+          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize
+            mounts = []
+            FilesystemHelper.read_mountpoints.each do |fs|
+              device = compute_device(fs.name)
+              filesystem = fs.mount_type
+              path = fs.mount_point
+              options = fs.options.split(',').map(&:strip)
+
+              stats = FilesystemHelper.read_mountpoint_stats(path)
+              size_bytes = stats.bytes_total.abs
+              available_bytes = stats.bytes_available.abs
+
+              used_bytes = stats.bytes_used.abs
+              total_bytes = used_bytes + available_bytes
+              capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
+
+              size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+              available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
+              used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
+
+              mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
+                .map { |v| binding.local_variable_get(v) })]
+            end
+            @fact_list[:mountpoints] = mounts
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -66,7 +66,7 @@ module Facter
 
             @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
 
-            @interfaces[lifreq.name][:mtu] = lifreq[:lifr_lifru][:lifru_metric]
+            @interfaces[lifreq.name][:mtu] ||= lifreq[:lifr_lifru][:lifru_metric]
           end
 
           def load_netmask(lifreq)

data/lib/facter/resolvers/utils/filesystem_helper.rb

@@ -7,7 +7,9 @@ module Facter
                     size_bytes used used_bytes capacity].freeze
     class << self
       def read_mountpoints
-        require 'sys/filesystem'
+        # TODO: this require must be replaced with "require 'sys/filesystem'" when a new release of
+        # djberg96/sys-filesystem gem is available
+        require_relative '../../patches/sysfilesystem/sys/statvfs.rb'
         force_utf(Sys::Filesystem.mounts)
       end
 

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.38
+  version: 4.0.43
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -385,6 +385,7 @@ files:
 - lib/facter/facts/freebsd/zpool_version.rb
 - lib/facter/facts/linux/aio_agent_version.rb
 - lib/facter/facts/linux/augeas/version.rb
+- lib/facter/facts/linux/cloud.rb
 - lib/facter/facts/linux/dhcp_servers.rb
 - lib/facter/facts/linux/disks.rb
 - lib/facter/facts/linux/dmi/bios/release_date.rb
@@ -813,6 +814,7 @@ files:
 - lib/facter/facts_utils/facts_utils.rb
 - lib/facter/facts_utils/unit_converter.rb
 - lib/facter/facts_utils/uptime_parser.rb
+- lib/facter/facts_utils/virtual_detector.rb
 - lib/facter/facts_utils/windows_release_finder.rb
 - lib/facter/framework/benchmarking/timer.rb
 - lib/facter/framework/cli/cli.rb
@@ -853,6 +855,7 @@ files:
 - lib/facter/models/resolved_fact.rb
 - lib/facter/models/searched_fact.rb
 - lib/facter/os_hierarchy.json
+- lib/facter/patches/sysfilesystem/sys/statvfs.rb
 - lib/facter/resolvers/aio_agent_version.rb
 - lib/facter/resolvers/aix/architecture_resolver.rb
 - lib/facter/resolvers/aix/disks.rb
@@ -864,7 +867,7 @@ files:
 - lib/facter/resolvers/aix/mountpoints.rb
 - lib/facter/resolvers/aix/networking_resolver.rb
 - lib/facter/resolvers/aix/nim.rb
-- lib/facter/resolvers/aix/os_level_resolver.rb
+- lib/facter/resolvers/aix/os_level.rb
 - lib/facter/resolvers/aix/partitions.rb
 - lib/facter/resolvers/aix/processors.rb
 - lib/facter/resolvers/aix/serialnumber.rb
@@ -874,6 +877,7 @@ files:
 - lib/facter/resolvers/base_resolver.rb
 - lib/facter/resolvers/bsd/ffi/ffi_helper.rb
 - lib/facter/resolvers/bsd/processors.rb
+- lib/facter/resolvers/cloud.rb
 - lib/facter/resolvers/containers.rb
 - lib/facter/resolvers/debian_version.rb
 - lib/facter/resolvers/disk_resolver.rb
@@ -914,7 +918,6 @@ files:
 - lib/facter/resolvers/networking_linux_resolver.rb
 - lib/facter/resolvers/networking_resolver.rb
 - lib/facter/resolvers/open_vz.rb
-- lib/facter/resolvers/os_level_resolver.rb
 - lib/facter/resolvers/os_release_resolver.rb
 - lib/facter/resolvers/partitions.rb
 - lib/facter/resolvers/path_resolver.rb
@@ -933,6 +936,7 @@ files:
 - lib/facter/resolvers/solaris/ipaddress.rb
 - lib/facter/resolvers/solaris/ldom.rb
 - lib/facter/resolvers/solaris/memory.rb
+- lib/facter/resolvers/solaris/mountpoints.rb
 - lib/facter/resolvers/solaris/networking.rb
 - lib/facter/resolvers/solaris/os_release.rb
 - lib/facter/resolvers/solaris/processors.rb