facter 4.0.35 → 4.0.40

data/lib/facter/resolvers/suse_release_resolver.rb

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

data/lib/facter/resolvers/sw_vers_resolver.rb

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

data/lib/facter/resolvers/timezone_resolver.rb

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

data/lib/facter/resolvers/uname_resolver.rb

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

data/lib/facter/resolvers/uptime_resolver.rb

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

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/resolvers/utils/http.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Utils
+      module Http
+        @log = Facter::Log.new(self)
+
+        class << self
+          CONNECTION_TIMEOUT = 0.6
+          SESSION_TIMEOUT = 5
+
+          # Makes a GET http request and returns it's response.
+          #
+          # Params:
+          # url: String which contains the address to which the request will be made
+          # headers: Hash which contains the headers you need to add to your request.
+          #          Default headers is an empty hash
+          #          Example: { "Accept": 'application/json' }
+          # timeouts: Hash that includes the values for the session and connection timeouts.
+          #          Example: { session: 2.4. connection: 5 }
+          #
+          # Return value:
+          # is a string with the response body if the response code is 200.
+          # If the response code is not 200, an empty string is returned.
+          def get_request(url, headers = {}, timeouts = {})
+            make_request(url, headers, timeouts, 'GET')
+          end
+
+          private
+
+          def make_request(url, headers, timeouts, request_type)
+            require 'net/http'
+
+            uri = URI.parse(url)
+            http = http_obj(uri, timeouts)
+            request = request_obj(headers, uri, request_type)
+
+            # Make the request
+            resp = http.request(request)
+            response_code_valid?(resp.code.to_i) ? resp.body : ''
+          rescue StandardError => e
+            @log.debug("Trying to connect to #{url} but got: #{e.message}")
+            ''
+          end
+
+          def http_obj(parsed_url, timeouts)
+            http = Net::HTTP.new(parsed_url.host)
+            http.read_timeout = timeouts[:session] || SESSION_TIMEOUT
+            http.open_timeout = timeouts[:connection] || CONNECTION_TIMEOUT
+            http
+          end
+
+          def request_obj(headers, parsed_url, request_type)
+            return Net::HTTP::Get.new(parsed_url.request_uri, headers) if request_type == 'GET'
+
+            raise StandardError("Unknown http request type: #{request_type}")
+          end
+
+          def response_code_valid?(http_code)
+            @log.debug("Request failed with error code #{http_code}") unless http_code.equal?(200)
+            http_code.equal?(200)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/virt_what.rb

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

data/lib/facter/resolvers/vmware.rb

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

data/lib/facter/resolvers/windows/aio_agent_version.rb

@@ -5,7 +5,6 @@ module Facter
     module Windows
       class AioAgentVersion < BaseResolver
         REGISTRY_PATH = 'SOFTWARE\\Puppet Labs\\Puppet'
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/windows/dmi_bios_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class DMIBios < BaseResolver
       @log = Facter::Log.new(self)
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/windows/dmi_computersystem_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class DMIComputerSystem < BaseResolver
       @log = Facter::Log.new(self)
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/windows/fips_resolver.rb

@@ -7,7 +7,6 @@ module Facter
     module Windows
       class Fips < BaseResolver
         # :fips_enabled
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/windows/hardware_architecture_resolver.rb

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

data/lib/facter/resolvers/windows/identity_resolver.rb

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

data/lib/facter/resolvers/windows/kernel_resolver.rb

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

data/lib/facter/resolvers/windows/memory_resolver.rb

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

data/lib/facter/resolvers/windows/netkvm_resolver.rb

@@ -5,7 +5,6 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class NetKVM < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

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

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

data/lib/facter/resolvers/windows/processors_resolver.rb

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

data/lib/facter/resolvers/windows/product_release_resolver.rb

@@ -5,7 +5,6 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class ProductRelease < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

data/lib/facter/resolvers/windows/ssh.rb

@@ -5,7 +5,6 @@ module Facter
     module Windows
       class Ssh < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub
                         ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub].freeze

data/lib/facter/resolvers/windows/system32_resolver.rb

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

data/lib/facter/resolvers/windows/uptime_resolver.rb

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

data/lib/facter/resolvers/windows/virtualization_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Virtualization < BaseResolver
       @log = Facter::Log.new(self)
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/windows/win_os_description_resolver.rb

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

data/lib/facter/resolvers/wpar_resolver.rb

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

data/lib/facter/resolvers/xen.rb

@@ -3,10 +3,11 @@
 module Facter
   module Resolvers
     class Xen < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       XEN_PATH = '/proc/xen/capabilities'
+      XEN_TOOLSTACK = '/usr/lib/xen-common/bin/xen-toolstack'
+      XEN_COMMANDS = ['/usr/sbin/xl', '/usr/sbin/xm'].freeze
 
       class << self
         private
@@ -18,6 +19,7 @@ module Facter
         def detect_xen(fact_name)
           @fact_list[:vm] = detect_xen_type
           @fact_list[:privileged] = privileged?(@fact_list[:vm])
+          @fact_list[:domains] = detect_domains
 
           @fact_list[fact_name]
         end
@@ -33,6 +35,31 @@ module Facter
           content = Util::FileHelper.safe_read(XEN_PATH, nil)
           content&.strip == 'control_d' || xen_type == 'xen0'
         end
+
+        def detect_domains
+          domains = []
+          xen_command = find_command
+          return unless xen_command
+
+          output = Facter::Core::Execution.execute("#{xen_command} list", logger: log)
+          return if output.empty?
+
+          output.each_line do |line|
+            next if line =~ /Domain-0|Name/
+
+            domain = line.match(/^([^\s]*)\s/)
+            domain = domain&.captures&.first
+            domains << domain if domain
+          end
+
+          domains
+        end
+
+        def find_command
+          return XEN_TOOLSTACK if File.exist?(XEN_TOOLSTACK)
+
+          XEN_COMMANDS.each { |command| return command if File.exist?(command) }
+        end
       end
     end
   end

data/lib/facter/resolvers/zfs.rb

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

data/lib/facter/resolvers/zpool.rb

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

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.35
+  version: 4.0.40
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -279,7 +279,10 @@ files:
 - lib/facter/facts/aix/ruby/sitedir.rb
 - lib/facter/facts/aix/ruby/version.rb
 - lib/facter/facts/aix/scope6_interfaces.rb
+- lib/facter/facts/aix/serialnumber.rb
 - lib/facter/facts/aix/ssh.rb
+- lib/facter/facts/aix/sshalgorithmkey.rb
+- lib/facter/facts/aix/sshfp_algorithm.rb
 - lib/facter/facts/aix/system_uptime/days.rb
 - lib/facter/facts/aix/system_uptime/hours.rb
 - lib/facter/facts/aix/system_uptime/seconds.rb
@@ -368,6 +371,8 @@ files:
 - lib/facter/facts/freebsd/ruby/sitedir.rb
 - lib/facter/facts/freebsd/ruby/version.rb
 - lib/facter/facts/freebsd/ssh.rb
+- lib/facter/facts/freebsd/sshalgorithmkey.rb
+- lib/facter/facts/freebsd/sshfp_algorithm.rb
 - lib/facter/facts/freebsd/system_uptime/days.rb
 - lib/facter/facts/freebsd/system_uptime/hours.rb
 - lib/facter/facts/freebsd/system_uptime/seconds.rb
@@ -380,11 +385,13 @@ 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
 - lib/facter/facts/linux/dmi/bios/vendor.rb
 - lib/facter/facts/linux/dmi/bios/version.rb
+- lib/facter/facts/linux/dmi/board/asset_tag.rb
 - lib/facter/facts/linux/dmi/board/manufacturer.rb
 - lib/facter/facts/linux/dmi/board/product.rb
 - lib/facter/facts/linux/dmi/board/serial_number.rb
@@ -399,6 +406,7 @@ files:
 - lib/facter/facts/linux/facterversion.rb
 - lib/facter/facts/linux/filesystems.rb
 - lib/facter/facts/linux/fips_enabled.rb
+- lib/facter/facts/linux/gce.rb
 - lib/facter/facts/linux/hypervisors/docker.rb
 - lib/facter/facts/linux/hypervisors/hyper_v.rb
 - lib/facter/facts/linux/hypervisors/kvm.rb
@@ -482,6 +490,7 @@ files:
 - lib/facter/facts/linux/processors/isa.rb
 - lib/facter/facts/linux/processors/models.rb
 - lib/facter/facts/linux/processors/physicalcount.rb
+- lib/facter/facts/linux/processors/speed.rb
 - lib/facter/facts/linux/puppet_version.rb
 - lib/facter/facts/linux/ruby/platform.rb
 - lib/facter/facts/linux/ruby/sitedir.rb
@@ -496,6 +505,7 @@ files:
 - lib/facter/facts/linux/system_uptime/uptime.rb
 - lib/facter/facts/linux/timezone.rb
 - lib/facter/facts/linux/virtual.rb
+- lib/facter/facts/linux/xen.rb
 - lib/facter/facts/macosx/aio_agent_version.rb
 - lib/facter/facts/macosx/augeas/version.rb
 - lib/facter/facts/macosx/dhcp_servers.rb
@@ -631,6 +641,8 @@ files:
 - lib/facter/facts/solaris/dmi/product/uuid.rb
 - lib/facter/facts/solaris/facterversion.rb
 - lib/facter/facts/solaris/filesystems.rb
+- lib/facter/facts/solaris/hypervisors/ldom.rb
+- lib/facter/facts/solaris/hypervisors/zone.rb
 - lib/facter/facts/solaris/identity/gid.rb
 - lib/facter/facts/solaris/identity/group.rb
 - lib/facter/facts/solaris/identity/privileged.rb
@@ -639,10 +651,12 @@ files:
 - lib/facter/facts/solaris/interfaces.rb
 - lib/facter/facts/solaris/ipaddress6_interfaces.rb
 - lib/facter/facts/solaris/ipaddress_interfaces.rb
+- lib/facter/facts/solaris/is_virtual.rb
 - lib/facter/facts/solaris/kernel.rb
 - lib/facter/facts/solaris/kernelmajversion.rb
 - lib/facter/facts/solaris/kernelrelease.rb
 - lib/facter/facts/solaris/kernelversion.rb
+- lib/facter/facts/solaris/ldom.rb
 - lib/facter/facts/solaris/load_averages.rb
 - lib/facter/facts/solaris/macaddress_interfaces.rb
 - lib/facter/facts/solaris/memory/swap/available.rb
@@ -695,17 +709,21 @@ files:
 - lib/facter/facts/solaris/ruby/sitedir.rb
 - lib/facter/facts/solaris/ruby/version.rb
 - lib/facter/facts/solaris/ssh.rb
+- lib/facter/facts/solaris/sshalgorithmkey.rb
+- lib/facter/facts/solaris/sshfp_algorithm.rb
 - lib/facter/facts/solaris/system_uptime/days.rb
 - lib/facter/facts/solaris/system_uptime/hours.rb
 - lib/facter/facts/solaris/system_uptime/seconds.rb
 - lib/facter/facts/solaris/system_uptime/uptime.rb
 - lib/facter/facts/solaris/timezone.rb
+- lib/facter/facts/solaris/virtual.rb
 - lib/facter/facts/solaris/zfs_featurenumbers.rb
 - lib/facter/facts/solaris/zfs_version.rb
 - lib/facter/facts/solaris/zones.rb
 - lib/facter/facts/solaris/zpool_featureflags.rb
 - lib/facter/facts/solaris/zpool_featurenumbers.rb
 - lib/facter/facts/solaris/zpool_version.rb
+- lib/facter/facts/ubuntu/lsbdistrelease.rb
 - lib/facter/facts/ubuntu/os/distro/release.rb
 - lib/facter/facts/ubuntu/os/release.rb
 - lib/facter/facts/windows/aio_agent_version.rb
@@ -719,6 +737,7 @@ files:
 - lib/facter/facts/windows/ec2_userdata.rb
 - lib/facter/facts/windows/facterversion.rb
 - lib/facter/facts/windows/fips_enabled.rb
+- lib/facter/facts/windows/gce.rb
 - lib/facter/facts/windows/hypervisors/hyperv.rb
 - lib/facter/facts/windows/hypervisors/kvm.rb
 - lib/facter/facts/windows/hypervisors/virtualbox.rb
@@ -783,6 +802,8 @@ files:
 - lib/facter/facts/windows/ruby/version.rb
 - lib/facter/facts/windows/scope6_interfaces.rb
 - lib/facter/facts/windows/ssh.rb
+- lib/facter/facts/windows/sshalgorithmkey.rb
+- lib/facter/facts/windows/sshfp_algorithm.rb
 - lib/facter/facts/windows/system_uptime/days.rb
 - lib/facter/facts/windows/system_uptime/hours.rb
 - lib/facter/facts/windows/system_uptime/seconds.rb
@@ -794,6 +815,7 @@ files:
 - lib/facter/facts_utils/unit_converter.rb
 - lib/facter/facts_utils/uptime_parser.rb
 - lib/facter/facts_utils/windows_release_finder.rb
+- lib/facter/framework/benchmarking/timer.rb
 - lib/facter/framework/cli/cli.rb
 - lib/facter/framework/cli/cli_launcher.rb
 - lib/facter/framework/config/config_reader.rb
@@ -832,6 +854,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
@@ -843,15 +866,17 @@ 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
 - lib/facter/resolvers/aix/utils/info_extractor.rb
 - lib/facter/resolvers/aix/utils/odm_query.rb
 - lib/facter/resolvers/augeas_resolver.rb
 - 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
@@ -869,6 +894,7 @@ files:
 - lib/facter/resolvers/freebsd/processors.rb
 - lib/facter/resolvers/freebsd/swap_memory_resolver.rb
 - lib/facter/resolvers/freebsd/system_memory_resolver.rb
+- lib/facter/resolvers/gce.rb
 - lib/facter/resolvers/hostname_resolver.rb
 - lib/facter/resolvers/identity_resolver.rb
 - lib/facter/resolvers/linux/docker_uptime.rb
@@ -891,7 +917,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
@@ -908,6 +933,7 @@ files:
 - lib/facter/resolvers/solaris/ffi/structs.rb
 - lib/facter/resolvers/solaris/filesystems.rb
 - lib/facter/resolvers/solaris/ipaddress.rb
+- lib/facter/resolvers/solaris/ldom.rb
 - lib/facter/resolvers/solaris/memory.rb
 - lib/facter/resolvers/solaris/networking.rb
 - lib/facter/resolvers/solaris/os_release.rb
@@ -923,6 +949,7 @@ files:
 - lib/facter/resolvers/utils/ffi/load_averages.rb
 - lib/facter/resolvers/utils/filesystem_helper.rb
 - lib/facter/resolvers/utils/fingerprint.rb
+- lib/facter/resolvers/utils/http.rb
 - lib/facter/resolvers/utils/networking.rb
 - lib/facter/resolvers/utils/ssh.rb
 - lib/facter/resolvers/utils/ssh_helper.rb