facter 4.0.34 → 4.0.39

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

@@ -11,7 +11,7 @@ module Facts
         result = Facter::Resolvers::SshResolver.resolve(:ssh)
         result.each do |ssh|
           facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}",
-                                            "#{ssh.fingerprint.sha1} \n #{ssh.fingerprint.sha256}", :legacy)
+                                            "#{ssh.fingerprint.sha1}\n#{ssh.fingerprint.sha256}", :legacy)
         end
         facts
       end

data/lib/facter/facts/rhel/os/release.rb

@@ -18,8 +18,8 @@ module Facts
         end
 
         def determine_release_version
-          version = Facter::Resolvers::OsRelease.resolve(:version_id)
-          version ||= Facter::Resolvers::RedHatRelease.resolve(:version)
+          version = Facter::Resolvers::RedHatRelease.resolve(:version)
+          version ||= Facter::Resolvers::OsRelease.resolve(:version_id)
 
           return unless version
 

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,33 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Disks
+      FACT_NAME = 'disks'
+      ALIASES = %w[blockdevices blockdevice_.*_size blockdevice_.*_vendor'].freeze
+
+      def call_the_resolver
+        facts = []
+        disks = Facter::Resolvers::Solaris::Disks.resolve(:disks)
+
+        return Facter::ResolvedFact.new(FACT_NAME, nil) if disks.nil? || disks.empty?
+
+        blockdevices = disks.keys.join(',')
+        facts.push(Facter::ResolvedFact.new(FACT_NAME, disks))
+        facts.push(Facter::ResolvedFact.new('blockdevices', blockdevices, :legacy))
+        add_legacy_facts(disks, facts)
+
+        facts
+      end
+
+      private
+
+      def add_legacy_facts(disks, facts)
+        disks.each do |disk_name, disk_info|
+          facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_size", disk_info[:size_bytes].to_s, :legacy))
+          facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_vendor", disk_info[:vendor], :legacy))
+        end
+      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/hypervisors/ldom.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Hypervisors
+      class Ldom
+        FACT_NAME = 'hypervisors.ldom'
+
+        def initialize
+          @log = Facter::Log.new(self)
+        end
+
+        def call_the_resolver
+          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
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Hypervisors
+      class Zone
+        FACT_NAME = 'hypervisors.zone'
+
+        def initialize
+          @log = Facter::Log.new(self)
+        end
+
+        def call_the_resolver
+          fact_value = current_zone
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+
+        def current_zone
+          current_zone_name = Facter::Resolvers::Solaris::ZoneName.resolve(:current_zone_name)
+          return unless current_zone_name
+
+          zones = Facter::Resolvers::Solaris::Zone.resolve(:zone)
+          return nil unless zones
+
+          current_zone = zones.find { |r| r[:name] == current_zone_name }
+
+          {
+            brand: current_zone[:brand],
+            id: current_zone[:id],
+            ip_type: current_zone[:iptype],
+            name: current_zone[:name],
+            uuid: current_zone[:uuid]
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class IsVirtual
+      FACT_NAME = 'is_virtual'
+
+      def initialize
+        @log = Facter::Log.new(self)
+      end
+
+      def call_the_resolver
+        @log.debug('Solaris Virtual Resolver')
+
+        fact_value = check_ldom || check_zone || check_xen || check_other_facts || 'physical'
+
+        @log.debug("Fact value is: #{fact_value}")
+
+        Facter::ResolvedFact.new(FACT_NAME, check_if_virtual(fact_value))
+      end
+
+      def check_ldom
+        @log.debug('Checking LDoms')
+        return unless Facter::Resolvers::Solaris::Ldom.resolve(:role_control) == 'false'
+
+        Facter::Resolvers::Solaris::Ldom.resolve(:role_impl)
+      end
+
+      def check_zone
+        @log.debug('Checking LDoms')
+        zone_name = Facter::Resolvers::Solaris::ZoneName.resolve(:current_zone_name)
+
+        return if zone_name == 'global'
+
+        'zone'
+      end
+
+      def check_xen
+        @log.debug('Checking XEN')
+        Facter::Resolvers::Xen.resolve(:vm)
+      end
+
+      def check_other_facts
+        isa = Facter::Resolvers::Uname.resolve(:processor)
+        klass = isa == 'sparc' ? 'DmiSparc' : 'Dmi'
+
+        product_name = Facter::Resolvers::Solaris.const_get(klass).resolve(:product_name)
+        bios_vendor = Facter::Resolvers::Solaris.const_get(klass).resolve(:bios_vendor)
+
+        return 'kvm' if bios_vendor&.include?('Amazon EC2')
+
+        return unless product_name
+
+        Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+
+        nil
+      end
+
+      def check_if_virtual(found_vm)
+        Facter::FactsUtils::PHYSICAL_HYPERVISORS.count(found_vm).zero?
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Facts
       def call_the_resolver
         full_version = Facter::Resolvers::Uname.resolve(:kernelversion)
         versions_split = full_version.split('.')
-        major_version = versions_split.length > 1 ? versions_split[0] + '.' + versions_split[1] : versions_split[0]
+        major_version = versions_split.length > 2 ? versions_split[0] + '.' + versions_split[1] : versions_split[0]
         Facter::ResolvedFact.new(FACT_NAME, major_version)
       end
     end