facter 4.6.1 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1942573c832a3213d49e5b9ed2181d183a796dd60bf21a02d42aef41d6a25257
-  data.tar.gz: 0be877028bd3bf4181b988d1d643a65d7a16230c18b66b6aa1b1a5495c4eb050
+  metadata.gz: 512cdd220f22069dbf686592dfc08d3b4ecccf97702313117b333d5e568ebe8e
+  data.tar.gz: 373406fac7fe5ec363b13e6afa26acabfb6bb62716d9f0b977b1f2e768e6381d
 SHA512:
-  metadata.gz: 5df0dff2bcdc8db67cd0aa4579c5b3f1d120a784557bb9de1cf7f6855b0bc88bd893cbfdbd1e07bf251a79f4ad3db6e94211240e34ac60b6935f0cf08e1d82e5
-  data.tar.gz: 0627e49eb9f4f574847cf7923555eaf23703950ef9b947dab0c8885aec4005fd372587c6fbf4a1a22204756f84945ce675571ac0e224648804d0a16895c078a7
+  metadata.gz: ed2f2ac6dcec58364ba37df4acee50fb44f90f46f6de28f8f2524aa89d8d5634e7499be547234e65e4930126e59652b0d6b56f2d602e74598227d7808c504bf7
+  data.tar.gz: ef408018f71cd5884a56cf0dc3aab243fe119978e45c99e4b8069242d4ecf27011a3c106b53f12960665729bc0209aee452a02138e6642749f2c2b51e46a67bc

data/lib/docs/generate.rb

@@ -17,7 +17,12 @@ def format_facts(fact_hash)
   scope = OpenStruct.new({
                            facts: fact_hash
                          })
-  erb = ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
+
+  erb = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+          ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
+        else
+          ERB.new(File.read(PATH_TO_TEMPLATE), nil, '-')
+        end
   erb.result(scope.instance_eval { binding })
 end
 

data/lib/facter/config.rb

@@ -44,8 +44,9 @@ module Facter
           ]
         },
         {
-          'Bsd' => [
-            'Freebsd'
+          'Bsd' => %w[
+            Freebsd
+            Openbsd
           ]
         },
         'Solaris',

data/lib/facter/custom_facts/core/aggregate.rb

@@ -109,7 +109,7 @@ module Facter
       # @api private
       def evaluate(&block)
         if @last_evaluated
-          msg = "Already evaluated #{@name}"
+          msg = +"Already evaluated #{@name}"
           msg << " at #{@last_evaluated}" if msg.is_a? String
           msg << ', reevaluating anyways'
           log.warn msg
@@ -197,6 +197,10 @@ module Facter
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       def evaluate_params(name)
         raise ArgumentError, "#{self.class.name}#chunk requires a block" unless block_given?
         raise ArgumentError, "#{self.class.name}#expected chunk name to be a Symbol" unless name.is_a? Symbol

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

@@ -35,7 +35,7 @@ module LegacyFacter
       end
 
       # Evaluate the fact, returning true or false.
-      # if we have a block paramter then we only evaluate that instead
+      # if we have a block parameter then we only evaluate that instead
       def true?
         if @block && !@fact
           begin
@@ -54,9 +54,11 @@ module LegacyFacter
 
         return false if value.nil?
 
+        # We call the block with both the downcased and raw fact value for
+        # backwards-compatibility.
         if @block
           begin
-            return !!@block.call(value)
+            return !!@block.call(value) || !!@block.call(fact.value) # rubocop:disable Style/DoubleNegation
           rescue StandardError => e
             log.debug "Confine raised #{e.class} #{e}"
             return false

data/lib/facter/facts/linux/cloud/provider.rb

@@ -9,11 +9,14 @@ module Facts
         def call_the_resolver
           provider = case Facter::Util::Facts::Posix::VirtualDetector.platform
                      when 'hyperv'
-                       'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                       metadata = Facter::Resolvers::Az.resolve(:metadata)
+                       'azure' unless metadata.nil? || metadata.empty?
                      when 'kvm', 'xen'
-                       'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
+                       metadata = Facter::Resolvers::Ec2.resolve(:metadata)
+                       'aws' unless metadata.nil? || metadata.empty?
                      when 'gce'
-                       'gce' unless Facter::Resolvers::Gce.resolve(:metadata).empty?
+                       metadata = Facter::Resolvers::Gce.resolve(:metadata)
+                       'gce' unless metadata.nil? || metadata.empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    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/openbsd/dmi/bios/vendor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Dmi
+      module Bios
+        class Vendor
+          FACT_NAME = 'dmi.bios.vendor'
+          ALIASES = 'bios_vendor'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Openbsd::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/openbsd/dmi/bios/version.rb

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

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Dmi
+      class Manufacturer
+        FACT_NAME = 'dmi.manufacturer'
+        ALIASES = 'manufacturer'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Openbsd::DmiBios.resolve(:sys_vendor)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Dmi
+      module Product
+        class Name
+          FACT_NAME = 'dmi.product.name'
+          ALIASES = 'productname'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Openbsd::DmiBios.resolve(:product_name)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Dmi
+      module Product
+        class SerialNumber
+          FACT_NAME = 'dmi.product.serial_number'
+          ALIASES = 'serialnumber'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Openbsd::DmiBios.resolve(:product_serial)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Dmi
+      module Product
+        class Uuid
+          FACT_NAME = 'dmi.product.uuid'
+          ALIASES = 'uuid'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Openbsd::DmiBios.resolve(:product_uuid)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Ec2Metadata
+      FACT_NAME = 'ec2_metadata'
+
+      def call_the_resolver
+        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)
+      end
+
+      private
+
+      def aws_hypervisors?
+        Facter::Util::Facts::Posix::VirtualDetector.platform =~ /kvm|xen|aws/
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Ec2Userdata
+      FACT_NAME = 'ec2_userdata'
+
+      def call_the_resolver
+        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)
+      end
+
+      private
+
+      def aws_hypervisors?
+        Facter::Util::Facts::Posix::VirtualDetector.platform =~ /kvm|xen|aws/
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/facterversion.rb

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

data/lib/facter/facts/openbsd/identity/gid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Identity
+      class Gid
+        FACT_NAME = 'identity.gid'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:gid)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/identity/group.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Identity
+      class Group
+        FACT_NAME = 'identity.group'
+        ALIASES = 'gid'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:group)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/identity/privileged.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Identity
+      class Privileged
+        FACT_NAME = 'identity.privileged'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:privileged)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/identity/uid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Identity
+      class Uid
+        FACT_NAME = 'identity.uid'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:uid)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/identity/user.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Identity
+      class User
+        FACT_NAME = 'identity.user'
+        ALIASES = 'id'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:user)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Ipaddress6Interfaces
+      FACT_NAME = 'ipaddress6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        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
+
+        arr
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class IpaddressInterfaces
+      FACT_NAME = 'ipaddress_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        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
+
+        arr
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class IsVirtual
+      FACT_NAME = 'is_virtual'
+
+      def call_the_resolver
+        fact_value = Facter::Util::Facts::Posix::VirtualDetector.platform
+
+        Facter::ResolvedFact.new(FACT_NAME, check_if_virtual(fact_value))
+      end
+
+      private
+
+      def check_if_virtual(found_vm)
+        Facter::Util::Facts::PHYSICAL_HYPERVISORS.count(found_vm).zero?
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/kernel.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Kernel
+      FACT_NAME = 'kernel'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Uname.resolve(:kernelname)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/kernelrelease.rb

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

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Mountpoints
+      FACT_NAME = 'mountpoints'
+
+      def call_the_resolver
+        mountpoints = Facter::Resolvers::Openbsd::Mountpoints.resolve(FACT_NAME.to_sym)
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless mountpoints
+
+        fact = {}
+        mountpoints.each do |path, mnt|
+          fact[path.to_sym] = mnt.reject { |k| k == :path }
+        end
+
+        Facter::ResolvedFact.new(FACT_NAME, fact)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Netmask6Interfaces
+      FACT_NAME = 'netmask6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        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
+
+        arr
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class NetmaskInterfaces
+      FACT_NAME = 'netmask_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        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
+
+        arr
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Network6Interfaces
+      FACT_NAME = 'network6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        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
+
+        arr
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class NetworkInterfaces
+      FACT_NAME = 'network_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        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
+
+        arr
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Dhcp
+        FACT_NAME = 'networking.dhcp'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Openbsd::Dhcp.resolve(:dhcp)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Domain
+        FACT_NAME = 'networking.domain'
+        ALIASES = 'domain'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Hostname.resolve(:domain)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Fqdn
+        FACT_NAME = 'networking.fqdn'
+        ALIASES = 'fqdn'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Hostname.resolve(:fqdn)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end