facter 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ca2540a7ccad083604f2a0a1142cd0e870714dae635dc2fd8d60baa1b1bcbf
-  data.tar.gz: 25cec4e7c98a145d3950dd8c345ae04ee2bdc1b04ae78b08acb1674678c24d64
+  metadata.gz: 9921e9c05d22c7fe9c84a9061a374dd9b31b2f7a28bfa292a62fd0e33ec7eb16
+  data.tar.gz: 44606e1ec31a336cb71971be5b6c21138f0d33b88d023bb71955526550a54fd2
 SHA512:
-  metadata.gz: e43bf9233eca175b442b0cbda693efcae3f3b0f1e370b9b9ef5bca1c81a9450e4bfc3000d957463cbf49900abc6bf9769ba9664cc6750c17f58ad8abd4cf9730
-  data.tar.gz: 47c5a45dd7dfc505cda3d71634258ed7c7ca13e24ee6858219d89480f9b260e278cd8b602a59501a24ec61a7fcb62f1b929330cc5c4b54d34b13718b818280d5
+  metadata.gz: c01cbeb07ac105bbcfcd41598a818962dae3634a72b24f5e850c9dd8b0410c31d52eef1553d9fcc2f3111166d24cba5cb8ae129c3470a1c67a9fc8be12a669cf
+  data.tar.gz: d53fe66fd09af1c5d73a3789160a38c236eacf45e43a5096357ab5eb719dcff38d251e8e29dab09a1763d0e2056909977758453e9fb0a272a229f30d70d85ba1

data/lib/facter.rb

@@ -555,7 +555,7 @@ module Facter
       begin
         value = fact_collection.value(user_query)
         add_fact_to_searched_facts(user_query, value)
-      rescue KeyError
+      rescue KeyError, TypeError
         nil
       end
     end

data/lib/facter/config.rb

@@ -166,6 +166,7 @@ module Facter
           macosx_productversion
           macosx_productversion_major
           macosx_productversion_minor
+          macosx_productversion_patch
           windows_edition_id
           windows_installation_type
           windows_product_name
@@ -301,6 +302,7 @@ module Facter
           'macosx_productversion',
           'macosx_productversion_major',
           'macosx_productversion_minor',
+          'macosx_productversion_patch',
           'manufacturer',
           'memoryfree',
           'memoryfree_mb',

data/lib/facter/custom_facts/core/execution/posix.rb

@@ -29,8 +29,8 @@ module Facter
           !!(path =~ ABSOLUTE_PATH_REGEX)
         end
 
-        DOUBLE_QUOTED_COMMAND = /^"(.+?)"(?:\s+(.*))?/.freeze
-        SINGLE_QUOTED_COMMAND = /^'(.+?)'(?:\s+(.*))?/.freeze
+        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/.freeze
+        SINGLE_QUOTED_COMMAND = /\A'(.+?)'(?:\s+(.*))?/.freeze
 
         def expand_command(command)
           exe = nil

data/lib/facter/custom_facts/core/execution/windows.rb

@@ -38,7 +38,7 @@ module Facter
           !!(path =~ ABSOLUTE_PATH_REGEX)
         end
 
-        DOUBLE_QUOTED_COMMAND = /^"(.+?)"(?:\s+(.*))?/.freeze
+        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/.freeze
 
         def expand_command(command)
           exe = nil

data/lib/facter/custom_facts/util/directory_loader.rb

@@ -63,7 +63,7 @@ module LegacyFacter
             Facter.log_exception(Exception.new("Caching is enabled for group \"#{basename}\" while "\
               'there are at least two external facts files with the same filename'))
           else
-            searched_fact = Facter::SearchedFact.new(basename, nil, [], nil, :file)
+            searched_fact = Facter::SearchedFact.new(basename, nil, nil, :file)
             searched_fact.file = file
             facts << searched_fact
           end

data/lib/facter/custom_facts/util/windows_root.rb

@@ -4,7 +4,8 @@ module LegacyFacter
   module Util
     module Root
       def self.root?
-        Facter::Resolvers::Identity.resolve(:privileged)
+        require 'facter/resolvers/windows/ffi/identity_ffi'
+        IdentityFFI.privileged?
       end
     end
   end

data/lib/facter/facts/freebsd/is_virtual.rb

@@ -5,12 +5,8 @@ module Facts
     class IsVirtual
       FACT_NAME = 'is_virtual'
 
-      def initialize
-        @virtual = Facter::Util::Facts::VirtualDetector.new
-      end
-
       def call_the_resolver
-        fact_value = @virtual.platform
+        fact_value = Facter::Util::Facts::Posix::VirtualDetector.platform
 
         Facter::ResolvedFact.new(FACT_NAME, check_if_virtual(fact_value))
       end

data/lib/facter/facts/freebsd/virtual.rb

@@ -7,12 +7,11 @@ module Facts
 
       def initialize
         @log = Facter::Log.new(self)
-        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver
         @log.debug('FreeBSD Virtual Resolver')
-        fact_value = @virtual.platform
+        fact_value = Facter::Util::Facts::Posix::VirtualDetector.platform
         @log.debug("Fact value is: #{fact_value}")
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value)

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

@@ -5,10 +5,6 @@ module Facts
     class AzMetadata
       FACT_NAME = 'az_metadata'
 
-      def initialize
-        @virtual = Facter::Util::Facts::VirtualDetector.new
-      end
-
       def call_the_resolver
         return Facter::ResolvedFact.new(FACT_NAME, nil) unless azure_hypervisor?
 
@@ -20,7 +16,7 @@ module Facts
       private
 
       def azure_hypervisor?
-        @virtual.platform == 'hyperv'
+        Facter::Util::Facts::Posix::VirtualDetector.platform == 'hyperv'
       end
     end
   end

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

@@ -6,12 +6,8 @@ module Facts
       class Provider
         FACT_NAME = 'cloud.provider'
 
-        def initialize
-          @virtual = Facter::Util::Facts::VirtualDetector.new
-        end
-
         def call_the_resolver
-          provider = case @virtual.platform
+          provider = case Facter::Util::Facts::Posix::VirtualDetector.platform
                      when 'hyperv'
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
                      end

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

@@ -5,10 +5,6 @@ module Facts
     class Ec2Metadata
       FACT_NAME = 'ec2_metadata'
 
-      def initialize
-        @virtual = Facter::Util::Facts::VirtualDetector.new
-      end
-
       def call_the_resolver
         return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws_hypervisors?
 
@@ -20,7 +16,7 @@ module Facts
       private
 
       def aws_hypervisors?
-        @virtual.platform =~ /kvm|xen|aws/
+        Facter::Util::Facts::Posix::VirtualDetector.platform =~ /kvm|xen|aws/
       end
     end
   end

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

@@ -5,10 +5,6 @@ module Facts
     class Ec2Userdata
       FACT_NAME = 'ec2_userdata'
 
-      def initialize
-        @virtual = Facter::Util::Facts::VirtualDetector.new
-      end
-
       def call_the_resolver
         return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws_hypervisors?
 
@@ -20,7 +16,7 @@ module Facts
       private
 
       def aws_hypervisors?
-        @virtual.platform =~ /kvm|xen|aws/
+        Facter::Util::Facts::Posix::VirtualDetector.platform =~ /kvm|xen|aws/
       end
     end
   end

data/lib/facter/facts/linux/hypervisors/xen.rb

@@ -8,7 +8,6 @@ module Facts
 
         def initialize
           @log = Facter::Log.new(self)
-          @virtual = Facter::Util::Facts::VirtualDetector.new
         end
 
         def call_the_resolver
@@ -29,7 +28,7 @@ module Facts
         private
 
         def xen?
-          @virtual.platform =~ /xen/
+          Facter::Util::Facts::Posix::VirtualDetector.platform =~ /xen/
         end
 
         def hvm?

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

@@ -5,12 +5,8 @@ module Facts
     class IsVirtual
       FACT_NAME = 'is_virtual'
 
-      def initialize
-        @virtual = Facter::Util::Facts::VirtualDetector.new
-      end
-
       def call_the_resolver
-        fact_value = @virtual.platform
+        fact_value = Facter::Util::Facts::Posix::VirtualDetector.platform
 
         Facter::ResolvedFact.new(FACT_NAME, check_if_virtual(fact_value))
       end

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

@@ -7,12 +7,11 @@ module Facts
 
       def initialize
         @log = Facter::Log.new(self)
-        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver
         @log.debug('Linux Virtual Resolver')
-        fact_value = @virtual.platform
+        fact_value = Facter::Util::Facts::Posix::VirtualDetector.platform
         @log.debug("Fact value is: #{fact_value}")
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value)

data/lib/facter/facts/macosx/os/macosx/version.rb

@@ -6,7 +6,8 @@ module Facts
       module Macosx
         class Version
           FACT_NAME = 'os.macosx.version'
-          ALIASES = %w[macosx_productversion macosx_productversion_major macosx_productversion_minor].freeze
+          ALIASES = %w[macosx_productversion macosx_productversion_major macosx_productversion_minor
+                       macosx_productversion_patch].freeze
 
           def call_the_resolver
             fact_value = Facter::Resolvers::SwVers.resolve(:productversion)
@@ -15,7 +16,8 @@ module Facts
             [Facter::ResolvedFact.new(FACT_NAME, ver),
              Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
              Facter::ResolvedFact.new(ALIASES[1], ver['major'], :legacy),
-             Facter::ResolvedFact.new(ALIASES[2], ver['minor'], :legacy)]
+             Facter::ResolvedFact.new(ALIASES[2], ver['minor'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[3], ver['patch'], :legacy)]
           end
 
           def version_hash(fact_value)
@@ -23,7 +25,8 @@ module Facts
             if versions[0] == '10'
               { 'full' => fact_value, 'major' => "#{versions[0]}.#{versions[1]}", 'minor' => versions[-1] }
             else
-              { 'full' => fact_value, 'major' => versions[0], 'minor' => "#{versions[1]}.#{versions[-1]}" }
+              { 'full' => fact_value, 'major' => versions[0], 'minor' => versions.fetch(1, '0'),
+                'patch' => versions.fetch(2, '0') }
             end
           end
         end

data/lib/facter/facts/windows/az_metadata.rb

@@ -16,7 +16,7 @@ module Facts
       private
 
       def azure_hypervisor?
-        Facter::Resolvers::Virtualization.resolve(:virtual) == 'hyperv'
+        Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'hyperv'
       end
     end
   end

data/lib/facter/facts/windows/cloud/provider.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'cloud.provider'
 
         def call_the_resolver
-          virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
+          virtual = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
           provider = case virtual
                      when 'hyperv'
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?

data/lib/facter/facts/windows/ec2_metadata.rb

@@ -16,7 +16,7 @@ module Facts
       private
 
       def aws_hypervisors?
-        virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
+        virtual = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
 
         virtual == 'kvm' || virtual =~ /xen/
       end

data/lib/facter/facts/windows/ec2_userdata.rb

@@ -16,7 +16,7 @@ module Facts
       private
 
       def aws_hypervisors?
-        virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
+        virtual = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
 
         virtual == 'kvm' || virtual =~ /xen/
       end

data/lib/facter/facts/windows/gce.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'gce'
 
       def call_the_resolver
-        virtualization = Facter::Resolvers::Virtualization.resolve(:virtual)
+        virtualization = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
 
         fact_value = virtualization&.include?('gce') ? Facter::Resolvers::Gce.resolve(:metadata) : nil
         Facter::ResolvedFact.new(FACT_NAME, fact_value)

data/lib/facter/facts/windows/hypervisors/hyperv.rb

@@ -15,7 +15,7 @@ module Facts
         private
 
         def hyperv?
-          Facter::Resolvers::Virtualization.resolve(:virtual) == 'hyperv' ||
+          Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'hyperv' ||
             Facter::Resolvers::DMIBios.resolve(:manufacturer).include?('Microsoft')
         end
       end

data/lib/facter/facts/windows/hypervisors/kvm.rb

@@ -17,7 +17,8 @@ module Facts
         def kvm?
           product_name = Facter::Resolvers::DMIComputerSystem.resolve(:name)
 
-          (Facter::Resolvers::Virtualization.resolve(:virtual) == 'kvm' || Facter::Resolvers::NetKVM.resolve(:kvm)) &&
+          (Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'kvm' ||
+           Facter::Resolvers::NetKVM.resolve(:kvm)) &&
             product_name != 'VirtualBox' && !product_name.match(/^Parallels/)
         end
 

data/lib/facter/facts/windows/hypervisors/virtualbox.rb

@@ -15,12 +15,12 @@ module Facts
         private
 
         def virtualbox?
-          Facter::Resolvers::Virtualization.resolve(:virtual) == 'virtualbox' ||
+          Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'virtualbox' ||
             Facter::Resolvers::DMIComputerSystem.resolve(:name) == 'VirtualBox'
         end
 
         def populate_version_and_revision
-          oem_strings = Facter::Resolvers::Virtualization.resolve(:oem_strings)
+          oem_strings = Facter::Resolvers::Windows::Virtualization.resolve(:oem_strings)
           return unless oem_strings
 
           version = revision = ''

data/lib/facter/facts/windows/hypervisors/vmware.rb

@@ -15,7 +15,7 @@ module Facts
         private
 
         def vmware?
-          Facter::Resolvers::Virtualization.resolve(:virtual) == 'vmware' ||
+          Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'vmware' ||
             Facter::Resolvers::DMIBios.resolve(:manufacturer) == 'VMware, Inc.'
         end
       end

data/lib/facter/facts/windows/hypervisors/xen.rb

@@ -7,7 +7,9 @@ module Facts
         FACT_NAME = 'hypervisors.xen'
 
         def call_the_resolver
-          fact_value = { context: hvm? ? 'hvm' : 'pv' } if Facter::Resolvers::Virtualization.resolve(:virtual) == 'xen'
+          if Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'xen'
+            fact_value = { context: hvm? ? 'hvm' : 'pv' }
+          end
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/is_virtual.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class IsVirtual
+      FACT_NAME = 'is_virtual'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Windows::Virtualization.resolve(:is_virtual)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/virtual.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class Virtual
+      FACT_NAME = 'virtual'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

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

@@ -123,7 +123,7 @@ cache_format_version is incorrect!")
         return unless data[searched_fact.name]
 
         [Facter::ResolvedFact.new(searched_fact.name, data[searched_fact.name], searched_fact.type,
-                                  searched_fact.user_query, searched_fact.filter_tokens)]
+                                  searched_fact.user_query)]
       end
     end
 
@@ -133,7 +133,7 @@ cache_format_version is incorrect!")
         next if fact_name == 'cache_format_version'
 
         fact = Facter::ResolvedFact.new(fact_name, fact_value, searched_fact.type,
-                                        searched_fact.user_query, searched_fact.filter_tokens)
+                                        searched_fact.user_query)
         fact.file = searched_fact.file
         facts << fact
       end

data/lib/facter/framework/core/fact/external/external_fact_manager.rb

@@ -19,7 +19,6 @@ module Facter
       custom_facts.each do |custom_fact|
         fact = LegacyFacter[custom_fact.name]
         resolved_fact = ResolvedFact.new(custom_fact.name, fact.value, :custom)
-        resolved_fact.filter_tokens = []
         resolved_fact.user_query = custom_fact.user_query
         resolved_fact.file = fact.options[:file]
 

data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb

@@ -2,20 +2,25 @@
 
 module Facter
   class InternalFactManager
-    @@log = Facter::Log.new(self)
-
+    # resolves each SearchFact and filter out facts that do not match the given user query
+    # @param searched_facts [Array<Facter::SearchedFact>] array of searched facts
+    #
+    # @return [Array<Facter::ResolvedFact>]
+    #
+    # @api private
     def resolve_facts(searched_facts)
       internal_searched_facts = filter_internal_facts(searched_facts)
-
       resolved_facts = if Options[:sequential]
-                         @@log.debug('Resolving facts sequentially')
+                         log.debug('Resolving facts sequentially')
                          resolve_sequentially(internal_searched_facts)
                        else
-                         @@log.debug('Resolving fact in parallel')
-                         threads = start_threads(internal_searched_facts)
-                         join_threads(threads, internal_searched_facts)
+                         log.debug('Resolving fact in parallel')
+                         resolve_in_parallel(internal_searched_facts)
                        end
 
+      resolved_facts.flatten!
+      resolved_facts.compact!
+
       nil_resolved_facts = resolve_nil_facts(searched_facts)
 
       resolved_facts.concat(nil_resolved_facts)
@@ -27,6 +32,17 @@ module Facter
       searched_facts.select { |searched_fact| %i[core legacy].include? searched_fact.type }
     end
 
+    def valid_fact?(searched_fact, resolved_fact)
+      return if resolved_fact.value.nil?
+
+      searched_fact_name = searched_fact.name
+      if searched_fact_name.include?('.*')
+        resolved_fact.name.match(searched_fact_name)
+      else
+        resolved_fact.name == searched_fact_name
+      end
+    end
+
     def resolve_nil_facts(searched_facts)
       resolved_facts = []
       searched_facts.select { |fact| fact.type == :nil }.each do |fact|
@@ -37,49 +53,35 @@ module Facter
     end
 
     def resolve_sequentially(searched_facts)
-      resolved_facts = []
-
-      searched_facts
-        .uniq { |searched_fact| searched_fact.fact_class.name }
-        .each do |searched_fact|
-        begin
-          fact = CoreFact.new(searched_fact)
-          fact_value = fact.create
-          resolved_facts << fact_value unless fact_value.nil?
-        rescue StandardError => e
-          @@log.log_exception(e)
-        end
-      end
+      searched_facts.map! { |searched_fact| resolve_fact(searched_fact) }
+    end
 
-      resolved_facts.flatten!
-      FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
+    def resolve_in_parallel(searched_facts)
+      searched_facts.map! do |searched_fact|
+        Thread.new { resolve_fact(searched_fact) }
+      end.map!(&:value)
     end
 
-    def start_threads(searched_facts)
-      # only resolve a fact once, even if multiple search facts depend on that fact
-      searched_facts
-        .uniq { |searched_fact| searched_fact.fact_class.name }
-        .map do |searched_fact|
-        Thread.new do
-          resolve_fact(searched_fact)
+    def resolve_fact(searched_fact)
+      fact_value = core_fact(searched_fact)
+      Array(fact_value).map! do |resolved_fact|
+        if valid_fact?(searched_fact, resolved_fact)
+          resolved_fact.user_query = searched_fact.user_query
+          resolved_fact
         end
       end
     end
 
-    def join_threads(threads, searched_facts)
-      resolved_facts = threads.map(&:value)
-      resolved_facts.compact!
-      resolved_facts.flatten!
-
-      FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
-    end
-
-    def resolve_fact(searched_fact)
+    def core_fact(searched_fact)
       fact = CoreFact.new(searched_fact)
       fact.create
     rescue StandardError => e
-      @@log.log_exception(e)
+      log.log_exception(e)
       nil
     end
+
+    def log
+      @log ||= Facter::Log.new(self)
+    end
   end
 end