facter 4.0.47 → 4.0.52

data/lib/facter/facts/sles/os/distro/codename.rb

@@ -6,13 +6,12 @@ module Facts
       module Distro
         class Codename
           FACT_NAME = 'os.distro.codename'
-          ALIASES = 'lsbdistcodename'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:codename)
+            fact_value = Facter::Resolvers::OsRelease.resolve(:version_codename)
+            fact_value = 'n/a' if !fact_value || fact_value.empty?
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

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

@@ -6,13 +6,10 @@ module Facts
       module Distro
         class Description
           FACT_NAME = 'os.distro.description'
-          ALIASES = 'lsbdistdescription'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
-
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            fact_value = Facter::Resolvers::OsRelease.resolve(:pretty_name)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

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

@@ -6,13 +6,14 @@ module Facts
       module Distro
         class Id
           FACT_NAME = 'os.distro.id'
-          ALIASES = 'lsbdistid'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
-
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            fact_value = if Facter::Resolvers::OsRelease.resolve(:version_id).start_with?('12')
+                           'SUSE LINUX'
+                         else
+                           'SUSE'
+                         end
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

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

@@ -9,20 +9,25 @@ module Facts
           ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
-            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
+            version = Facter::Resolvers::OsRelease.resolve(:version_id)
+            fact_value = build_fact_list(version)
 
-            versions = fact_value.split('.')
-            release = {
-              'full' => fact_value,
-              'major' => versions[0],
-              'minor' => versions[1]
-            }
+            [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
 
-            [Facter::ResolvedFact.new(FACT_NAME, release),
-             Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
-             Facter::ResolvedFact.new(ALIASES[1], versions[0], :legacy),
-             Facter::ResolvedFact.new(ALIASES[2], versions[1], :legacy)]
+          def build_fact_list(version)
+            if version.include?('.')
+              {
+                full: version,
+                major: version.split('.').first,
+                minor: version.split('.').last
+              }
+            else
+              { full: version, major: version, minor: nil }
+            end
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Facts
   module Solaris
     class Disks
       FACT_NAME = 'disks'
-      ALIASES = %w[blockdevices blockdevice_.*_size blockdevice_.*_vendor'].freeze
+      ALIASES = %w[blockdevices blockdevice_.*_size blockdevice_.*_vendor].freeze
 
       def call_the_resolver
         facts = []

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

@@ -16,7 +16,7 @@ module Facts
       end
 
       def resolver_data
-        Facter::Resolvers::SshResolver.resolve(:ssh)
+        Facter::Resolvers::Ssh.resolve(:ssh)
       end
 
       def create_ssh_fact(ssh)

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         facts = []
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
         result.each { |ssh| facts << Facter::ResolvedFact.new("ssh#{ssh.name.to_sym}key", ssh.key, :legacy) }
         facts
       end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         facts = []
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
         result.each do |ssh|
           facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}",
                                             "#{ssh.fingerprint.sha1}\n#{ssh.fingerprint.sha256}", :legacy)

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

@@ -15,8 +15,8 @@ module Facts
         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)]
+         Facter::ResolvedFact.new(ALIASES[0], "#{version[0]}.#{version[1]}", :legacy),
+         Facter::ResolvedFact.new(ALIASES[1], version[2], :legacy)]
       end
     end
   end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class AzMetadata
+      FACT_NAME = 'az_metadata'
+
+      def initialize
+        @virtual = Facter::Util::Facts::VirtualDetector.new
+      end
+
+      def call_the_resolver
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless azure_hypervisor?
+
+        fact_value = Facter::Resolvers::Az.resolve(:metadata)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+      end
+
+      private
+
+      def azure_hypervisor?
+        @virtual.platform == 'hyperv'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module Cloud
+      class Provider
+        FACT_NAME = 'cloud.provider'
+
+        def call_the_resolver
+          az_metadata = Facter::Resolvers::Az.resolve(:metadata)
+
+          Facter::ResolvedFact.new(FACT_NAME, az_metadata&.empty? ? nil : 'azure')
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Facts
           hostname = Facter::Resolvers::Hostname.resolve(:hostname)
           return Facter::ResolvedFact.new(FACT_NAME, nil) if !hostname || hostname.empty?
 
-          fact_value = [hostname, domain].compact.join('.')
+          fact_value = domain && !domain.empty? ? [hostname, domain].compact.join('.') : hostname
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

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

@@ -134,9 +134,9 @@ module Facter
 
     desc '--list-block-groups', 'List block groups'
     map ['--list-block-groups'] => :list_block_groups
-    def list_block_groups(*args)
+    def list_block_groups
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
-      Facter::Options.init_from_cli(options, args)
+      Facter::Options.init_from_cli(options)
 
       block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
       block_groups.gsub!(/:\s*\n/, "\n")
@@ -146,9 +146,9 @@ module Facter
 
     desc '--list-cache-groups', 'List cache groups'
     map ['--list-cache-groups'] => :list_cache_groups
-    def list_cache_groups(*args)
+    def list_cache_groups
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
-      Facter::Options.init_from_cli(options, args)
+      Facter::Options.init_from_cli(options)
 
       cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
       cache_groups.gsub!(/:\s*\n/, "\n")
@@ -156,12 +156,10 @@ module Facter
       puts cache_groups
     end
 
-    desc '--puppet, -p', '(NOT SUPPORTED)Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
+    desc '--puppet, -p', 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
     map ['--puppet', '-p'] => :puppet
     def puppet(*args)
-      log = Log.new(self)
-      log.warn('`facter --puppet` and `facter -p` are no longer supported, use `puppet facts show` instead')
-      log.warn('the output does not contain puppet facts!')
+      Facter.puppet_facts
 
       output, status = Facter.to_user_output(@options, *args)
       puts output

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

@@ -33,11 +33,20 @@ module Facter
 
       def refresh_config(config_path)
         @conf = File.readable?(config_path) ? Hocon.load(config_path) : {}
+      rescue StandardError => e
+        log.warn("Facter failed to read config file #{config_path} with the following error: #{e.message}")
+        @conf = {}
       end
 
       private
 
+      def log
+        @log ||= Log.new(self)
+      end
+
       def default_path
+        return '' if RUBY_PLATFORM == 'java'
+
         os = OsDetector.instance.identifier
 
         windows_path = File.join('C:', 'ProgramData', 'PuppetLabs', 'facter', 'etc', 'facter.conf')

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

@@ -7,7 +7,15 @@ module Facter
     attr_accessor :groups_ttls
     attr_reader :groups, :block_list, :facts_ttls
 
-    STRING_TO_SECONDS = { 'seconds' => 1, 'minutes' => 60, 'hours' => 3600, 'days' => 3600 * 24 }.freeze
+    STRING_TO_SECONDS = { 'ns' => 1.fdiv(1_000_000_000), 'nanos' => 1.fdiv(1_000_000_000),
+                          'nanoseconds' => 1.fdiv(1_000_000_000),
+                          'us' => 1.fdiv(1_000_000), 'micros' => 1.fdiv(1_000_000), 'microseconds' => 1.fdiv(1_000_000),
+                          '' => 1.fdiv(1000), 'ms' => 1.fdiv(1000), 'milis' => 1.fdiv(1000),
+                          'milliseconds' => 1.fdiv(1000),
+                          's' => 1, 'seconds' => 1,
+                          'm' => 60, 'minutes' => 60,
+                          'h' => 3600, 'hours' => 3600,
+                          'd' => 3600 * 24, 'days' => 3600 * 24 }.freeze
 
     def initialize
       @groups = Facter::Config::FACT_GROUPS.dup
@@ -24,6 +32,9 @@ module Facter
       fact_list = []
 
       @block_list.each do |group_name|
+        # legacy is a special group and does not need to be broken into facts
+        next if group_name == 'legacy'
+
         facts_for_block = @groups[group_name]
 
         fact_list += facts_for_block || [group_name]
@@ -100,7 +111,22 @@ module Facter
 
     def ttls_to_seconds(ttls)
       duration, unit = ttls.split(' ', 2)
-      duration.to_i * STRING_TO_SECONDS[unit]
+      unit = '' if duration && !unit
+      unit = append_s(unit)
+      seconds = STRING_TO_SECONDS[unit]
+      if seconds
+        (duration.to_i * seconds).to_i
+      else
+        log = Log.new(self)
+        log.error("Could not parse time unit #{unit} (try #{STRING_TO_SECONDS.keys.reject(&:empty?).join(', ')})")
+        nil
+      end
+    end
+
+    def append_s(unit)
+      return unit + 's' if unit.length > 2 && unit[-1] != 's'
+
+      unit
     end
   end
 end

data/lib/facter/framework/core/cache_manager.rb

@@ -209,7 +209,11 @@ cache_format_version is incorrect!")
     def delete_cache(group_name)
       cache_file_name = File.join(@cache_dir, group_name)
 
-      File.delete(cache_file_name) if File.readable?(cache_file_name)
+      begin
+        File.delete(cache_file_name) if File.readable?(cache_file_name)
+      rescue Errno::EACCES => e
+        @log.warn("Could not delete cache: #{e.message}")
+      end
     end
   end
 end

data/lib/facter/framework/core/fact_filter.rb

@@ -5,8 +5,8 @@ module Facter
   # e.g. os.release.major is the user query, os.release is the fact
   # and major is the filter criteria inside tha fact
   class FactFilter
-    def filter_facts!(searched_facts)
-      filter_legacy_facts!(searched_facts)
+    def filter_facts!(searched_facts, user_query)
+      filter_legacy_facts!(searched_facts) if user_query.empty?
       filter_blocked_legacy_facts!(searched_facts)
 
       searched_facts.each do |fact|
@@ -32,7 +32,7 @@ module Facter
     end
 
     def filter_legacy_facts!(resolved_facts)
-      return unless !Options[:show_legacy] && Options[:user_query].empty?
+      return if Options[:show_legacy]
 
       resolved_facts.reject!(&:legacy?)
     end

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

@@ -10,10 +10,6 @@ module Facter
       @external_facts = load_external_facts
     end
 
-    def all_facts
-      @all_facts ||= Utils.deep_copy(custom_facts + external_facts)
-    end
-
     private
 
     def load_custom_facts

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

@@ -48,7 +48,6 @@ module Facter
     def load_internal_facts(options)
       @log.debug('Loading internal facts')
       internal_facts = []
-
       if options[:user_query] || options[:show_legacy]
         # if we have a user query, then we must search in core facts and legacy facts
         @log.debug('Loading all internal facts')
@@ -83,6 +82,8 @@ module Facter
     def block_facts(facts, options)
       blocked_facts = options[:blocked_facts] || []
 
+      facts.reject! { |fact| fact.type == :legacy } if options[:block_list]&.include?('legacy')
+
       reject_list_core, reject_list_legacy = construct_reject_lists(blocked_facts, facts)
 
       facts = facts.reject do |fact|

data/lib/facter/framework/core/fact_manager.rb

@@ -29,7 +29,7 @@ module Facter
       resolved_facts = resolved_facts.concat(cached_facts)
       cache_manager.cache_facts(resolved_facts)
 
-      FactFilter.new.filter_facts!(resolved_facts)
+      FactFilter.new.filter_facts!(resolved_facts, user_query)
 
       log_resolved_facts(resolved_facts)
       resolved_facts
@@ -40,7 +40,7 @@ module Facter
 
       searched_facts = QueryParser.parse(user_query, loaded_facts_hash)
       resolved_facts = @internal_fact_mgr.resolve_facts(searched_facts)
-      FactFilter.new.filter_facts!(resolved_facts)
+      FactFilter.new.filter_facts!(resolved_facts, user_query)
 
       resolved_facts
     end
@@ -48,7 +48,9 @@ module Facter
     private
 
     def parse_user_query(user_query)
-      loaded_facts = @fact_loader.load(Options.get)
+      options = Options.get
+      options[:user_query] = user_query
+      loaded_facts = @fact_loader.load(options)
 
       QueryParser.parse(user_query, loaded_facts)
     end

data/lib/facter/framework/core/options.rb

@@ -41,10 +41,9 @@ module Facter
         store(ConfigFileOptions.get)
       end
 
-      def init_from_cli(cli_options = {}, user_query = nil)
+      def init_from_cli(cli_options = {})
         Facter::OptionStore.cli = true
         Facter::OptionStore.show_legacy = false
-        Facter::OptionStore.user_query = user_query
         Facter::OptionStore.trace = cli_options[:trace]
         OptionStore.set(:config, cli_options[:config])
         ConfigFileOptions.init(cli_options[:config])

data/lib/facter/framework/core/options/option_store.rb

@@ -13,7 +13,6 @@ module Facter
     @ruby = true
     @external_facts = true
     @config = nil
-    @user_query = []
     @strict = false
     @json = false
     @cache = true
@@ -34,15 +33,17 @@ module Facter
     @timing = false
     @external_dir = []
     @custom_dir = []
+    @hocon = false
+    @allow_external_loggers = true
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy,
                   :custom_facts, :blocked_facts, :ruby, :external_facts
 
-      attr_accessor :config, :user_query, :strict, :json,
+      attr_accessor :config, :strict, :json,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color, :trace, :sequential, :timing
+                    :block_list, :color, :trace, :sequential, :timing, :hocon, :allow_external_loggers
 
       attr_writer :external_dir
 
@@ -169,15 +170,14 @@ module Facter
         @log_level = :warn
         @show_legacy = true
         @ruby = true
-        @user_query = []
         @json = false
+        @hocon = false
         @cache = true
         @yaml = false
         @puppet = false
         @ttls = []
         @block = true
         @cli = nil
-        @custom_facts = true
         reset_config
       end
 
@@ -196,6 +196,12 @@ module Facter
         @ttls = []
         @trace = false
         @timing = false
+        @allow_external_loggers = true
+        reset_facts
+      end
+
+      def reset_facts
+        @custom_facts = true
         @external_dir = []
         @custom_dir = []
       end