facter 4.0.50 → 4.2.0

data/lib/facter/util/resolvers/http.rb

@@ -10,7 +10,7 @@ module Facter
           CONNECTION_TIMEOUT = 0.6
           SESSION_TIMEOUT = 5
 
-          # Makes a GET http request and returns it's response.
+          # Makes a GET http request and returns its response.
           #
           # Params:
           # url: String which contains the address to which the request will be made
@@ -40,6 +40,12 @@ module Facter
             http = http_obj(uri, timeouts)
             request = request_obj(headers, uri, request_type)
 
+            # The Windows implementation of sockets does not respect net/http
+            # timeouts, so check if the target is reachable in a different way
+            if Gem.win_platform?
+              Socket.tcp(uri.host, uri.port, connect_timeout: timeouts[:connection] || CONNECTION_TIMEOUT)
+            end
+
             # Make the request
             response = http.request(request)
             response.uri = url

data/lib/facter/util/resolvers/networking/primary_interface.rb

@@ -37,11 +37,8 @@ module Facter
                 next if index.zero?
 
                 route = line.strip.split("\t")
-                if route.count > 7 &&
-                   route[ROUTE_TABLE_MAPPING['Destination']] == '00000000' &&
-                   route[ROUTE_TABLE_MAPPING['Mask']] == '00000000'
-                  return route[ROUTE_TABLE_MAPPING['Iface']]
-                end
+
+                return route[ROUTE_TABLE_MAPPING['Iface']] if valid_default_route?(route)
               end
 
               nil
@@ -74,6 +71,15 @@ module Facter
 
               nil
             end
+
+            private
+
+            def valid_default_route?(route)
+              route.count > 7 &&
+                route[ROUTE_TABLE_MAPPING['Destination']] == '00000000' &&
+                route[ROUTE_TABLE_MAPPING['Mask']] == '00000000' &&
+                route[ROUTE_TABLE_MAPPING['Iface']] != '*' # `*` represents blackhole and not a valid interface
+            end
           end
         end
       end

data/lib/facter/util/utils.rb

@@ -4,7 +4,7 @@ module Facter
   module Utils
     # Sort nested hash.
     def self.sort_hash_by_key(hash, recursive = true, &block)
-      hash.keys.sort(&block).each_with_object({}) do |key, seed|
+      hash.keys.sort(&block).each_with_object(hash.class.new) do |key, seed|
         seed[key] = hash[key]
         seed[key] = sort_hash_by_key(seed[key], true, &block) if recursive && seed[key].is_a?(Hash)
 
@@ -29,5 +29,22 @@ module Facter
         object
       end
     end
+
+    def self.try_to_bool(value)
+      case value.to_s
+      when 'true'
+        true
+      when 'false'
+        false
+      else
+        value
+      end
+    end
+
+    def self.try_to_int(value)
+      Integer(value)
+    rescue ArgumentError, TypeError
+      value
+    end
   end
 end

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.50
+  version: 4.2.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +170,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: New version of Facter
+description: You can prove anything with facts!
 email:
 - team-nw@puppet.com
 executables:
@@ -166,6 +180,7 @@ extra_rdoc_files: []
 files:
 - bin/facter
 - lib/docs/generate.rb
+- lib/docs/generate_cli.rb
 - lib/docs/template.erb
 - lib/facter.rb
 - lib/facter/config.rb
@@ -259,10 +274,12 @@ files:
 - lib/facter/facts/aix/partitions.rb
 - lib/facter/facts/aix/path.rb
 - lib/facter/facts/aix/processor.rb
+- lib/facter/facts/aix/processors/cores.rb
 - lib/facter/facts/aix/processors/count.rb
 - lib/facter/facts/aix/processors/isa.rb
 - lib/facter/facts/aix/processors/models.rb
 - lib/facter/facts/aix/processors/speed.rb
+- lib/facter/facts/aix/processors/threads.rb
 - lib/facter/facts/aix/ruby/platform.rb
 - lib/facter/facts/aix/ruby/sitedir.rb
 - lib/facter/facts/aix/ruby/version.rb
@@ -277,6 +294,13 @@ files:
 - lib/facter/facts/aix/system_uptime/uptime.rb
 - lib/facter/facts/aix/timezone.rb
 - lib/facter/facts/alpine/os/release.rb
+- lib/facter/facts/amzn/lsbdistcodename.rb
+- lib/facter/facts/amzn/lsbdistdescription.rb
+- lib/facter/facts/amzn/lsbdistid.rb
+- lib/facter/facts/amzn/os/distro/codename.rb
+- lib/facter/facts/amzn/os/distro/description.rb
+- lib/facter/facts/amzn/os/distro/id.rb
+- lib/facter/facts/amzn/os/distro/release.rb
 - lib/facter/facts/amzn/os/release.rb
 - lib/facter/facts/bsd/kernelmajversion.rb
 - lib/facter/facts/bsd/kernelversion.rb
@@ -379,7 +403,8 @@ files:
 - lib/facter/facts/gentoo/os/release.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/az_metadata.rb
+- lib/facter/facts/linux/cloud/provider.rb
 - lib/facter/facts/linux/dhcp_servers.rb
 - lib/facter/facts/linux/disks.rb
 - lib/facter/facts/linux/dmi/bios/release_date.rb
@@ -480,11 +505,13 @@ files:
 - lib/facter/facts/linux/partitions.rb
 - lib/facter/facts/linux/path.rb
 - lib/facter/facts/linux/processor.rb
+- lib/facter/facts/linux/processors/cores.rb
 - lib/facter/facts/linux/processors/count.rb
 - 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/processors/threads.rb
 - lib/facter/facts/linux/ruby/platform.rb
 - lib/facter/facts/linux/ruby/sitedir.rb
 - lib/facter/facts/linux/ruby/version.rb
@@ -567,11 +594,13 @@ files:
 - lib/facter/facts/macosx/os/name.rb
 - lib/facter/facts/macosx/os/release.rb
 - lib/facter/facts/macosx/path.rb
+- lib/facter/facts/macosx/processors/cores.rb
 - lib/facter/facts/macosx/processors/count.rb
 - lib/facter/facts/macosx/processors/isa.rb
 - lib/facter/facts/macosx/processors/models.rb
 - lib/facter/facts/macosx/processors/physicalcount.rb
 - lib/facter/facts/macosx/processors/speed.rb
+- lib/facter/facts/macosx/processors/threads.rb
 - lib/facter/facts/macosx/ruby/platform.rb
 - lib/facter/facts/macosx/ruby/sitedir.rb
 - lib/facter/facts/macosx/ruby/version.rb
@@ -613,6 +642,9 @@ files:
 - lib/facter/facts/openwrt/os/release.rb
 - lib/facter/facts/ovs/os/release.rb
 - lib/facter/facts/photon/os/release.rb
+- lib/facter/facts/rhel/lsbdistcodename.rb
+- lib/facter/facts/rhel/lsbdistdescription.rb
+- lib/facter/facts/rhel/lsbdistid.rb
 - lib/facter/facts/rhel/os/distro/codename.rb
 - lib/facter/facts/rhel/os/distro/description.rb
 - lib/facter/facts/rhel/os/distro/id.rb
@@ -621,6 +653,9 @@ files:
 - lib/facter/facts/rhel/os/name.rb
 - lib/facter/facts/rhel/os/release.rb
 - lib/facter/facts/slackware/os/release.rb
+- lib/facter/facts/sles/lsbdistcodename.rb
+- lib/facter/facts/sles/lsbdistdescription.rb
+- lib/facter/facts/sles/lsbdistid.rb
 - lib/facter/facts/sles/os/distro/codename.rb
 - lib/facter/facts/sles/os/distro/description.rb
 - lib/facter/facts/sles/os/distro/id.rb
@@ -701,11 +736,13 @@ files:
 - lib/facter/facts/solaris/os/name.rb
 - lib/facter/facts/solaris/os/release.rb
 - lib/facter/facts/solaris/path.rb
+- lib/facter/facts/solaris/processors/cores.rb
 - lib/facter/facts/solaris/processors/count.rb
 - lib/facter/facts/solaris/processors/isa.rb
 - lib/facter/facts/solaris/processors/models.rb
 - lib/facter/facts/solaris/processors/physicalcount.rb
 - lib/facter/facts/solaris/processors/speed.rb
+- lib/facter/facts/solaris/processors/threads.rb
 - lib/facter/facts/solaris/ruby/platform.rb
 - lib/facter/facts/solaris/ruby/sitedir.rb
 - lib/facter/facts/solaris/ruby/version.rb
@@ -729,6 +766,8 @@ files:
 - lib/facter/facts/ubuntu/os/release.rb
 - lib/facter/facts/windows/aio_agent_version.rb
 - lib/facter/facts/windows/augeas/version.rb
+- lib/facter/facts/windows/az_metadata.rb
+- lib/facter/facts/windows/cloud/provider.rb
 - lib/facter/facts/windows/dhcp_servers.rb
 - lib/facter/facts/windows/dmi/manufacturer.rb
 - lib/facter/facts/windows/dmi/product/name.rb
@@ -749,6 +788,7 @@ files:
 - lib/facter/facts/windows/interfaces.rb
 - lib/facter/facts/windows/ipaddress6_interfaces.rb
 - lib/facter/facts/windows/ipaddress_interfaces.rb
+- lib/facter/facts/windows/is_virtual.rb
 - lib/facter/facts/windows/kernel.rb
 - lib/facter/facts/windows/kernelmajversion.rb
 - lib/facter/facts/windows/kernelrelease.rb
@@ -793,10 +833,12 @@ files:
 - lib/facter/facts/windows/os/windows/system32.rb
 - lib/facter/facts/windows/path.rb
 - lib/facter/facts/windows/processor.rb
+- lib/facter/facts/windows/processors/cores.rb
 - lib/facter/facts/windows/processors/count.rb
 - lib/facter/facts/windows/processors/isa.rb
 - lib/facter/facts/windows/processors/models.rb
 - lib/facter/facts/windows/processors/physicalcount.rb
+- lib/facter/facts/windows/processors/threads.rb
 - lib/facter/facts/windows/ruby/platform.rb
 - lib/facter/facts/windows/ruby/sitedir.rb
 - lib/facter/facts/windows/ruby/version.rb
@@ -809,8 +851,7 @@ files:
 - lib/facter/facts/windows/system_uptime/seconds.rb
 - lib/facter/facts/windows/system_uptime/uptime.rb
 - lib/facter/facts/windows/timezone.rb
-- lib/facter/facts/windows/virtualization/is_virtual.rb
-- lib/facter/facts/windows/virtualization/virtual.rb
+- lib/facter/facts/windows/virtual.rb
 - lib/facter/framework/benchmarking/timer.rb
 - lib/facter/framework/cli/cli.rb
 - lib/facter/framework/cli/cli_launcher.rb
@@ -820,7 +861,6 @@ files:
 - lib/facter/framework/core/fact/external/external_fact_manager.rb
 - lib/facter/framework/core/fact/internal/core_fact.rb
 - lib/facter/framework/core/fact/internal/internal_fact_manager.rb
-- lib/facter/framework/core/fact_augmenter.rb
 - lib/facter/framework/core/fact_filter.rb
 - lib/facter/framework/core/fact_loaders/class_discoverer.rb
 - lib/facter/framework/core/fact_loaders/external_fact_loader.rb
@@ -867,10 +907,10 @@ files:
 - lib/facter/resolvers/aix/processors.rb
 - lib/facter/resolvers/aix/serialnumber.rb
 - lib/facter/resolvers/augeas.rb
+- lib/facter/resolvers/az.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.rb
@@ -893,7 +933,9 @@ files:
 - lib/facter/resolvers/hostname.rb
 - lib/facter/resolvers/identity.rb
 - lib/facter/resolvers/linux/docker_uptime.rb
+- lib/facter/resolvers/linux/hostname.rb
 - lib/facter/resolvers/linux/load_averages.rb
+- lib/facter/resolvers/linux/networking.rb
 - lib/facter/resolvers/load_averages.rb
 - lib/facter/resolvers/lpar.rb
 - lib/facter/resolvers/lsb_release.rb
@@ -909,12 +951,12 @@ files:
 - lib/facter/resolvers/memory.rb
 - lib/facter/resolvers/mountpoints.rb
 - lib/facter/resolvers/networking.rb
-- lib/facter/resolvers/networking_linux.rb
 - lib/facter/resolvers/open_vz.rb
 - lib/facter/resolvers/os_release.rb
 - lib/facter/resolvers/partitions.rb
 - lib/facter/resolvers/path.rb
 - lib/facter/resolvers/processors.rb
+- lib/facter/resolvers/processors_lscpu.rb
 - lib/facter/resolvers/redhat_release.rb
 - lib/facter/resolvers/release_from_first_line.rb
 - lib/facter/resolvers/ruby.rb
@@ -982,13 +1024,18 @@ files:
 - lib/facter/util/aix/odm_query.rb
 - lib/facter/util/api_debugger.rb
 - lib/facter/util/facts/facts_utils.rb
+- lib/facter/util/facts/posix/virtual_detector.rb
 - lib/facter/util/facts/unit_converter.rb
 - lib/facter/util/facts/uptime_parser.rb
-- lib/facter/util/facts/virtual_detector.rb
 - lib/facter/util/facts/windows_release_finder.rb
 - lib/facter/util/file_helper.rb
+- lib/facter/util/linux/dhcp.rb
+- lib/facter/util/linux/if_inet6.rb
+- lib/facter/util/linux/routing_table.rb
+- lib/facter/util/linux/socket_parser.rb
 - lib/facter/util/macosx/system_profile_executor.rb
 - lib/facter/util/resolvers/aws_token.rb
+- lib/facter/util/resolvers/ffi/hostname.rb
 - lib/facter/util/resolvers/ffi/load_averages.rb
 - lib/facter/util/resolvers/filesystem_helper.rb
 - lib/facter/util/resolvers/fingerprint.rb
@@ -1002,7 +1049,7 @@ files:
 - lib/facter/util/utils.rb
 - lib/facter/util/windows/win32ole.rb
 - lib/facter/version.rb
-homepage: 
+homepage: https://github.com/puppetlabs/facter
 licenses:
 - MIT
 metadata: {}
@@ -1012,9 +1059,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.3'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1024,5 +1074,5 @@ requirements: []
 rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: New version of Facter
+summary: Facter, a system inventory tool
 test_files: []

data/lib/facter/facts/linux/cloud.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Linux
-    class Cloud
-      FACT_NAME = 'cloud'
-
-      def call_the_resolver
-        cloud_provider = Facter::Resolvers::Cloud.resolve(:cloud_provider)
-
-        Facter::ResolvedFact.new(FACT_NAME, cloud_provider)
-      end
-    end
-  end
-end

data/lib/facter/framework/core/fact_augmenter.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module FactAugmenter
-    def self.augment_resolved_facts(searched_facts, resolved_facts)
-      augumented_resolved_facts = []
-      searched_facts.each do |searched_fact|
-        matched_facts = get_resolved_facts_for_searched_fact(searched_fact, resolved_facts)
-        augment_resolved_fact_for_user_query!(searched_fact, matched_facts)
-        augumented_resolved_facts.concat(matched_facts)
-      end
-
-      augumented_resolved_facts
-    end
-
-    private_class_method def self.get_resolved_facts_for_searched_fact(searched_fact, resolved_facts)
-      if searched_fact.name.include?('.*')
-        resolved_facts
-          .select { |resolved_fact| resolved_fact.name.match(searched_fact.name) }
-          .reject(&:user_query)
-          .uniq(&:name)
-      else
-        resolved_facts
-          .select { |resolved_fact| searched_fact.name.eql?(resolved_fact.name) }
-          .reject(&:user_query)
-          .uniq(&:name)
-      end
-    end
-
-    private_class_method def self.augment_resolved_fact_for_user_query!(searched_fact, matched_facts)
-      matched_facts.each do |matched_fact|
-        matched_fact.user_query = searched_fact.user_query
-        matched_fact.filter_tokens = searched_fact.filter_tokens
-      end
-    end
-  end
-end

data/lib/facter/resolvers/cloud.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Resolvers
-    class Cloud < BaseResolver
-      # cloud_provider
-
-      init_resolver
-
-      class << self
-        private
-
-        def post_resolve(fact_name, _options)
-          @fact_list.fetch(fact_name) { detect_azure(fact_name) }
-        end
-
-        def detect_azure(fact_name)
-          search_dirs = %w[/var/lib/dhcp /var/lib/NetworkManager]
-          search_dirs.each do |path|
-            next if !File.readable?(path) || !File.directory?(path)
-
-            files = Dir.entries(path)
-            files.select! { |filename| filename =~ /^dhclient.*lease.*$/ }
-            files.each do |file|
-              path = File.join([path, file])
-              output = Facter::Util::FileHelper.safe_read(path)
-
-              if output.include?('option unknown-245') || output.include?('option 245')
-                @fact_list[:cloud_provider] = 'azure'
-                return @fact_list[fact_name]
-              end
-            end
-          end
-          nil
-        end
-      end
-    end
-  end
-end