facter 4.3.1 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3dd94ae85f9b9327eac3cbcc63794f202f4eea27d7b8c2c80b8a5b354aca94a
-  data.tar.gz: a179d9b63edb75738a22d5ed2061c0b2b4313da80dad43af2ad9eb4b1e3bee27
+  metadata.gz: 74662429c9115d4eb8feca42d49031fa3be3ff42c200a8c6ee58c664f8afa9da
+  data.tar.gz: e1c21ea94af446c6700c27db8c24f150671f7ee8410b8e070436e709ff85fc87
 SHA512:
-  metadata.gz: 33fd39d071e0033316518b51310290694d869c7b8f3b7d006c66f20629999cbcc549df6ed58b28d46c092664ba3a89c7f5813117bf5bff50c555202e79c99476
-  data.tar.gz: c824262cd5cdcb601b203bc4675c832348dce77ca9867f008a23cb8f8677812ab858cc3f11012b80deec949515d6419876b5480d25587e2a7df52c9df1c15540
+  metadata.gz: 9a1a2529c0fe5df5da517bbcc8b76b2a53c5c138af5d83ebf8dc25b051d28861816ed4b8ab6c1e167ec4c6bcef50df7d68a34abd22f04442f44eaebd499f3bef
+  data.tar.gz: 6c31e966940c2d1a525c5fb1f416b5af15e2b8c57516c92eab6e74be361d198bd6494e26b85316758e7e42ff1eecc6fc3480c3f718b8de2e7d452bcde39911f0

data/lib/docs/generate_cli.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/framework/cli/cli_launcher'
+require_relative '../facter/framework/cli/cli_launcher'
 
 cli = Facter::Cli.new([])
 

data/lib/facter/custom_facts/core/execution/base.rb

@@ -8,7 +8,7 @@ module Facter
       class Base
         STDERR_MESSAGE = 'Command %s completed with the following stderr message: %s'
         VALID_OPTIONS = %i[on_fail expand logger timeout].freeze
-
+        DEFAULT_EXECUTION_TIMEOUT = 300
         def initialize
           @log = Log.new(self)
         end
@@ -65,7 +65,7 @@ module Facter
         end
 
         def execute_command(command, on_fail = nil, logger = nil, timeout = nil)
-          timeout ||= 300
+          timeout ||= DEFAULT_EXECUTION_TIMEOUT
           begin
             # Set LC_ALL and LANG to force i18n to C for the duration of this exec;
             # this ensures that any code that parses the
@@ -98,7 +98,7 @@ module Facter
             message = "Failed while executing '#{command}': #{e.message}"
             if logger
               @log.debug(message)
-              return ''
+              return +''
             end
 
             return on_fail unless on_fail == :raise
@@ -106,6 +106,7 @@ module Facter
             raise Facter::Core::Execution::ExecutionFailure.new, message
           end
 
+          out.force_encoding(Encoding.default_external) unless out.valid_encoding?
           [out.strip, stderr]
         end
 
@@ -140,7 +141,7 @@ module Facter
 
         def builtin_command?(command)
           output, _status = Open3.capture2("type #{command}")
-          output.chomp =~ /builtin/ ? true : false
+          /builtin/.match?(output.chomp) ? true : false
         end
       end
     end

data/lib/facter/custom_facts/core/execution/posix.rb

@@ -44,7 +44,7 @@ module Facter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "'#{expanded}'" if expanded =~ /\s/
+          expanded = "'#{expanded}'" if /\s/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded

data/lib/facter/custom_facts/core/execution/windows.rb

@@ -11,7 +11,7 @@ module Facter
         def which(bin)
           # `echo` is allowed for facter 3.x compatibility, otherwise
           # all commands much be found on the PATH or absolute.
-          return bin if /^echo$/i =~ bin
+          return bin if /^echo$/i.match?(bin)
 
           if absolute_path?(bin)
             return bin if File.executable?(bin)
@@ -56,7 +56,7 @@ module Facter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "\"#{expanded}\"" if expanded =~ /\s+/
+          expanded = "\"#{expanded}\"" if /\s+/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded

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

@@ -131,7 +131,7 @@ module Facter
       #
       # @param on_fail[Object] How to behave when the command could
       #   not be run. Specifying :raise will raise an error, anything else will
-      #   return that object on failure. Default is :raise.
+      #   return that object on failure. Default is to not raise.
       # @param logger Optional logger used to log the command's stderr.
       # @param timeout Optional time out for the specified command. If no timeout is passed,
       #   a default of 300 seconds is used.

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

@@ -1,28 +1,27 @@
 # frozen_string_literal: true
 
-require 'facter/custom_facts/core/legacy_facter'
-require 'facter/custom_facts/util/fact'
-require 'facter/custom_facts/util/collection'
-require 'facter/custom_facts/util/fact'
-require 'facter/custom_facts/util/loader'
-require 'facter/custom_facts/core/execution/base'
-require 'facter/custom_facts/core/execution/windows'
-require 'facter/custom_facts/core/execution/posix'
-require 'facter/custom_facts/util/values'
-require 'facter/custom_facts/util/confine'
+require_relative '../../../facter/custom_facts/util/fact'
+require_relative '../../../facter/custom_facts/util/collection'
+require_relative '../../../facter/custom_facts/util/fact'
+require_relative '../../../facter/custom_facts/util/loader'
+require_relative '../../../facter/custom_facts/core/execution/base'
+require_relative '../../../facter/custom_facts/core/execution/windows'
+require_relative '../../../facter/custom_facts/core/execution/posix'
+require_relative '../../../facter/custom_facts/util/values'
+require_relative '../../../facter/custom_facts/util/confine'
 
-require 'facter/custom_facts/util/config'
+require_relative '../../../facter/custom_facts/util/config'
 
-require 'facter/custom_facts/util/normalization'
-require 'facter/custom_facts/core/execution'
-require 'facter/custom_facts/core/resolvable'
-require 'facter/custom_facts/core/suitable'
-require 'facter/custom_facts/util/resolution'
-require 'facter/custom_facts/core/directed_graph'
-require 'facter/custom_facts/core/resolvable'
-require 'facter/custom_facts/core/aggregate'
-require 'facter/custom_facts/util/composite_loader'
-require 'facter/custom_facts/util/parser'
-require 'facter/custom_facts/util/directory_loader'
-require 'facter/custom_facts/util/nothing_loader'
-require 'facter/custom_facts/util/nothing_loader'
+require_relative '../../../facter/custom_facts/util/normalization'
+require_relative '../../../facter/custom_facts/core/execution'
+require_relative '../../../facter/custom_facts/core/resolvable'
+require_relative '../../../facter/custom_facts/core/suitable'
+require_relative '../../../facter/custom_facts/util/resolution'
+require_relative '../../../facter/custom_facts/core/directed_graph'
+require_relative '../../../facter/custom_facts/core/resolvable'
+require_relative '../../../facter/custom_facts/core/aggregate'
+require_relative '../../../facter/custom_facts/util/composite_loader'
+require_relative '../../../facter/custom_facts/util/parser'
+require_relative '../../../facter/custom_facts/util/directory_loader'
+require_relative '../../../facter/custom_facts/util/nothing_loader'
+require_relative '../../../facter/custom_facts/util/nothing_loader'

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

@@ -18,7 +18,7 @@
 
 require 'pathname'
 
-require 'facter/custom_facts/core/file_loader'
+require_relative '../../../facter/custom_facts/core/file_loader'
 
 # Functions as a hash of 'facts' about your system system, such as MAC
 # address, IP address, architecture, etc.

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

@@ -38,11 +38,7 @@ module LegacyFacter
       #
       # Attempt to normalize and validate the given string.
       #
-      # On Ruby 1.8 the string is checked by stripping out all non UTF-8
-      # characters and comparing the converted string to the original. If they
-      # do not match then the string is considered invalid.
-      #
-      # On Ruby 1.9+, the string is validate by checking that the string encoding
+      # The string is validated by checking that the string encoding
       # is UTF-8 and that the string content matches the encoding. If the string
       # is not an expected encoding then it is converted to UTF-8.
       #
@@ -51,27 +47,16 @@ module LegacyFacter
       # @param value [String]
       # @return [void]
 
-      if RUBY_VERSION =~ /^1\.8/
-        require 'iconv'
-
-        def normalize_string(value)
-          converted = Iconv.conv('UTF-8//IGNORE', 'UTF-8', value)
-          raise NormalizationError, "String #{value.inspect} is not valid UTF-8" if converted != value
+      def normalize_string(value)
+        value = value.encode(Encoding::UTF_8)
 
-          value
+        unless value.valid_encoding?
+          raise NormalizationError, "String #{value.inspect} doesn't match the reported encoding #{value.encoding}"
         end
-      else
-        def normalize_string(value)
-          value = value.encode(Encoding::UTF_8)
 
-          unless value.valid_encoding?
-            raise NormalizationError, "String #{value.inspect} doesn't match the reported encoding #{value.encoding}"
-          end
-
-          value
-        rescue EncodingError
-          raise NormalizationError, "String encoding #{value.encoding} is not UTF-8 and could not be converted to UTF-8"
-        end
+        value
+      rescue EncodingError
+        raise NormalizationError, "String encoding #{value.encoding} is not UTF-8 and could not be converted to UTF-8"
       end
 
       # Validate all elements of the array.

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

@@ -4,7 +4,7 @@ module LegacyFacter
   module Util
     module Root
       def self.root?
-        require 'facter/resolvers/windows/ffi/identity_ffi'
+        require_relative '../../../facter/resolvers/windows/ffi/identity_ffi'
         IdentityFFI.privileged?
       end
     end

data/lib/facter/facts/debian/architecture.rb

@@ -10,7 +10,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:machine)
           fact_value = 'amd64' if fact_value == 'x86_64'
-          fact_value = 'i386' if fact_value =~ /i[3456]86|pentium/
+          fact_value = 'i386' if /i[3456]86|pentium/.match?(fact_value)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

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

@@ -52,9 +52,9 @@ module Facts
 
           return { google: true } if manufacturer == 'Google'
 
-          return { openstack: true } if manufacturer =~ /^OpenStack/
+          return { openstack: true } if /^OpenStack/.match?(manufacturer)
 
-          return { amazon: true } if manufacturer =~ /^Amazon/
+          return { amazon: true } if /^Amazon/.match?(manufacturer)
 
           {}
         end

data/lib/facter/facts/linux/os/architecture.rb

@@ -10,7 +10,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:machine)
 
-          fact_value = 'i386' if fact_value =~ /i[3456]86|pentium/
+          fact_value = 'i386' if /i[3456]86|pentium/.match?(fact_value)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

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

@@ -11,6 +11,10 @@ module Facts
 
       def partitions
         parts = Facter::Resolvers::Partitions.resolve(:partitions)
+        # We should exit early if we are running on a node with no partitions
+        # (e.g. a diskless, netbooted VM)
+        return nil unless parts
+
         mountpoints = Facter::Resolvers::Mountpoints.resolve(:mountpoints)
         return parts unless mountpoints
 

data/lib/facter/facts/linux/processors/isa.rb

@@ -9,16 +9,7 @@ module Facts
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:processor)
-          isa = get_isa(fact_value)
-
-          [Facter::ResolvedFact.new(FACT_NAME, isa), Facter::ResolvedFact.new(ALIASES, isa, :legacy)]
-        end
-
-        private
-
-        def get_isa(fact_value)
-          value_split = fact_value.split('.')
-          value_split.last
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facter/facts/ol/lsbdistdescription.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    class Lsbdistdescription
+      FACT_NAME = 'lsbdistdescription'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/ol/lsbdistid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    class Lsbdistid
+      FACT_NAME = 'lsbdistid'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/ol/os/distro/description.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    module Os
+      module Distro
+        class Description
+          FACT_NAME = 'os.distro.description'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::OsRelease.resolve(:pretty_name)
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/ol/os/distro/id.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ol
+    module Os
+      module Distro
+        class Id
+          FACT_NAME = 'os.distro.id'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::OsRelease.resolve(:id).capitalize
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/hypervisors/kvm.rb

@@ -27,9 +27,9 @@ module Facts
 
           return { google: true } if manufacturer == 'Google'
 
-          return { openstack: true } if Facter::Resolvers::DMIComputerSystem.resolve(:name) =~ /^OpenStack/
+          return { openstack: true } if /^OpenStack/.match?(Facter::Resolvers::DMIComputerSystem.resolve(:name))
 
-          return { amazon: true } if manufacturer =~ /^Amazon/
+          return { amazon: true } if /^Amazon/.match?(manufacturer)
         end
       end
     end

data/lib/facter/framework/cli/cli_launcher.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'facter/framework/logging/logger.rb'
+require_relative '../../../facter/framework/logging/logger.rb'
 Facter::Log.output(STDERR)
-require 'facter'
-require 'facter/framework/cli/cli'
+require_relative '../../../facter'
+require_relative '../../../facter/framework/cli/cli'
 
 class CliLauncher
   class << self

data/lib/facter/framework/config/config_reader.rb

@@ -38,6 +38,10 @@ module Facter
         @conf = {}
       end
 
+      def clear
+        @conf = {}
+      end
+
       private
 
       def log

data/lib/facter/framework/config/fact_groups.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/config'
+require_relative '../../../facter/config'
 
 module Facter
   class FactGroups
@@ -64,7 +64,7 @@ module Facter
     def get_fact(fact_name)
       return @facts_ttls[fact_name] if @facts_ttls[fact_name]
 
-      result = @facts_ttls.select { |name, fact| break fact if fact_name =~ /^#{name}\..*/ }
+      result = @facts_ttls.select { |name, fact| break fact if /^#{name}\..*/.match?(fact_name) }
       return nil if result == {}
 
       result

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -21,7 +21,19 @@ module Facter
     def load(user_query, options)
       @internal_facts = load_internal_facts(user_query, options)
       @custom_facts = load_custom_facts(options)
-      @external_facts = load_external_facts(options)
+      if ENV['INSIDE_FACTER']
+        @log.debug('INSIDE_FACTER env var detected, not loading external facts to prevent recursion')
+        if options[:external_facts]
+          @log.warn('Recursion detected, skipping external facts. Silence this warning by adding --no-external-facts')
+        end
+      else
+        begin
+          ENV['INSIDE_FACTER'] = 'true'
+          @external_facts = load_external_facts(options)
+        ensure
+          ENV.delete('INSIDE_FACTER')
+        end
+      end
 
       filter_env_facts
 
@@ -103,7 +115,7 @@ module Facter
 
       blocked_facts.each do |blocked|
         facts.each do |fact|
-          next unless fact.name =~ /^#{blocked}\..*|^#{blocked}$/
+          next unless /^#{blocked}\..*|^#{blocked}$/.match?(fact.name)
 
           if fact.type == :core
             reject_list_core << fact