facter 4.0.15 → 4.0.16

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

@@ -1,71 +1,81 @@
 # frozen_string_literal: true
 
 module Facter
-  module ConfigFileOptions
-    def augment_with_config_file_options!(config_path)
-      conf_reader = Facter::ConfigReader.new(config_path)
-
-      augment_config_path(config_path)
-      if @priority_options[:is_cli]
-        augment_cli(conf_reader.cli)
-        augment_ruby(conf_reader.global)
+  class ConfigFileOptions
+    class << self
+      def init(config_path = nil)
+        @options = {}
+        Facter::ConfigReader.init(config_path)
+
+        augment_config_path(config_path)
+
+        if Options.cli?
+          augment_cli(Facter::ConfigReader.cli)
+          augment_ruby(Facter::ConfigReader.global)
+        end
+        augment_custom(Facter::ConfigReader.global)
+        augment_external(Facter::ConfigReader.global)
+        augment_show_legacy(Facter::ConfigReader.global)
+        augment_facts(Facter::ConfigReader.ttls)
+      end
+
+      def get
+        @options || {}
       end
-      augment_custom(conf_reader.global)
-      augment_external(conf_reader.global)
-      augment_show_legacy(conf_reader.global)
-      augment_facts(conf_reader.ttls)
-    end
 
-    private
+      private
 
-    def augment_config_path(config_path)
-      @options[:config] = config_path
-    end
+      def augment_config_path(config_path)
+        @options[:config] = config_path
+      end
 
-    def augment_cli(file_cli_conf)
-      return unless file_cli_conf
+      def augment_cli(file_cli_conf)
+        return unless file_cli_conf
 
-      @options[:debug] = file_cli_conf['debug'] unless file_cli_conf['debug'].nil?
-      @options[:trace] = file_cli_conf['trace'] unless file_cli_conf['trace'].nil?
-      @options[:verbose] = file_cli_conf['verbose'] unless file_cli_conf['verbose'].nil?
-      @options[:log_level] = file_cli_conf['log-level'].to_sym unless file_cli_conf['log-level'].nil?
-    end
+        @options[:debug] = file_cli_conf['debug'] unless file_cli_conf['debug'].nil?
+        @options[:trace] = file_cli_conf['trace'] unless file_cli_conf['trace'].nil?
+        @options[:verbose] = file_cli_conf['verbose'] unless file_cli_conf['verbose'].nil?
+        @options[:log_level] = file_cli_conf['log-level'].to_sym unless file_cli_conf['log-level'].nil?
+      end
+
+      def augment_custom(file_global_conf)
+        return unless file_global_conf
 
-    def augment_custom(file_global_conf)
-      return unless file_global_conf
+        if Options.cli?
+          @options[:custom_facts] = !file_global_conf['no-custom-facts'] unless file_global_conf['no-custom-facts'].nil?
+        end
 
-      if @priority_options[:is_cli]
-        @options[:custom_facts] = !file_global_conf['no-custom-facts'] unless file_global_conf['no-custom-facts'].nil?
+        @options[:custom_dir] = file_global_conf['custom-dir'] unless file_global_conf['custom-dir'].nil?
       end
-      @options[:custom_dir] = [file_global_conf['custom-dir']].flatten unless file_global_conf['custom-dir'].nil?
-    end
 
-    def augment_external(global_conf)
-      return unless global_conf
+      def augment_external(global_conf)
+        return unless global_conf
+
+        if Options.cli?
+          @options[:external_facts] = !global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+        end
 
-      if @priority_options[:is_cli]
-        @options[:external_facts] = !global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+        @options[:external_dir] = [global_conf['external-dir']].flatten unless global_conf['external-dir'].nil?
       end
-      @options[:external_dir] = [global_conf['external-dir']].flatten unless global_conf['external-dir'].nil?
-    end
 
-    def augment_ruby(global_conf)
-      return unless global_conf
+      def augment_ruby(global_conf)
+        return unless global_conf
 
-      @options[:ruby] = !global_conf['no-ruby'] unless global_conf['no-ruby'].nil?
-    end
+        @options[:ruby] = global_conf['no-ruby'].nil? ? true : !global_conf['no-ruby']
+      end
 
-    def augment_show_legacy(global_conf)
-      return unless global_conf
+      def augment_show_legacy(global_conf)
+        return unless global_conf
 
-      @options[:show_legacy] = global_conf['show-legacy'] unless global_conf['show-legacy'].nil?
-    end
+        @options[:show_legacy] = global_conf['show-legacy'] unless global_conf['show-legacy'].nil?
+      end
 
-    def augment_facts(ttls)
-      blocked_facts = Facter::BlockList.instance.blocked_facts
-      @options[:blocked_facts] = blocked_facts unless blocked_facts.nil?
+      def augment_facts(ttls)
+        blocked_facts = Facter::BlockList.new.blocked_facts
+        @options[:blocked_facts] = blocked_facts unless blocked_facts.nil?
 
-      @options[:ttls] = ttls unless ttls.nil?
+        @options[:ttls] = ttls unless ttls.nil?
+      end
     end
   end
 end

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

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+module Facter
+  class OptionStore
+    # default options
+    @debug = false
+    @trace = false
+    @verbose = false
+    # TODO: constant is not yet available when running puppet facts
+    @log_level = :warn
+    @show_legacy = true
+    @block = true
+    @custom_dir = []
+    @custom_facts = true
+    @external_dir = []
+    @external_facts = true
+    @ruby = true
+    @blocked_facts = []
+    @user_query = []
+
+    class << self
+      attr_reader :debug, :verbose, :log_level, :show_legacy, :trace,
+                  :custom_dir, :external_dir, :ruby,
+                  :custom_facts, :blocked_facts
+
+      attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
+                    :cache, :yaml, :puppet, :ttls, :block, :cli
+
+      def all
+        options = {}
+        instance_variables.each do |iv|
+          variable_name = iv.to_s.delete('@')
+          options[variable_name.to_sym] = OptionStore.send(variable_name.to_sym)
+        end
+        options
+      end
+
+      def ruby=(bool)
+        if bool == true
+          @ruby = true
+        else
+          @ruby = false
+          @custom_facts = false
+          @blocked_facts << 'ruby'
+        end
+      end
+
+      def external_dir=(dirs)
+        return unless dirs.any?
+
+        @external_dir = dirs
+      end
+
+      def blocked_facts=(*facts)
+        @blocked_facts += [*facts]
+
+        @blocked_facts.flatten!
+      end
+
+      def custom_dir=(*dirs)
+        return unless dirs.any?
+
+        @ruby = true
+
+        @custom_dir = [*dirs]
+        @custom_dir.flatten!
+      end
+
+      def debug=(bool)
+        if bool == true
+          self.log_level = :debug
+        else
+          @debug = false
+          self.log_level = Facter::DEFAULT_LOG_LEVEL
+        end
+      end
+
+      def verbose=(bool)
+        if bool == true
+          @verbose = true
+          self.log_level = :info
+        else
+          @verbose = false
+          self.log_level = Facter::DEFAULT_LOG_LEVEL
+        end
+      end
+
+      def custom_facts=(bool)
+        if bool == true
+          @custom_facts = true
+          @ruby = true
+        else
+          @custom_facts = false
+        end
+      end
+
+      def log_level=(level)
+        level = level.to_sym
+        case level
+        when :trace
+          @log_level = :debug
+          @trace = true
+        when :debug
+          @log_level = :debug
+          @debug = true
+        else
+          @log_level = level
+        end
+
+        Facter::Log.level = @log_level
+        Facter.trace(@trace)
+      end
+
+      def show_legacy=(bool)
+        if bool == true
+          @show_legacy = bool
+          @ruby = true
+        else
+          @show_legacy = false
+        end
+      end
+
+      def trace=(bool)
+        if bool == true
+          self.log_level = :trace
+        else
+          @log_level = Facter::DEFAULT_LOG_LEVEL
+          @trace = false
+          Facter.trace(false)
+        end
+      end
+
+      def set(key, value)
+        send("#{key}=".to_sym, value)
+      end
+
+      def reset
+        @debug = false
+        @trace = false
+        @verbose = false
+        # TODO: constant is not yet available when running puppet facts
+        @log_level = :warn
+        @show_legacy = true
+        @block = true
+        @custom_dir = []
+        @custom_facts = true
+        @external_dir = []
+        @external_facts = true
+        @ruby = true
+        @blocked_facts = []
+        @user_query = []
+        @cli = nil
+      end
+    end
+  end
+end

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

@@ -33,11 +33,51 @@ module Facter
     end
 
     def self.write_error_and_exit(message)
-      Options.augment_with_priority_options!(is_cli: true)
       log = Facter::Log.new(self)
       log.error(message, true)
-      Cli.start(['--help'])
+      Facter::Cli.start(['--help'])
+
       exit 1
     end
+
+    def self.validate_configs(options)
+      conflicting_configs(options).each do |op|
+        next unless op.values[0] && op.values[1]
+
+        message = "#{op.keys[0]} and #{op.keys[1]} options conflict: please specify only one"
+        write_error_and_exit(message)
+      end
+      validate_log_options(options)
+    end
+
+    def self.conflicting_configs(options)
+      no_ruby = !options[:ruby]
+      no_custom_facts = !options[:custom_facts]
+      puppet = options[:puppet]
+      custom_dir = options[:custom_dir].nil? ? false : options[:custom_dir].any?
+      external_dir = options[:external_dir].nil? ? false : options[:external_dir].any?
+
+      [
+        { 'no-ruby' => no_ruby, 'custom-dir' => custom_dir },
+        { 'no-external-facts' => !options[:external_facts], 'external-dir' => external_dir },
+        { 'no-custom-facts' => no_custom_facts, 'custom-dir' => custom_dir },
+        { 'no-ruby' => no_ruby, 'puppet' => puppet },
+        { 'no-custom-facts' => no_custom_facts, 'puppet' => puppet }
+      ]
+    end
+
+    def self.validate_log_options(options)
+      # TODO: find a better way to do this
+      return if options[:debug] == true && options[:log_level] == :debug
+      return if options[:verbose] == true && options[:log_level] == :info
+
+      return unless [options[:debug],
+                     options[:verbose],
+                     options[:log_level] != Facter::DEFAULT_LOG_LEVEL]
+                    .count(true) > 1
+
+      message = 'debug, verbose, and log-level options conflict: please specify only one.'
+      write_error_and_exit(message)
+    end
   end
 end

data/lib/framework/logging/logger.rb

@@ -4,6 +4,7 @@ require 'logger'
 
 module Facter
   RED = 31
+  DEFAULT_LOG_LEVEL = :warn
 
   class Log
     @@legacy_logger = nil
@@ -38,6 +39,7 @@ module Facter
       return if @@legacy_logger
 
       @@legacy_logger = Logger.new(output)
+      @@legacy_logger.level = DEFAULT_LOG_LEVEL
       set_format_for_legacy_logger
       @@logger.add_logger(@@legacy_logger)
     end

data/lib/framework/parsers/query_parser.rb

@@ -71,7 +71,7 @@ module Facter
       end
 
       def found_fact?(fact_name, query_fact)
-        fact_with_wildcard = fact_name.include?('.*')
+        fact_with_wildcard = fact_name.include?('.*') && !query_fact.include?('.')
 
         return false if fact_with_wildcard && !query_fact.match("^#{fact_name}$")
 

data/lib/models/fact_collection.rb

@@ -8,7 +8,7 @@ module Facter
 
     def build_fact_collection!(facts)
       facts.each do |fact|
-        next if fact.type == :core && fact.value.nil?
+        next if %i[core legacy].include?(fact.type) && fact.value.nil?
 
         bury_fact(fact)
       end

data/lib/resolvers/aix/filesystem_resolver.rb

@@ -15,9 +15,10 @@ module Facter
           end
 
           def read_vtf_file(fact_name)
-            return unless File.readable?('/etc/vfs')
+            file_content = Util::FileHelper.safe_readlines('/etc/vfs')
+            return if file_content.empty?
 
-            file_content = File.readlines('/etc/vfs').map do |line|
+            file_content = file_content.map do |line|
               next if line =~ /#|%/ # skip lines that are comments or defaultvfs line
 
               line.split(' ').first

data/lib/resolvers/aix/partitions.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Partitions < BaseResolver
+        @log = Facter::Log.new(self)
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          MEGABYTES_EXPONENT = 1024**2
+          GIGABYTES_EXPONENT = 1024**3
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { query_cudv(fact_name) }
+          end
+
+          def query_cudv(fact_name)
+            @fact_list[:partitions] = {}
+
+            odmquery = Facter::ODMQuery.new
+            odmquery.equals('PdDvLn', 'logical_volume/lvsubclass/lvtype')
+
+            result = odmquery.execute
+
+            return unless result
+
+            result.each_line do |line|
+              next unless line.include?('name')
+
+              part_name = line.split('=')[1].strip.delete('"')
+              part = "/dev/#{part_name}"
+              info = populate_from_lslv(part_name)
+              @fact_list[:partitions][part] = info if info
+            end
+
+            @fact_list[fact_name]
+          end
+
+          def populate_from_lslv(name)
+            stdout, stderr, _status = Open3.capture3("lslv -L #{name}")
+            if stdout.empty?
+              @log.debug(stderr)
+              return
+            end
+
+            info_hash = extract_info(stdout)
+            size_bytes = compute_size(info_hash)
+
+            part_info = {
+              filesystem: info_hash['TYPE'],
+              size_bytes: size_bytes,
+              size: Facter::BytesToHumanReadable.convert(size_bytes)
+            }
+            mount = info_hash['MOUNTPOINT']
+            label = info_hash['LABEL']
+            part_info[:mount] = mount unless %r{N/A} =~ mount
+            part_info[:label] = label unless /None/ =~ label
+            part_info
+          end
+
+          def extract_info(lsl_content)
+            lsl_content = lsl_content.strip.split("\n").map do |line|
+              next unless /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/ =~ line
+
+              line.split(/:|\s\s/).reject(&:empty?)
+            end
+
+            lsl_content.flatten!.select! { |elem| elem }.map! { |elem| elem.delete("\s") }
+
+            Hash[*lsl_content]
+          end
+
+          def compute_size(info_hash)
+            physical_partitions = info_hash['PPs'].to_i
+            size_physical_partition = info_hash['PPSIZE']
+            exp = size_physical_partition[/mega/] ? MEGABYTES_EXPONENT : GIGABYTES_EXPONENT
+            size_physical_partition.to_i * physical_partitions * exp
+          end
+        end
+      end
+    end
+  end
+end