facter 4.0.32 → 4.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f2204546c27a939b067c08cc85aaf8f38673a37db898cd9dda273e8047704c
-  data.tar.gz: 1815adc1638070582de416e8f7976a6ace992bd6e133077ab387e792b3f26415
+  metadata.gz: f2ed5162fef26cfbf5bd010cf7737ac8b4856cf59f9f55745d6cfc1bec39781e
+  data.tar.gz: 761beee20f449b3bbe1e5dc35c0bcd675e9602902804e7add3ee6c3d31a8916d
 SHA512:
-  metadata.gz: 6a7c95ea0a07b60e11aa33d1edf792c875139fa683ca2b30db252cad0b81e77a0ee2135f2237f0bb04e17b2df7f30705ace0c28a0e9f236459c717e6aa7f4010
-  data.tar.gz: fb8f00bc8f4a117d7d904125f6864296389257d2be4935d6492030570cd4100a333b190394a782f52ff0156fb9441b0a3228fda201048ede7c6e4f13ad28dd14
+  metadata.gz: 92751ef6452023c4e4edd9c2b7d21bd78bef74404d5550d4de353b4243f6639f29abbba1f00d6f8ba0b4bbf7afbea060f00aa34919a2d1d94459e1df5515e706
+  data.tar.gz: b4ca79c0907439874ae638a920def98b9ed0d3e2893a77b6bc3d44dfb3cba756f88e550d55d14a8e4cdb9d2c5b58a6d0c6a6c335955ae819607021a80562cd65

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

@@ -35,6 +35,7 @@ module LegacyFacter
       def initialize(dir = LegacyFacter::Util::Config.external_facts_dirs, weight = EXTERNAL_FACT_WEIGHT)
         @directories = [dir].flatten
         @weight = weight
+        @log ||= Facter::Log.new(self)
       end
 
       # Load facts from files in fact directory using the relevant parser classes to
@@ -83,11 +84,12 @@ module LegacyFacter
           parser = LegacyFacter::Util::Parser.parser_for(fact.file)
           next if parser.nil?
 
-          data = parser.results
+          data = resolve_fact(fact, parser)
+
           if data == false
             LegacyFacter.warn "Could not interpret fact file #{fact.file}"
           elsif (data == {}) || data.nil?
-            LegacyFacter.warn "Fact file #{fact.file} was parsed but returned an empty data set"
+            @log.debug("Fact file #{fact.file} was parsed but no key=>value data was returned")
           else
             data.each do |p, v|
               collection.add(p, value: v, fact_type: :external,
@@ -97,6 +99,14 @@ module LegacyFacter
         end
       end
 
+      def resolve_fact(fact, parser)
+        data = nil
+        fact_name = File.basename(fact.file)
+        Facter::Framework::Benchmarking::Timer.measure(fact_name) { data = parser.results }
+
+        data
+      end
+
       def entries
         dirs = @directories.select { |directory| File.directory?(directory) }.map do |directory|
           Dir.entries(directory).map { |directory_entry| File.join(directory, directory_entry) }

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

@@ -118,7 +118,10 @@ module Facter
 
         searching do
           suitable_resolutions = sort_by_weight(find_suitable_resolutions(@resolves))
-          @value = find_first_real_value(suitable_resolutions)
+
+          Facter::Framework::Benchmarking::Timer.measure(@name) do
+            @value = find_first_real_value(suitable_resolutions)
+          end
 
           announce_when_no_suitable_resolution(suitable_resolutions)
           announce_when_no_value_found(@value)

data/lib/facter/fact_groups.conf

@@ -165,5 +165,144 @@
 		"virtual",
 		"is_virtual",
 		"cloud"
+	],
+	"legacy": [
+		"architecture",
+		"augeasversion",
+		"bios_release_date",
+		"bios_vendor",
+		"bios_version",
+		"blockdevice_*_model",
+		"blockdevice_*_size",
+		"blockdevice_*_vendor",
+		"blockdevices",
+		"boardassettag",
+		"boardmanufacturer",
+		"boardproductname",
+		"boardserialnumber",
+		"chassisassettag",
+		"chassistype",
+		"dhcp_servers",
+		"domain",
+		"fqdn",
+		"gid",
+		"hardwareisa",
+		"hardwaremodel",
+		"hostname",
+		"id",
+		"interfaces",
+		"ipaddress",
+		"ipaddress_.*",
+		"ipaddress_*",
+		"ipaddress6",
+		"ipaddress6_.*",
+		"ipaddress6_*",
+		"ldom_*",
+		"lsbdistcodename",
+		"lsbdistdescription",
+		"lsbdistid",
+		"lsbdistrelease",
+		"lsbmajdistrelease",
+		"lsbminordistrelease",
+		"lsbrelease",
+		"macaddress",
+		"macaddress_.*",
+		"macaddress_*",
+		"macosx_buildversion",
+		"macosx_productname",
+		"macosx_productversion",
+		"macosx_productversion_major",
+		"macosx_productversion_minor",
+		"manufacturer",
+		"memoryfree",
+		"memoryfree_mb",
+		"memorysize",
+		"memorysize_mb",
+		"mtu_.*",
+		"mtu_*",
+		"netmask",
+		"netmask_.*",
+		"netmask_*",
+		"netmask6",
+		"netmask6_.*",
+		"netmask6_*",
+		"network",
+		"network_.*",
+		"network_*",
+		"network6",
+		"network6_.*",
+		"network6_*",
+		"operatingsystem",
+		"operatingsystemmajrelease",
+		"operatingsystemrelease",
+		"osfamily",
+		"physicalprocessorcount",
+		"processor.*",
+		"processor*",
+		"processorcount",
+		"productname",
+		"rubyplatform",
+		"rubysitedir",
+		"rubyversion",
+		"scope6",
+		"scope6_.*",
+		"selinux",
+		"selinux_config_mode",
+		"selinux_config_policy",
+		"selinux_current_mode",
+		"selinux_enforced",
+		"selinux_policyversion",
+		"serialnumber",
+		"sp_*",
+		"sp_boot_mode",
+		"sp_boot_rom_version",
+		"sp_boot_volume",
+		"sp_cpu_type",
+		"sp_current_processor_speed",
+		"sp_kernel_version",
+		"sp_l2_cache_core",
+		"sp_l3_cache",
+		"sp_local_host_name",
+		"sp_machine_model",
+		"sp_machine_name",
+		"sp_number_processors",
+		"sp_os_version",
+		"sp_packages",
+		"sp_physical_memory",
+		"sp_platform_uuid",
+		"sp_secure_vm",
+		"sp_serial_number",
+		"sp_smc_version_system",
+		"sp_uptime",
+		"sp_user_name",
+		"ssh.*key",
+		"ssh*key",
+		"sshfp_.*",
+		"sshfp_*",
+		"swapencrypted",
+		"swapfree",
+		"swapfree_mb",
+		"swapsize",
+		"swapsize_mb",
+		"system32",
+		"uptime",
+		"uptime_days",
+		"uptime_hours",
+		"uptime_seconds",
+		"uuid",
+		"windows_edition_id",
+		"windows_installation_type",
+		"windows_product_name",
+		"windows_release_id",
+		"xendomains",
+		"zone_*_brand",
+		"zone_*_id",
+		"zone_*_iptype",
+		"zone_*_name",
+		"zone_*_path",
+		"zone_*_status",
+		"zone_*_uuid",
+		"zonename",
+		"zones"
 	]
-}
+}

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

@@ -4,13 +4,28 @@ module Facts
   module Aix
     class Disks
       FACT_NAME = 'disks'
+      ALIASES = %w[blockdevices blockdevice_.*_size'].freeze
 
       def call_the_resolver
+        facts = []
         disks = Facter::Resolvers::Aix::Disks.resolve(:disks)
 
-        disks = disks&.empty? ? nil : disks
+        return Facter::ResolvedFact.new(FACT_NAME, nil) if disks.nil? || disks.empty?
 
-        Facter::ResolvedFact.new(FACT_NAME, disks)
+        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))
+        end
       end
     end
   end

data/lib/facter/facts/aix/networking/scope6.rb

@@ -5,11 +5,13 @@ module Facts
     module Networking
       class Scope6
         FACT_NAME = 'networking.scope6'
+        ALIASES = 'scope6'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Aix::Networking.resolve(:scope6)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new('scope6', fact_value, :legacy)]
         end
       end
     end

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

@@ -9,7 +9,6 @@ module Facts
       def call_the_resolver
         resolved_facts = []
         interfaces = Facter::Resolvers::Aix::Networking.resolve(:interfaces)
-        scope6 = Facter::Resolvers::Aix::Networking.resolve(:scope6)
 
         interfaces&.each do |interface_name, info|
           if info[:scope6]
@@ -17,7 +16,6 @@ module Facts
           end
         end
 
-        resolved_facts << Facter::ResolvedFact.new('scope6', scope6, :legacy) if scope6
         resolved_facts
       end
     end

data/lib/facter/facts/aix/serialnumber.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class Serialnumber
+      FACT_NAME = 'serialnumber'
+      TYPE = :legacy
+
+      def call_the_resolver
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+
+      private
+
+      def fact_value
+        Facter::Resolvers::Aix::Serialnumber.resolve(:serialnumber)
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Facts
       private
 
       def fact_value
-        resolver_data.map! { |el| create_ssh_fact(el) }.inject(:merge!)
+        resolver_data.map { |el| create_ssh_fact(el) }.inject(:merge)
       end
 
       def resolver_data
@@ -20,6 +20,8 @@ module Facts
       end
 
       def create_ssh_fact(ssh)
+        return {} unless ssh
+
         { ssh.name.to_sym => {
           fingerprints: {
             sha1: ssh.fingerprint.sha1,

data/lib/facter/facts/aix/sshalgorithmkey.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class Sshalgorithmkey
+      FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
+
+      def call_the_resolver
+        facts = []
+        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result.each { |ssh| facts << Facter::ResolvedFact.new("ssh#{ssh.name.to_sym}key", ssh.key, :legacy) }
+        facts
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class SshfpAlgorithm
+      FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        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)
+        end
+        facts
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'load_averages'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Bsd::LoadAverages.resolve(:load_averages)
+        fact_value = Facter::Resolvers::LoadAverages.resolve(:load_averages)
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end

data/lib/facter/facts/debian/os/distro/release.rb

@@ -6,11 +6,16 @@ module Facts
       module Distro
         class Release
           FACT_NAME = 'os.distro.release'
+          ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
             fact_value = determine_release_for_os
+            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
 
-            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES[0], fact_value['full'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[1], fact_value['major'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[2], fact_value['minor'], :legacy)]
           end
 
           private

data/lib/facter/facts/freebsd/augeas/version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Augeas
+      class Version
+        FACT_NAME = 'augeas.version'
+        ALIASES = 'augeasversion'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Bios
+        class ReleaseDate
+          FACT_NAME = 'dmi.bios.release_date'
+          ALIASES = 'bios_release_date'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:bios_date)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Bios
+        class Vendor
+          FACT_NAME = 'dmi.bios.vendor'
+          ALIASES = 'bios_vendor'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:bios_vendor)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Bios
+        class Version
+          FACT_NAME = 'dmi.bios.version'
+          ALIASES = 'bios_version'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:bios_version)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end