facter 4.0.52 → 4.2.2

data/lib/facter/facts/aix/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Aix::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    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

@@ -7,9 +7,12 @@ module Facts
         FACT_NAME = 'cloud.provider'
 
         def call_the_resolver
-          az_metadata = Facter::Resolvers::Az.resolve(:metadata)
+          provider = case Facter::Util::Facts::Posix::VirtualDetector.platform
+                     when 'hyperv'
+                       'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                     end
 
-          Facter::ResolvedFact.new(FACT_NAME, az_metadata&.empty? ? nil : 'azure')
+          Facter::ResolvedFact.new(FACT_NAME, provider)
         end
       end
     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

@@ -28,10 +28,7 @@ module Facts
         private
 
         def xen?
-          Facter::Resolvers::VirtWhat.resolve(:vm) =~ /xen/ ||
-            Facter::Resolvers::Xen.resolve(:vm) =~ /xen/ ||
-            discover_hypervisor == 'xenhvm' ||
-            Facter::Resolvers::Lspci.resolve(:vm) =~ /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/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Linux::Lscpu.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/linux/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Linux::Lscpu.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+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,17 +6,28 @@ 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)
-            versions = fact_value.split('.')
-            ver = { 'full' => fact_value, 'major' => "#{versions[0]}.#{versions[1]}", 'minor' => versions[-1] }
+            ver = version_hash(fact_value)
 
             [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)
+            versions = fact_value.split('.')
+            if versions[0] == '10'
+              { 'full' => fact_value, 'major' => "#{versions[0]}.#{versions[1]}", 'minor' => versions[-1] }
+            else
+              { 'full' => fact_value, 'major' => versions[0], 'minor' => versions.fetch(1, '0'),
+                'patch' => versions.fetch(2, '0') }
+            end
           end
         end
       end

data/lib/facter/facts/macosx/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Macosx::Processors.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Macosx::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/hypervisors/ldom.rb

@@ -17,7 +17,7 @@ module Facts
           fact_value = %i[
             chassis_serial control_domain domain_name
             domain_uuid role_control role_io role_root role_service
-          ].map! { |key| [key, Facter::Resolvers::Solaris::Ldom.resolve(key)] }.to_h
+          ].map! { |key| [key, Facter::Utils.try_to_bool(Facter::Resolvers::Solaris::Ldom.resolve(key))] }.to_h
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/solaris/hypervisors/zone.rb

@@ -27,7 +27,7 @@ module Facts
 
           {
             brand: current_zone[:brand],
-            id: current_zone[:id],
+            id: Facter::Utils.try_to_int(current_zone[:id]),
             ip_type: current_zone[:iptype],
             name: current_zone[:name],
             uuid: current_zone[:uuid]

data/lib/facter/facts/solaris/mountpoints.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'mountpoints'
 
       def call_the_resolver
-        mountpoints = Facter::Resolvers::Mountpoints.resolve(FACT_NAME.to_sym)
+        mountpoints = Facter::Resolvers::Solaris::Mountpoints.resolve(FACT_NAME.to_sym)
         return Facter::ResolvedFact.new(FACT_NAME, nil) unless mountpoints
 
         fact = {}

data/lib/facter/facts/solaris/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Processors.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/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::Resolvers::Windows::Virtualization.resolve(:virtual) == 'hyperv'
       end
     end
   end

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

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

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 = ''