facter 4.0.42 → 4.0.48

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class OsLevel < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Partitions < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
@@ -13,7 +14,7 @@ module Facter
           end
 
           def query_cudv(fact_name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('PdDvLn', 'logical_volume/lvsubclass/lvtype')
 
             result = odmquery.execute
@@ -39,13 +40,13 @@ module Facter
 
             return if stdout.empty?
 
-            info_hash =  InfoExtractor.extract(stdout, /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/)
+            info_hash =  Facter::Util::Aix::InfoExtractor.extract(stdout, /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/)
             size_bytes = compute_size(info_hash)
 
             part_info = {
               filesystem: info_hash['TYPE'],
               size_bytes: size_bytes,
-              size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+              size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes)
             }
             mount = info_hash['MOUNT POINT']
             label = info_hash['LABEL']
@@ -58,9 +59,9 @@ module Facter
             physical_partitions = info_hash['PPs'].to_i
             size_physical_partition = info_hash['PP SIZE']
             exp = if size_physical_partition[/mega/]
-                    InfoExtractor::MEGABYTES_EXPONENT
+                    Facter::Util::Aix::InfoExtractor::MEGABYTES_EXPONENT
                   else
-                    InfoExtractor::GIGABYTES_EXPONENT
+                    Facter::Util::Aix::InfoExtractor::GIGABYTES_EXPONENT
                   end
             size_physical_partition.to_i * physical_partitions * exp
           end

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Processors < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
@@ -16,7 +17,7 @@ module Facter
             @fact_list[:models] = []
             @fact_list[:logical_count] = 0
 
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('class', 'processor')
 
             result = odmquery.execute
@@ -31,7 +32,7 @@ module Facter
           end
 
           def populate_from_cudv(name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('PdDvLn', name)
 
             result = odmquery.execute
@@ -44,7 +45,7 @@ module Facter
           end
 
           def query_cuat(name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('name', name)
 
             result = odmquery.execute

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Serialnumber < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -14,7 +14,7 @@ module Facter
           end
 
           def read_serialnumber(fact_name)
-            odmquery = Facter::ODMQuery.new
+            odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery
               .equals('name', 'sys0')
               .equals('attribute', 'systemid')

data/lib/facter/resolvers/{augeas_resolver.rb → augeas.rb}

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Augeas < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -20,7 +20,13 @@ module Facter
         end
 
         def read_augeas_from_cli
-          output = Facter::Core::Execution.execute('augparse --version 2>&1', logger: log)
+          command = if File.readable?('/opt/puppetlabs/puppet/bin/augparse')
+                      '/opt/puppetlabs/puppet/bin/augparse'
+                    else
+                      'augparse'
+                    end
+
+          output = Facter::Core::Execution.execute("#{command} --version 2>&1", logger: log)
           Regexp.last_match(1) if output =~ /^augparse (\d+\.\d+\.\d+)/
         end
 

data/lib/facter/resolvers/base_resolver.rb

@@ -11,21 +11,31 @@ module Facter
         @fact_list = {}
       end
 
+      def self.init_resolver
+        @fact_list = {}
+        @semaphore = Mutex.new
+      end
+
       def self.subscribe_to_manager
         Facter::SessionCache.subscribe(self)
       end
 
       def self.resolve(fact_name)
-        subscribe_to_manager
-        post_resolve(fact_name)
+        @semaphore.synchronize do
+          subscribe_to_manager
+          post_resolve(fact_name)
 
-        validate_resolution(fact_name)
+          cache_nil_for_unresolved_facts(fact_name)
+        end
+      rescue NoMethodError => e
+        log.debug("Could not resolve #{fact_name}, got #{e}")
+        @fact_list[fact_name] = nil
       rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 
-      def self.validate_resolution(fact_name)
+      def self.cache_nil_for_unresolved_facts(fact_name)
         @fact_list.fetch(fact_name) { @fact_list[fact_name] = nil }
         @fact_list[fact_name]
       end

data/lib/facter/resolvers/bsd/processors.rb

@@ -4,8 +4,9 @@ module Facter
   module Resolvers
     module Bsd
       class Processors < BaseResolver
+        init_resolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
         class << self
           private
 
@@ -16,8 +17,12 @@ module Facter
           def collect_processors_info(fact_name)
             require 'facter/resolvers/bsd/ffi/ffi_helper'
 
-            @fact_list[:logical_count] = logical_count
-            @fact_list[:models] = Array.new(logical_count, model) if logical_count && model
+            count = logical_count
+            model = processor_model
+            speed = processor_speed
+
+            @fact_list[:logical_count] = count
+            @fact_list[:models] = Array.new(count, model) if count && model
             @fact_list[:speed] = speed * 1000 * 1000 if speed
 
             @fact_list[fact_name]
@@ -28,16 +33,16 @@ module Facter
           HW_NCPU = 3
           HW_CPUSPEED = 12
 
-          def model
-            @model ||= Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_MODEL])
+          def processor_model
+            Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_MODEL])
           end
 
           def logical_count
-            @logical_count ||= Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_NCPU])
+            Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_NCPU])
           end
 
-          def speed
-            @speed ||= Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_CPUSPEED])
+          def processor_speed
+            Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_CPUSPEED])
           end
         end
       end

data/lib/facter/resolvers/cloud.rb

@@ -5,7 +5,7 @@ module Facter
     class Cloud < BaseResolver
       # cloud_provider
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -23,7 +23,7 @@ module Facter
             files.select! { |filename| filename =~ /^dhclient.*lease.*$/ }
             files.each do |file|
               path = File.join([path, file])
-              output = Util::FileHelper.safe_read(path)
+              output = Facter::Util::FileHelper.safe_read(path)
 
               if output.include?('option unknown-245') || output.include?('option 245')
                 @fact_list[:cloud_provider] = 'azure'

data/lib/facter/resolvers/containers.rb

@@ -6,7 +6,8 @@ module Facter
       # :virtual
       # :hypervisor
 
-      @fact_list ||= {}
+      init_resolver
+
       INFO = { 'docker' => 'id', 'lxc' => 'name' }.freeze
 
       class << self
@@ -17,8 +18,8 @@ module Facter
         end
 
         def read_cgroup(fact_name)
-          output_cgroup = Util::FileHelper.safe_read('/proc/1/cgroup', nil)
-          output_environ = Util::FileHelper.safe_read('/proc/1/environ', nil)
+          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
 
           output_docker = %r{docker/(.+)}.match(output_cgroup)
@@ -48,7 +49,7 @@ module Facter
           nspawn = /container=systemd-nspawn/ =~ output_environ
           if nspawn
             vm = 'systemd_nspawn'
-            info = Util::FileHelper.safe_read('/etc/machine-id', nil)
+            info = Facter::Util::FileHelper.safe_read('/etc/machine-id', nil)
           end
           [info ? { 'id' => info.strip } : {}, vm]
         end

data/lib/facter/resolvers/debian_version.rb

@@ -7,7 +7,7 @@ module Facter
       # :minor
       # :full
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_debian_version(fact_name)
-          file_content = Util::FileHelper.safe_read('/etc/debian_version')
+          file_content = Facter::Util::FileHelper.safe_read('/etc/debian_version')
           @fact_list[:version] = file_content.strip unless file_content.empty?
 
           @fact_list[fact_name]

data/lib/facter/resolvers/{disk_resolver.rb → disk.rb}

@@ -5,9 +5,12 @@ module Facter
     module Linux
       class Disk < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
+
         DIR = '/sys/block'
-        FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor' }.freeze
+        FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor', type: 'queue/rotational' }.freeze
+
         class << self
           private
 
@@ -22,11 +25,19 @@ module Facter
               @fact_list[:disks].each do |disk, value|
                 file_path = File.join(DIR, disk, file)
 
-                result = Util::FileHelper.safe_read(file_path).strip
+                result = Facter::Util::FileHelper.safe_read(file_path).strip
                 next if result.empty?
 
-                # Linux always considers sectors to be 512 bytes long independently of the devices real block size.
-                value[key] = file =~ /size/ ? construct_size(value, result) : result
+                value[key] = case key
+                             when :size
+                               # Linux always considers sectors to be 512 bytes long
+                               # independently of the devices real block size.
+                               construct_size(value, result)
+                             when :type
+                               result == '0' ? 'ssd' : 'hdd'
+                             else
+                               result
+                             end
               end
             end
 
@@ -44,7 +55,7 @@ module Facter
           def construct_size(facts, value)
             value = value.to_i * 512
             facts[:size_bytes] = value
-            facts[:size] = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(value)
+            facts[:size] = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(value)
           end
         end
       end

data/lib/facter/resolvers/{dmi_resolver.rb → dmi.rb}

@@ -5,7 +5,8 @@ module Facter
     module Linux
       class DmiBios < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
 
         class << self
           # :bios_vendor
@@ -34,11 +35,11 @@ module Facter
                        product_serial product_uuid]
             return unless File.directory?('/sys/class/dmi')
 
-            file_content = Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)
+            file_content = Facter::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/dmi_decode.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class DmiDecode < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       ADDRESS_TO_VERSION = {
         0xe8480 => 'ESXi 2.5',

data/lib/facter/resolvers/ec2.rb

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class Ec2 < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       EC2_METADATA_ROOT_URL = 'http://169.254.169.254/latest/meta-data/'
       EC2_USERDATA_ROOT_URL = 'http://169.254.169.254/latest/user-data/'
       EC2_SESSION_TIMEOUT = 5
@@ -49,7 +50,9 @@ module Facter
         end
 
         def get_data_from(url)
-          Utils::Http.get_request(url, {}, { session: determine_session_timeout })
+          headers = {}
+          headers['X-aws-ec2-metadata-token'] = Facter::Util::Resolvers::AwsToken.get if ENV['AWS_IMDSv2']
+          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
         end
 
         def determine_session_timeout

data/lib/facter/resolvers/{eos_release_resolver.rb → eos_release.rb}

@@ -7,7 +7,7 @@ module Facter
       # :version
       # :codename
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_eos_release(fact_name)
-          output = Util::FileHelper.safe_read('/etc/Eos-release', nil)
+          output = Facter::Util::FileHelper.safe_read('/etc/Eos-release', nil)
           return @fact_list[fact_name] = nil if output.nil?
 
           output_strings = output.split(' ')

data/lib/facter/resolvers/{facterversion_resolver.rb → facterversion.rb}

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Facterversion < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/{filesystems_resolver.rb → filesystems.rb}

@@ -5,8 +5,11 @@ module Facter
     module Linux
       class Filesystems < BaseResolver
         # :systems
-        @fact_list ||= {}
+
+        init_resolver
+
         @log = Facter::Log.new(self)
+
         class << self
           private
 
@@ -15,7 +18,7 @@ module Facter
           end
 
           def read_filesystems(fact_name)
-            output = Util::FileHelper.safe_readlines('/proc/filesystems', nil)
+            output = Facter::Util::FileHelper.safe_readlines('/proc/filesystems', nil)
             return unless output
 
             filesystems = []

data/lib/facter/resolvers/{fips_enabled_resolver.rb → fips_enabled.rb}

@@ -5,8 +5,11 @@ module Facter
     module Linux
       class FipsEnabled < BaseResolver
         #:fips_enabled
-        @fact_list ||= {}
+
+        init_resolver
+
         @log = Facter::Log.new(self)
+
         class << self
           private
 
@@ -15,7 +18,7 @@ module Facter
           end
 
           def read_fips_file(fact_name)
-            file_output = Util::FileHelper.safe_read('/proc/sys/crypto/fips_enabled')
+            file_output = Facter::Util::FileHelper.safe_read('/proc/sys/crypto/fips_enabled')
             @fact_list[:fips_enabled] = file_output.strip == '1'
             @fact_list[fact_name]
           end