facter 4.1.1 → 4.2.3

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

@@ -47,8 +47,6 @@ module Facter
         @used_resolution_weight = 0
 
         @value = nil
-
-        @log = Facter::Log.new(self)
       end
 
       # Adds a new {Facter::Util::Resolution resolution}.  This requires a
@@ -87,8 +85,8 @@ module Facter
 
         resolve
       rescue StandardError => e
-        LegacyFacter
-          .log_exception(e, "Unable to add resolve #{resolution_name.inspect} for fact #{@name}: #{e.message}")
+        log.log_exception("Unable to add resolve #{resolution_name.inspect} for fact #{@name}: #{e.message}")
+        nil
       end
 
       # Retrieve an existing resolution by name
@@ -122,7 +120,7 @@ module Facter
         return @value if @value
 
         if @resolves.empty?
-          LegacyFacter.debug format('No resolves for %<name>s', name: @name)
+          log.debug format('No resolves for %<name>s', name: @name)
           return nil
         end
 
@@ -147,12 +145,16 @@ module Facter
       def extract_ldapname_option!(options)
         return unless options[:ldapname]
 
-        LegacyFacter.warnonce('ldapname is deprecated and will be removed in a future version')
+        log.warnonce('ldapname is deprecated and will be removed in a future version')
         self.ldapname = options.delete(:ldapname)
       end
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       def resolve_value
         return Facter.core_value(name) if @value.nil?
 
@@ -222,18 +224,18 @@ module Facter
 
       def log_fact_path(resolve)
         fact = resolve.fact
-        @log.debug("#{resolve.fact_type} fact #{fact.name} got resolved from: #{fact.location}")
+        log.debug("#{resolve.fact_type} fact #{fact.name} got resolved from: #{fact.location}")
       end
 
       def announce_when_no_suitable_resolution(resolutions)
         return unless resolutions.empty?
 
-        LegacyFacter.debug format('Found no suitable resolves of %<resolver_length> for %<name>s',
-                                  resolver_length: @resolves.length, name: @name)
+        log.debug format('Found no suitable resolves of %<resolver_length> for %<name>s',
+                         resolver_length: @resolves.length, name: @name)
       end
 
       def announce_when_no_value_found(value)
-        LegacyFacter.debug(format('value for %<name>s is still nil', name: @name)) if value.nil?
+        log.debug(format('value for %<name>s is still nil', name: @name)) if value.nil?
       end
 
       def create_or_return_resolution(resolution_name, resolution_type)

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

@@ -78,7 +78,7 @@ module LegacyFacter
           if valid_search_path?(path)
             search_paths << path
           else
-            LegacyFacter.warn "Excluding #{path} from search path. Fact file paths must be an absolute directory"
+            log.debug "Excluding #{path} from search path. Fact file paths must be an absolute directory"
           end
         end
 
@@ -89,6 +89,10 @@ module LegacyFacter
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       # Validate that the given path is valid, ie it is an absolute path.
       #
       # @api private

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

@@ -137,11 +137,17 @@ module LegacyFacter
           if LegacyFacter.json?
             JSON.parse(content)
           else
-            LegacyFacter.warnonce "Cannot parse JSON data file #{filename} without the json library."
-            LegacyFacter.warnonce 'Suggested next step is `gem install json` to install the json library.'
+            log.warnonce "Cannot parse JSON data file #{filename} without the json library."
+            log.warnonce 'Suggested next step is `gem install json` to install the json library.'
             nil
           end
         end
+
+        private
+
+        def log
+          @log ||= Facter::Log.new(self)
+        end
       end
 
       register(JsonParser) do |filename|

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

@@ -91,7 +91,7 @@ module Facter
           msg = "Already evaluated #{@name}"
           msg << " at #{@last_evaluated}" if msg.is_a? String
           msg << ', reevaluating anyways'
-          LegacyFacter.warn msg
+          log.warn msg
         end
 
         instance_eval(&block)
@@ -171,6 +171,10 @@ module Facter
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       # If the weights are equal, we consider external facts greater tan custom facts
       def compare_equal_weights(other)
         # Other is considered greater because self is custom fact and other is external

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