facter 4.0.40 → 4.0.46

data/lib/facter/framework/core/options/option_store.rb

@@ -8,31 +8,41 @@ module Facter
     # TODO: constant is not yet available when running puppet facts
     @log_level = :warn
     @show_legacy = true
+    @custom_facts = true
+    @blocked_facts = []
+    @ruby = true
+    @external_facts = true
+    @config = nil
+    @user_query = []
+    @strict = false
+    @json = false
+    @cache = true
+    @yaml = false
+    @puppet = false
+    @ttls = []
     @block = true
-    @custom_dir = []
+    @cli = nil
     @config_file_custom_dir = []
-    @custom_facts = true
-    @external_dir = []
     @config_file_external_dir = []
     @default_external_dir = []
-    @external_facts = true
-    @ruby = true
-    @cache = true
-    @blocked_facts = []
-    @user_query = []
-    @block_list = {}
     @fact_groups = {}
+    @sequential = false
+    @ttls = []
+    @block_list = []
     @color = true
+    @trace = false
     @timing = false
+    @external_dir = []
+    @custom_dir = []
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy,
                   :custom_facts, :blocked_facts, :ruby, :external_facts
 
-      attr_accessor :config, :user_query, :strict, :json, :haml,
+      attr_accessor :config, :user_query, :strict, :json,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color, :trace, :timing
+                    :block_list, :color, :trace, :sequential, :timing
 
       attr_writer :external_dir
 
@@ -158,26 +168,36 @@ module Facter
         # TODO: constant is not yet available when running puppet facts
         @log_level = :warn
         @show_legacy = true
-        @block = true
         @ruby = true
         @user_query = []
-        @cli = nil
+        @json = false
         @cache = true
-        @trace = false
+        @yaml = false
+        @puppet = false
+        @ttls = []
+        @block = true
+        @cli = nil
+        @custom_facts = true
         reset_config
       end
 
       def reset_config
-        @custom_dir = []
-        @custom_facts = true
-        @external_dir = []
-        @default_external_dir = []
-        @config_file_external_dir = []
-        @external_facts = true
         @blocked_facts = []
+        @external_facts = true
+        @config = nil
+        @strict = false
+        @config_file_custom_dir = []
+        @config_file_external_dir = []
+        @default_external_dir = []
         @fact_groups = {}
         @block_list = {}
+        @color = true
+        @sequential = false
+        @ttls = []
+        @trace = false
         @timing = false
+        @external_dir = []
+        @custom_dir = []
       end
 
       def fallback_external_dir

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

@@ -1,29 +1,25 @@
 # frozen_string_literal: true
 
+require 'facter/config'
+
 module Facter
   class OsHierarchy
     def initialize
       @log = Log.new(self)
-      json_file_path = File.join(File.dirname(__FILE__), '../../os_hierarchy.json')
-      json_file = Util::FileHelper.safe_read(json_file_path)
-      begin
-        @json_os_hierarchy = JSON.parse(json_file)
-      rescue JSON::ParserError => _e
-        @log.error('Could not parse os_hierarchy json')
-      end
+      @os_hierarchy = Facter::Config::OS_HIERARCHY
     end
 
     def construct_hierarchy(searched_os)
       return [] if searched_os.nil?
 
       searched_os = searched_os.to_s.capitalize
-      if @json_os_hierarchy.nil?
+      if @os_hierarchy.nil?
         @log.debug("There is no os_hierarchy, will fall back to: #{searched_os}")
         return [searched_os]
       end
 
       @searched_path = []
-      search(@json_os_hierarchy, searched_os, [])
+      search(@os_hierarchy, searched_os, [])
 
       @searched_path.map { |os_name| os_name.to_s.capitalize }
     end

data/lib/facter/resolvers/aio_agent_version.rb

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

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Architecture < BaseResolver
       # :architecture
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
@@ -14,9 +15,11 @@ module Facter
 
         def read_architecture(fact_name)
           require_relative 'utils/odm_query'
+
+          proc_number = read_proc
           odmquery = ODMQuery.new
           odmquery
-            .equals('name', 'proc0')
+            .equals('name', proc_number)
             .equals('attribute', 'type')
 
           result = odmquery.execute
@@ -32,6 +35,18 @@ module Facter
 
           @fact_list[fact_name]
         end
+
+        def read_proc
+          odmquery = ODMQuery.new
+          odmquery
+            .equals('PdDvLn', 'processor/sys/proc_rspc')
+            .equals('status', '1')
+
+          result = odmquery.execute
+          result.each_line do |line|
+            return line.split('=')[1].strip.delete('\"') if line.include?('name')
+          end
+        end
       end
     end
   end

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
 

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

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

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Hardware < BaseResolver
       # :hardware
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 

data/lib/facter/resolvers/aix/load_averages_resolver.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
 

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

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

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

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
@@ -14,7 +14,7 @@ module Facter
           end
 
           def read_oslevel(fact_name)
-            output = Facter::Core::Execution.execute('/usr/bin/oslevel -s', { limit: 2, logger: log })
+            output = Facter::Core::Execution.execute('/usr/bin/oslevel -s', logger: log)
             @fact_list[:build] = output unless output.empty?
             @fact_list[:kernel] = 'AIX'
 

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
 

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
 

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

data/lib/facter/resolvers/augeas_resolver.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,28 @@ 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 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

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

data/lib/facter/resolvers/debian_version.rb

@@ -7,7 +7,7 @@ module Facter
       # :minor
       # :full
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private