facter 4.0.33 → 4.0.38

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Virtual
+      FACT_NAME = '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, 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
+    end
+  end
+end

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

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

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

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

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Zones
+      FACT_NAME = 'solaris_zones.zones'
+      ALIASES = %w[
+        zone_.*_brand
+        zone_.*_iptype
+        zone_.*_name
+        zone_.*_uuid
+        zone_.*_id
+        zone_.*_path
+        zone_.*_status
+        zones
+      ].freeze
+
+      def call_the_resolver
+        resolved_facts = []
+        zones = {}
+
+        results = Facter::Resolvers::Solaris::Zone.resolve(:zone)
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless results
+
+        results&.each do |result|
+          zones.merge!(parse_result(result))
+          resolved_facts << create_legacy_zone_facts(result)
+        end
+
+        resolved_facts << Facter::ResolvedFact.new('solaris_zones.zones', zones)
+        resolved_facts << Facter::ResolvedFact.new('zones', results.count.to_s, :legacy)
+
+        resolved_facts.flatten
+      end
+
+      private
+
+      def parse_result(result)
+        {
+          result[:name].to_sym => {
+            brand: result[:brand],
+            id: result[:id],
+            ip_type: result[:iptype],
+            path: result[:path],
+            status: result[:status]
+          }
+        }
+      end
+
+      def create_legacy_zone_facts(zone)
+        legacy_facts = []
+        %w[brand iptype name uuid id path status].each do |key|
+          legacy_facts << Facter::ResolvedFact.new("zone_#{zone[:name]}_#{key}", zone[key.to_sym], :legacy)
+        end
+
+        legacy_facts
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'zpool_featureflags'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Solaris::ZPool.resolve(:zpool_featureflags)
+        fact_value = Facter::Resolvers::Zpool.resolve(:zpool_featureflags)
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end

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

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'zpool_featurenumbers'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Solaris::ZPool.resolve(:zpool_featurenumbers)
+        fact_value = Facter::Resolvers::Zpool.resolve(:zpool_featurenumbers)
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end

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

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'zpool_version'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Solaris::ZPool.resolve(:zpool_version)
+        fact_value = Facter::Resolvers::Zpool.resolve(:zpool_version)
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end

data/lib/facter/facts/ubuntu/lsbdistrelease.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ubuntu
+    class Lsbdistrelease
+      FACT_NAME = 'lsbdistrelease'
+      ALIASES = %w[lsbmajdistrelease lsbminordistrelease].freeze
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
+
+        return Facter::ResolvedFact.new(FACT_NAME, nil, :legacy) unless fact_value
+
+        version = fact_value.split('.')
+
+        [Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy),
+         Facter::ResolvedFact.new(ALIASES[0], version[0], :legacy),
+         Facter::ResolvedFact.new(ALIASES[1], version[1], :legacy)]
+      end
+    end
+  end
+end

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

@@ -14,10 +14,10 @@ module Facts
       private
 
       def construct_addresses_hash
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         return unless interfaces
 
-        servers = { system: Facter::Resolvers::Networking.resolve(:dhcp) }
+        servers = { system: Facter::Resolvers::Windows::Networking.resolve(:dhcp) }
         interfaces&.each { |interface_name, info| servers[interface_name] = info[:dhcp] if info[:dhcp] }
         servers
       end

data/lib/facter/facts/windows/ec2_metadata.rb

@@ -6,14 +6,16 @@ module Facts
       FACT_NAME = 'ec2_metadata'
 
       def call_the_resolver
-        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws?
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws_hypervisors?
 
         fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
       end
 
-      def aws?
+      private
+
+      def aws_hypervisors?
         virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
 
         virtual == 'kvm' || virtual =~ /xen/

data/lib/facter/facts/windows/ec2_userdata.rb

@@ -6,14 +6,16 @@ module Facts
       FACT_NAME = 'ec2_userdata'
 
       def call_the_resolver
-        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws?
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws_hypervisors?
 
         fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
       end
 
-      def aws?
+      private
+
+      def aws_hypervisors?
         virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
 
         virtual == 'kvm' || virtual =~ /xen/

data/lib/facter/facts/windows/gce.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class Gce
+      FACT_NAME = 'gce'
+
+      def call_the_resolver
+        virtualization = Facter::Resolvers::Virtualization.resolve(:virtual)
+
+        fact_value = virtualization&.include?('gce') ? Facter::Resolvers::Gce.resolve(:metadata) : nil
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

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

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

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/ipaddress_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/macaddress_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/mtu_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/netmask6_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/netmask_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/network6_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/network_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::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/windows/networking/dhcp.rb

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

data/lib/facter/facts/windows/networking/domain.rb

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

data/lib/facter/facts/windows/networking/fqdn.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'fqdn'
 
         def call_the_resolver
-          domain = Facter::Resolvers::Networking.resolve(:domain)
+          domain = Facter::Resolvers::Windows::Networking.resolve(:domain)
           hostname = Facter::Resolvers::Hostname.resolve(:hostname)
           return Facter::ResolvedFact.new(FACT_NAME, nil) if !hostname || hostname.empty?
 

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

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

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

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

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

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

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

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

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

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

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

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