facter 4.0.43 → 4.0.49

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Disks < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
@@ -33,7 +34,7 @@ module Facter
 
             return if stdout.empty?
 
-            info_size = InfoExtractor.extract(stdout, /PP SIZE:|TOTAL PPs:|FREE PPs:|PV STATE:/)
+            info_size = Facter::Util::Aix::InfoExtractor.extract(stdout, /PP SIZE:|TOTAL PPs:|FREE PPs:|PV STATE:/)
 
             return unless info_size['PV STATE']
 
@@ -41,7 +42,7 @@ module Facter
 
             {
               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)
             }
           end
 
@@ -49,9 +50,9 @@ module Facter
             physical_partitions = size_hash['TOTAL PPs'].to_i + size_hash['FREE PPs'].to_i
             size_physical_partition = size_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/{filesystem_resolver.rb → filesystem.rb}

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Filesystem < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -14,7 +14,7 @@ module Facter
           end
 
           def read_vtf_file(fact_name)
-            file_content = Util::FileHelper.safe_readlines('/etc/vfs')
+            file_content = Facter::Util::FileHelper.safe_readlines('/etc/vfs')
             return if file_content.empty?
 
             file_content = file_content.map do |line|

data/lib/facter/resolvers/aix/{hardware_resolver.rb → hardware.rb}

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Hardware < BaseResolver
       # :hardware
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
@@ -13,8 +14,8 @@ module Facter
         end
 
         def read_hardware(fact_name)
-          require_relative 'utils/odm_query'
-          odmquery = Facter::ODMQuery.new
+          require 'facter/util/aix/odm_query'
+          odmquery = Facter::Util::Aix::ODMQuery.new
           odmquery
             .equals('name', 'sys0')
             .equals('attribute', 'modelname')

data/lib/facter/resolvers/aix/{load_averages_resolver.rb → load_averages.rb}

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

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

@@ -4,8 +4,9 @@ module Facter
   module Resolvers
     module Aix
       class Memory < BaseResolver
+        init_resolver
         # :hardware
-        @fact_list ||= {}
+
         class << self
           private
 
@@ -43,7 +44,7 @@ module Facter
             { available_bytes: content[3].to_i * pagesize,
               total_bytes: total,
               used_bytes: used,
-              capacity: FilesystemHelper.compute_capacity(used, total) }
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used, total) }
           end
 
           def populate_swap(content, pagesize)
@@ -55,7 +56,7 @@ module Facter
             { available_bytes: total - used,
               total_bytes: total,
               used_bytes: used,
-              capacity: FilesystemHelper.compute_capacity(used, total) }
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used, total) }
           end
         end
       end

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Mountpoints < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         BLOCK_SIZE = 512
 
         class << self
@@ -52,13 +53,13 @@ module Facter
             used_bytes = info[2]
             size_bytes = info[1]
             @fact_list[:mountpoints][info.last].merge!(
-              capacity: FilesystemHelper.compute_capacity(used_bytes, size_bytes),
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, size_bytes),
               available_bytes: available_bytes,
               used_bytes: used_bytes,
               size_bytes: size_bytes,
-              available: FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes),
-              used: FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes),
-              size: FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+              available: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes),
+              used: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes),
+              size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes)
             )
           end
         end

data/lib/facter/resolvers/aix/{networking_resolver.rb → networking.rb}

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Networking < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -21,7 +21,7 @@ module Facter
 
             populate_with_mtu_and_mac!(@fact_list[:interfaces])
             get_primary_interface_info(output)
-            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
             @fact_list[fact_name]
           end
 
@@ -49,7 +49,8 @@ module Facter
             mask_length = mask_length.to_i - 1 unless is_ipv4
             @fact_list[:interfaces][name] ||= {}
             @fact_list[:interfaces][name][bind_to_add] ||= []
-            @fact_list[:interfaces][name][bind_to_add] << ::Resolvers::Utils::Networking.build_binding(ip, mask_length)
+            @fact_list[:interfaces][name][bind_to_add] << Facter::Util::Resolvers::Networking
+                                                          .build_binding(ip, mask_length)
           end
 
           def populate_with_mtu_and_mac!(interfaces)

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

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

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