facter 4.0.30 → 4.0.35

data/lib/facter/facts/macosx/scope6_interfaces.rb

@@ -8,8 +8,8 @@ module Facts
 
       def call_the_resolver
         resolved_facts = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-        primary_scope6 = Facter::Resolvers::Macosx::Networking.resolve(:scope6)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        primary_scope6 = Facter::Resolvers::Networking.resolve(:scope6)
 
         interfaces&.each do |interface_name, info|
           if info[:scope6]

data/lib/facter/facts/macosx/ssh.rb

@@ -6,22 +6,30 @@ module Facts
       FACT_NAME = 'ssh'
 
       def call_the_resolver
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
-        ssh_facts = {}
-        result.each { |ssh| ssh_facts.merge!(create_ssh_fact(ssh)) }
-
-        ssh_facts = nil if ssh_facts.empty?
-        Facter::ResolvedFact.new(FACT_NAME, ssh_facts)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
 
       private
 
+      def fact_value
+        resolver_data.map { |el| create_ssh_fact(el) }.inject(:merge)
+      end
+
+      def resolver_data
+        Facter::Resolvers::SshResolver.resolve(:ssh)
+      end
+
       def create_ssh_fact(ssh)
-        { ssh.name.to_sym =>
-              { fingerprints: { sha1: ssh.fingerprint.sha1,
-                                sha256: ssh.fingerprint.sha256 },
-                key: ssh.key,
-                type: ssh.type } }
+        return {} unless ssh
+
+        { ssh.name.to_sym => {
+          fingerprints: {
+            sha1: ssh.fingerprint.sha1,
+            sha256: ssh.fingerprint.sha256
+          },
+          key: ssh.key,
+          type: ssh.type
+        } }
       end
     end
   end

data/lib/facter/facts/macosx/system_profiler/hardware_uuid.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class HardwareUuid
         FACT_NAME = 'system_profiler.hardware_uuid'
-        ALIASES = 'sp_hardware_uuid'
+        ALIASES = 'sp_platform_uuid'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:hardware_uuid)

data/lib/facter/facts/macosx/system_profiler/l2_cache_per_core.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class L2CachePerCore
         FACT_NAME = 'system_profiler.l2_cache_per_core'
-        ALIASES = 'sp_l2_cache_per_core'
+        ALIASES = 'sp_l2_cache_core'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:l2_cache_per_core)

data/lib/facter/facts/macosx/system_profiler/memory.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class Memory
         FACT_NAME = 'system_profiler.memory'
-        ALIASES = 'sp_memory'
+        ALIASES = 'sp_physical_memory'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:memory)

data/lib/facter/facts/macosx/system_profiler/processor_name.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class ProcessorName
         FACT_NAME = 'system_profiler.processor_name'
-        ALIASES = 'sp_processor_name'
+        ALIASES = 'sp_cpu_type'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:processor_name)

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

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class Processors
         FACT_NAME = 'system_profiler.processors'
-        ALIASES = 'sp_cpu_type'
+        ALIASES = 'sp_packages'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:number_of_processors)

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

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'virtual'
 
       def call_the_resolver
-        fact_value = check_vmware || check_virtualbox || check_parallels
+        fact_value = check_vmware || check_virtualbox || check_parallels || 'physical'
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class CurrentZone
+      FACT_NAME = 'solaris_zones.current'
+      ALIASES = 'zonename'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Solaris::ZoneName.resolve(:current_zone_name)
+
+        [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Disks
+      FACT_NAME = 'disks'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Solaris::Disks.resolve(:disks)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/bios/release_date.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Bios
+        class ReleaseDate
+          FACT_NAME = 'dmi.bios.release_date'
+          ALIASES = 'bios_release_date'
+
+          def call_the_resolver
+            fact_value = nil
+            fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:bios_release_date) if isa == 'i386'
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/bios/vendor.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Bios
+        class Vendor
+          FACT_NAME = 'dmi.bios.vendor'
+          ALIASES = 'bios_vendor'
+
+          def call_the_resolver
+            fact_value = nil
+            fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:bios_vendor) if isa == 'i386'
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/bios/version.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Bios
+        class Version
+          FACT_NAME = 'dmi.bios.version'
+          ALIASES = 'bios_version'
+
+          def call_the_resolver
+            fact_value = nil
+            fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:bios_version) if isa == 'i386'
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/chassis/asset_tag.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Chassis
+        class AssetTag
+          FACT_NAME = 'dmi.chassis.asset_tag'
+          ALIASES = 'chassisassettag'
+
+          def call_the_resolver
+            fact_value = nil
+            fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:chassis_asset_tag) if isa == 'i386'
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/chassis/type.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Chassis
+        class Type
+          FACT_NAME = 'dmi.chassis.type'
+          ALIASES = 'chassistype'
+
+          def call_the_resolver
+            fact_value = nil
+            fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:chassis_type) if isa == 'i386'
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/manufacturer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      class Manufacturer
+        FACT_NAME = 'dmi.manufacturer'
+        ALIASES = 'manufacturer'
+
+        def call_the_resolver
+          fact_value = if isa == 'i386'
+                         Facter::Resolvers::Solaris::Dmi.resolve(:manufacturer)
+                       elsif isa == 'sparc'
+                         Facter::Resolvers::Solaris::DmiSparc.resolve(:manufacturer)
+                       end
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+
+        def isa
+          Facter::Resolvers::Uname.resolve(:processor)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/product/name.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Product
+        class Name
+          FACT_NAME = 'dmi.product.name'
+          ALIASES = 'productname'
+
+          def call_the_resolver
+            fact_value = if isa == 'i386'
+                           Facter::Resolvers::Solaris::Dmi.resolve(:product_name)
+                         elsif isa == 'sparc'
+                           Facter::Resolvers::Solaris::DmiSparc.resolve(:product_name)
+                         end
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/product/serial_number.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Product
+        class SerialNumber
+          FACT_NAME = 'dmi.product.serial_number'
+          ALIASES = 'serialnumber'
+
+          def call_the_resolver
+            fact_value = if isa == 'i386'
+                           Facter::Resolvers::Solaris::Dmi.resolve(:serial_number)
+                         elsif isa == 'sparc'
+                           Facter::Resolvers::Solaris::DmiSparc.resolve(:serial_number)
+                         end
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/dmi/product/uuid.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Dmi
+      module Product
+        class Uuid
+          FACT_NAME = 'dmi.product.uuid'
+          ALIASES = 'uuid'
+
+          def call_the_resolver
+            fact_value = nil
+            fact_value = Facter::Resolvers::Solaris::Dmi.resolve(:product_uuid) if isa == 'i386'
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+
+          def isa
+            Facter::Resolvers::Uname.resolve(:processor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class LoadAverages
+      FACT_NAME = 'load_averages'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LoadAverages.resolve(:load_averages)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/memory/swap/available.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Memory
+      module Swap
+        class Available
+          FACT_NAME = 'memory.swap.available'
+          ALIASES = 'swapfree'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Solaris::Memory.resolve(:swap)
+            if fact_value
+              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:available_bytes])
+            end
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/memory/swap/available_bytes.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Memory
+      module Swap
+        class AvailableBytes
+          FACT_NAME = 'memory.swap.available_bytes'
+          ALIASES = 'swapfree_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Solaris::Memory.resolve(:swap)
+            fact_value = fact_value[:available_bytes] if fact_value
+
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+          end
+        end
+      end
+    end
+  end
+end