facter 4.0.33 → 4.0.38

data/lib/facter/framework/formatters/yaml_fact_formatter.rb

@@ -56,7 +56,7 @@ module Facter
       return false if value[/^[0-9]+$/]
       return true if value =~ /y|Y|yes|Yes|YES|n|N|no|No|NO|True|TRUE|False|FALSE|on|On|ON|off|Off|OFF|:/
       return false if value[/[a-zA-Z]/]
-      return false if value[/[0-9]+\.[0-9]+\./]
+      return false if value[/[0-9]+\.[0-9]+/]
 
       true
     end

data/lib/facter/framework/logging/logger.rb

@@ -60,9 +60,7 @@ module Facter
     def debug(msg)
       return unless debugging_active?
 
-      if msg.nil? || msg.empty?
-        empty_message_error(msg)
-      elsif @@message_callback
+      if @@message_callback
         @@message_callback.call(:debug, msg)
       else
         msg = colorize(msg, CYAN) if Options[:color]
@@ -82,9 +80,7 @@ module Facter
     end
 
     def warn(msg)
-      if msg.nil? || msg.empty?
-        empty_message_error(msg)
-      elsif @@message_callback
+      if @@message_callback
         @@message_callback.call(:warn, msg)
       else
         msg = colorize(msg, YELLOW) if Options[:color]

data/lib/facter/os_hierarchy.json

@@ -12,7 +12,9 @@
         "Rhel": [
           "Fedora",
           "Amzn",
-          "Centos"
+          "Centos",
+          "Ol",
+          "Scientific"
         ]
       },
       {
@@ -23,14 +25,11 @@
     ]
   },
   {
-    "Solaris": [
-      {
-        "Bsd": [
-          "Freebsd"
-        ]
-      }
+    "Bsd": [
+      "Freebsd"
     ]
   },
+  "Solaris",
   "Macosx",
   "Windows",
   "Aix"

data/lib/facter/resolvers/aio_agent_version.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class AioAgentVersion < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Architecture < BaseResolver
       # :architecture
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Disks < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -14,12 +13,12 @@ module Facter
           end
 
           def execute_lspv(fact_name)
-            @fact_list[:disks] = {}
-
             result = Facter::Core::Execution.execute('lspv', logger: log)
 
             return if result.empty?
 
+            @fact_list[:disks] = {}
+
             result.each_line do |line|
               disk_name = line.split(' ')[0].strip
               size = find_size(disk_name)

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Filesystem < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Hardware < BaseResolver
       # :hardware
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class LoadAverages < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

@@ -5,7 +5,6 @@ module Facter
     module Aix
       class Memory < BaseResolver
         # :hardware
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -18,11 +17,11 @@ module Facter
             result = Facter::Core::Execution.execute('svmon', logger: log)
             return if result.empty?
 
-            @fact_list[:system] = @fact_list[:swap] = {}
-
             pagesize = call_pagesize.to_i
             return if pagesize.zero?
 
+            @fact_list[:system] = @fact_list[:swap] = {}
+
             result.each_line do |line|
               @fact_list[:system] = populate_system(line, pagesize) if line.include?('memory')
               @fact_list[:swap] = populate_swap(line, pagesize) if line =~ /pg\sspace/

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Mountpoints < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         BLOCK_SIZE = 512
 

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Networking < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Nim < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class OsLevel < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Partitions < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -14,8 +13,6 @@ module Facter
           end
 
           def query_cudv(fact_name)
-            @fact_list[:partitions] = {}
-
             odmquery = Facter::ODMQuery.new
             odmquery.equals('PdDvLn', 'logical_volume/lvsubclass/lvtype')
 
@@ -23,6 +20,8 @@ module Facter
 
             return unless result
 
+            @fact_list[:partitions] = {}
+
             result.each_line do |line|
               next unless line.include?('name')
 

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Processors < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Serialnumber < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_serialnumber(fact_name) }
+          end
+
+          def read_serialnumber(fact_name)
+            odmquery = Facter::ODMQuery.new
+            odmquery
+              .equals('name', 'sys0')
+              .equals('attribute', 'systemid')
+            result = odmquery.execute
+
+            result.each_line do |line|
+              if line.include?('value')
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
+                break
+              end
+            end
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/augeas_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Augeas < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/base_resolver.rb

@@ -16,15 +16,20 @@ module Facter
       end
 
       def self.resolve(fact_name)
-        @semaphore.synchronize do
-          subscribe_to_manager
-          post_resolve(fact_name)
-        end
-      rescue LoadError => e
+        subscribe_to_manager
+        post_resolve(fact_name)
+
+        validate_resolution(fact_name)
+      rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 
+      def self.validate_resolution(fact_name)
+        @fact_list.fetch(fact_name) { @fact_list[fact_name] = nil }
+        @fact_list[fact_name]
+      end
+
       def self.post_resolve(_fact_name)
         raise NotImplementedError, "You must implement post_resolve(fact_name) method in #{name}"
       end

data/lib/facter/resolvers/bsd/ffi/ffi_helper.rb

@@ -9,19 +9,9 @@ module Facter
         extend FFI::Library
 
         ffi_lib 'c'
-        attach_function :getloadavg, %i[pointer int], :int
         attach_function :sysctl, %i[pointer uint pointer pointer pointer size_t], :int
       end
 
-      def self.read_load_averages
-        raw_loadavg = FFI::MemoryPointer.new(:double, 3)
-
-        res = Libc.getloadavg(raw_loadavg, 3)
-        return unless res == 3
-
-        raw_loadavg.read_array_of_double(res)
-      end
-
       def self.sysctl(type, oids)
         name = FFI::MemoryPointer.new(:uint, oids.size)
         name.write_array_of_uint(oids)

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

@@ -5,7 +5,6 @@ module Facter
     module Bsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/containers.rb

@@ -6,7 +6,6 @@ module Facter
       # :virtual
       # :hypervisor
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
       INFO = { 'docker' => 'id', 'lxc' => 'name' }.freeze
 

data/lib/facter/resolvers/debian_version.rb

@@ -7,7 +7,6 @@ module Facter
       # :minor
       # :full
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/disk_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class Disk < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         DIR = '/sys/block'
         FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor' }.freeze

data/lib/facter/resolvers/dmi_decode.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DmiDecode < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       ADDRESS_TO_VERSION = {

data/lib/facter/resolvers/dmi_resolver.rb

@@ -5,13 +5,13 @@ module Facter
     module Linux
       class DmiBios < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self
           # :bios_vendor
           # :bios_date
           # :bios_version
+          # :board_asset_tag
           # :board_vendor
           # :board_serial
           # :board_name
@@ -29,9 +29,9 @@ module Facter
           end
 
           def read_facts(fact_name)
-            files = %w[bios_date bios_vendor bios_version board_vendor board_name board_serial
-                       chassis_asset_tag chassis_type sys_vendor product_name product_serial
-                       product_uuid]
+            files = %w[bios_date bios_vendor bios_version board_asset_tag board_vendor board_name
+                       board_serial chassis_asset_tag chassis_type sys_vendor product_name
+                       product_serial product_uuid]
             return unless File.directory?('/sys/class/dmi')
 
             file_content = Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)

data/lib/facter/resolvers/ec2.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
-require 'net/http'
-
 module Facter
   module Resolvers
     class Ec2 < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       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_CONNECTION_TIMEOUT = 0.6
       EC2_SESSION_TIMEOUT = 5
 
       class << self
         private
 
         def post_resolve(fact_name)
+          log.debug('Querying Ec2 metadata')
           @fact_list.fetch(fact_name) { read_facts(fact_name) }
         end
 
@@ -31,7 +28,7 @@ module Facter
           metadata.each_line do |line|
             next if line.empty?
 
-            http_path_component = build_path_compoent(line)
+            http_path_component = build_path_component(line)
             next if http_path_component == 'security-credentials/'
 
             if http_path_component.end_with?('/')
@@ -46,25 +43,13 @@ module Facter
           end
         end
 
-        def build_path_compoent(line)
+        def build_path_component(line)
           array_match = /^(\d+)=.*$/.match(line)
           array_match ? "#{array_match[1]}/" : line.strip
         end
 
         def get_data_from(url)
-          parsed_url = URI.parse(url)
-          http = Net::HTTP.new(parsed_url.host)
-          http.read_timeout = determine_session_timeout
-          http.open_timeout = EC2_CONNECTION_TIMEOUT
-          resp = http.get(parsed_url.path)
-          response_code_valid?(resp.code) ? resp.body : ''
-        rescue StandardError => e
-          log.debug("Trying to connect to #{url} but got: #{e.message}")
-          ''
-        end
-
-        def response_code_valid?(http_code)
-          http_code.to_i.equal?(200)
+          Utils::Http.get_request(url, {}, { session: determine_session_timeout })
         end
 
         def determine_session_timeout