facter 4.0.30 → 4.0.35

data/lib/facter/facts/freebsd/zpool_featurenumbers.rb

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

data/lib/facter/facts/freebsd/zpool_version.rb

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

data/lib/facter/facts/linux/hypervisors/vmware.rb

@@ -15,7 +15,8 @@ module Facts
             @log.debug('Vmware hypervisor detected')
             fact_value = {}
 
-            fact_value[:version] = Facter::Resolvers::DmiDecode.resolve(:vmware_version) || ''
+            version = Facter::Resolvers::DmiDecode.resolve(:vmware_version)
+            fact_value[:version] = version if version && !version.empty?
 
             return Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

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

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

data/lib/facter/facts/linux/partitions.rb

@@ -11,7 +11,7 @@ module Facts
 
       def partitions
         parts = Facter::Resolvers::Partitions.resolve(:partitions)
-        mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(:mountpoints)
+        mountpoints = Facter::Resolvers::Mountpoints.resolve(:mountpoints)
         return parts unless mountpoints
 
         mountpoints.each do |mnt|

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

@@ -6,20 +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)) }
-        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/linux/system_uptime/days.rb

@@ -8,7 +8,13 @@ module Facts
         ALIASES = 'uptime_days'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Uptime.resolve(:days)
+          hypervisors = Facter::Resolvers::Containers.resolve(:hypervisor)
+
+          fact_value = if hypervisors && hypervisors[:docker]
+                         Facter::Resolvers::Linux::DockerUptime.resolve(:days)
+                       else
+                         Facter::Resolvers::Uptime.resolve(:days)
+                       end
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/system_uptime/hours.rb

@@ -8,7 +8,13 @@ module Facts
         ALIASES = 'uptime_hours'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Uptime.resolve(:hours)
+          hypervisors = Facter::Resolvers::Containers.resolve(:hypervisor)
+
+          fact_value = if hypervisors && hypervisors[:docker]
+                         Facter::Resolvers::Linux::DockerUptime.resolve(:hours)
+                       else
+                         Facter::Resolvers::Uptime.resolve(:hours)
+                       end
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/system_uptime/seconds.rb

@@ -8,7 +8,13 @@ module Facts
         ALIASES = 'uptime_seconds'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Uptime.resolve(:seconds)
+          hypervisors = Facter::Resolvers::Containers.resolve(:hypervisor)
+
+          fact_value = if hypervisors && hypervisors[:docker]
+                         Facter::Resolvers::Linux::DockerUptime.resolve(:seconds)
+                       else
+                         Facter::Resolvers::Uptime.resolve(:seconds)
+                       end
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/system_uptime/uptime.rb

@@ -8,7 +8,13 @@ module Facts
         ALIASES = 'uptime'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Uptime.resolve(:uptime)
+          hypervisors = Facter::Resolvers::Containers.resolve(:hypervisor)
+
+          fact_value = if hypervisors && hypervisors[:docker]
+                         Facter::Resolvers::Linux::DockerUptime.resolve(:uptime)
+                       else
+                         Facter::Resolvers::Uptime.resolve(:uptime)
+                       end
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

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

@@ -5,43 +5,59 @@ module Facts
     class Virtual
       FACT_NAME = 'virtual'
 
+      def initialize
+        @log = Facter::Log.new(self)
+      end
+
       def call_the_resolver # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        @log.debug('Linux Virtual Resolver')
+
         fact_value = check_docker_lxc || check_gce || retrieve_from_virt_what || check_vmware
         fact_value ||= check_open_vz || check_vserver || check_xen || check_other_facts || check_lspci || 'physical'
 
+        @log.debug("Fact value is: #{fact_value}")
+
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
 
       def check_gce
+        @log.debug('Checking GCE')
         bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
         'gce' if bios_vendor&.include?('Google')
       end
 
       def check_docker_lxc
+        @log.debug('Checking Docker and LXC')
         Facter::Resolvers::Containers.resolve(:vm)
       end
 
       def check_vmware
+        @log.debug('Checking VMware')
         Facter::Resolvers::Vmware.resolve(:vm)
       end
 
       def retrieve_from_virt_what
+        @log.debug('Checking virtual_what')
         Facter::Resolvers::VirtWhat.resolve(:vm)
       end
 
       def check_open_vz
+        @log.debug('Checking OpenVZ')
         Facter::Resolvers::OpenVz.resolve(:vm)
       end
 
       def check_vserver
+        @log.debug('Checking VServer')
         Facter::Resolvers::VirtWhat.resolve(:vserver)
       end
 
       def check_xen
+        @log.debug('Checking XEN')
         Facter::Resolvers::Xen.resolve(:vm)
       end
 
       def check_other_facts
+        @log.debug('Checking others')
         product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
         bios_vendor =  Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
         return 'kvm' if bios_vendor&.include?('Amazon EC2')
@@ -53,6 +69,7 @@ module Facts
       end
 
       def check_lspci
+        @log.debug('Checking lspci')
         Facter::Resolvers::Lspci.resolve(:vm)
       end
     end

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

@@ -14,8 +14,8 @@ module Facts
       private
 
       def construct_addresses_hash
-        primary_dhcp = Facter::Resolvers::Macosx::Networking.resolve(:dhcp)
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        primary_dhcp = Facter::Resolvers::Networking.resolve(:dhcp)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         return unless interfaces
 
         servers = { system: primary_dhcp }

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

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'interfaces'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        fact_value = Facter::Resolvers::Networking.resolve(:interfaces)
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value ? fact_value.keys.sort.join(',') : nil, :legacy)
       end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("ipaddress6_#{interface_name}", info[:ip6], :legacy) if info[:ip6]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("ipaddress_#{interface_name}", info[:ip], :legacy) if info[:ip]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("macaddress_#{interface_name}", info[:mac], :legacy) if info[:mac]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("mtu_#{interface_name}", info[:mtu], :legacy) if info[:mtu]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("netmask6_#{interface_name}", info[:netmask6], :legacy) if info[:netmask6]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("netmask_#{interface_name}", info[:netmask], :legacy) if info[:netmask]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("network6_#{interface_name}", info[:network6], :legacy) if info[:network6]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("network_#{interface_name}", info[:network], :legacy) if info[:network]
         end

data/lib/facter/facts/macosx/networking/dhcp.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.dhcp'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:dhcp)
+          fact_value = Facter::Resolvers::Networking.resolve(:dhcp)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/macosx/networking/interfaces.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.interfaces'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+          interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
 
           Facter::ResolvedFact.new(FACT_NAME, interfaces)
         end

data/lib/facter/facts/macosx/networking/ip.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:ip)
+          fact_value = Facter::Resolvers::Networking.resolve(:ip)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/macosx/networking/ip6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:ip6)
+          fact_value = Facter::Resolvers::Networking.resolve(:ip6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/macosx/networking/mac.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'macaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:mac)
+          fact_value = Facter::Resolvers::Networking.resolve(:mac)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/macosx/networking/mtu.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.mtu'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:mtu)
+          fact_value = Facter::Resolvers::Networking.resolve(:mtu)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/macosx/networking/netmask.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:netmask)
+          fact_value = Facter::Resolvers::Networking.resolve(:netmask)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/macosx/networking/netmask6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:netmask6)
+          fact_value = Facter::Resolvers::Networking.resolve(:netmask6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/macosx/networking/network.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:network)
+          fact_value = Facter::Resolvers::Networking.resolve(:network)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/macosx/networking/network6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:network6)
+          fact_value = Facter::Resolvers::Networking.resolve(:network6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/macosx/networking/primary.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.primary'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
+          fact_value = Facter::Resolvers::Networking.resolve(:primary_interface)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

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

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.scope6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:scope6)
+          fact_value = Facter::Resolvers::Networking.resolve(:scope6)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end