facter 4.0.20 → 4.0.21

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1000`
-# on 2020-04-24 12:45:39 +0300 using RuboCop version 0.74.0.
+# on 2020-05-11 09:20:37 +0300 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -28,7 +28,6 @@ RSpec/FilePath:
     - 'spec/custom_facts/util/normalization_spec.rb'
     - 'spec/custom_facts/util/parser_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
-    - 'spec/facter/facts_utils/bytes_to_human_readable_spec.rb'
     - 'spec/facter/facts_utils/uptime_parser_spec.rb'
     - 'spec/facter/facts_utils/windows_release_finder_spec.rb'
     - 'spec/facter/model/fact_collection_spec.rb'
@@ -50,8 +49,8 @@ RSpec/FilePath:
     - 'spec/facter/resolvers/processors_resolver_spec.rb'
     - 'spec/facter/resolvers/redhat_release_resolver_spec.rb'
     - 'spec/facter/resolvers/selinux_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/current_zone_resolver_spec.rb'
     - 'spec/facter/resolvers/solaris/solaris_release_resolver_spec.rb'
+    - 'spec/facter/resolvers/solaris/solaris_zone_name_spec.rb'
     - 'spec/facter/resolvers/solaris/zone_resolver_spec.rb'
     - 'spec/facter/resolvers/solaris/zpool_resolver_spec.rb'
     - 'spec/facter/resolvers/suse_relese_resolver_spec.rb'
@@ -85,13 +84,13 @@ RSpec/FilePath:
     - 'spec/framework/core/options/options_validator_spec.rb'
     - 'spec/framework/core/options_spec.rb'
     - 'spec/framework/core/session_cache_spec.rb'
+    - 'spec/framework/detector/os_hierarchy_spec.rb'
     - 'spec/framework/formatters/fact_formatter_spec.rb'
     - 'spec/framework/formatters/hocon_fact_formatter_spec.rb'
     - 'spec/framework/formatters/json_fact_formatter_spec.rb'
     - 'spec/framework/formatters/legacy_fact_formatter_spec.rb'
     - 'spec/framework/formatters/yaml_fact_formatter_spec.rb'
     - 'spec/framework/utils/utils_spec.rb'
-    - 'spec/framework/detector/os_hierarchy_spec.rb'
 
 # Offense count: 15
 # Configuration parameters: AssignmentOnly.
@@ -111,7 +110,7 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
 
-# Offense count: 118
+# Offense count: 99
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -138,8 +137,6 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/macosx/os/architecture_spec.rb'
     - 'spec/facter/facts/macosx/os/family_spec.rb'
     - 'spec/facter/facts/macosx/os/name_spec.rb'
-    - 'spec/facter/facts/sles/os/architecture_spec.rb'
-    - 'spec/facter/facts/sles/os/name_spec.rb'
     - 'spec/facter/facts/sles/os/release_spec.rb'
     - 'spec/facter/facts/solaris/os/architecture_spec.rb'
     - 'spec/facter/facts/solaris/os/name_spec.rb'
@@ -149,20 +146,11 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/windows/dmi/product/name_spec.rb'
     - 'spec/facter/facts/windows/dmi/product/serial_number_spec.rb'
     - 'spec/facter/facts/windows/dmi/product/uuid_spec.rb'
-    - 'spec/facter/facts/windows/fips_enabled_spec.rb'
     - 'spec/facter/facts/windows/identity/user_spec.rb'
-    - 'spec/facter/facts/windows/ipaddress6_interfaces_spec.rb'
-    - 'spec/facter/facts/windows/ipaddress_interfaces_spec.rb'
-    - 'spec/facter/facts/windows/macaddress_interfaces_spec.rb'
     - 'spec/facter/facts/windows/memory/system/available_bytes_spec.rb'
     - 'spec/facter/facts/windows/memory/system/available_spec.rb'
     - 'spec/facter/facts/windows/memory/system/total_bytes_spec.rb'
     - 'spec/facter/facts/windows/memory/system/total_spec.rb'
-    - 'spec/facter/facts/windows/mtu_interfaces_spec.rb'
-    - 'spec/facter/facts/windows/netmask6_interfaces_spec.rb'
-    - 'spec/facter/facts/windows/netmask_interfaces_spec.rb'
-    - 'spec/facter/facts/windows/network6_interfaces_spec.rb'
-    - 'spec/facter/facts/windows/network_interfaces_spec.rb'
     - 'spec/facter/facts/windows/os/architecture_spec.rb'
     - 'spec/facter/facts/windows/os/family_spec.rb'
     - 'spec/facter/facts/windows/os/hardware_spec.rb'
@@ -177,9 +165,7 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/windows/processors/physicalcount_spec.rb'
     - 'spec/facter/facts/windows/ruby/platform_spec.rb'
     - 'spec/facter/facts/windows/ruby/sitedir_spec.rb'
-    - 'spec/facter/facts/windows/scope6_interfaces_spec.rb'
     - 'spec/facter/resolvers/utils/aix/odm_query_spec.rb'
-    - 'spec/framework/core/fact_loaders/external_fact_loader_spec.rb'
 
 # Offense count: 26
 RSpec/SubjectStub:
@@ -192,7 +178,7 @@ RSpec/SubjectStub:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
 
-# Offense count: 180
+# Offense count: 131
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -217,10 +203,8 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/facts/windows/identity/privileged_spec.rb'
     - 'spec/facter/facts/windows/memory/system/capacity_spec.rb'
     - 'spec/facter/facts/windows/memory/system/used_bytes_spec.rb'
-    - 'spec/facter/facts/windows/networking/dhcp_spec.rb'
     - 'spec/facter/facts/windows/networking/interfaces_spec.rb'
     - 'spec/facter/facts/windows/networking/mtu_spec.rb'
-    - 'spec/facter/facts/windows/networking/primary_spec.rb'
     - 'spec/facter/facts/windows/processors/models_spec.rb'
     - 'spec/facter/facts/windows/virtualization/is_virtual_spec.rb'
     - 'spec/facter/facts/windows/virtualization/virtual_spec.rb'
@@ -231,11 +215,6 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/resolvers/bsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/mountpoints_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/current_zone_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/solaris_release_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/zfs_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/zone_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/zpool_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
     - 'spec/facter/resolvers/utils/windows/win32ole_spec.rb'
     - 'spec/facter/resolvers/windows/dmi_bios_resolver_spec.rb'
@@ -244,11 +223,9 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/resolvers/windows/identity_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/kernel_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/memory_resolver_spec.rb'
-    - 'spec/facter/resolvers/windows/networking_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/processors_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/system32_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/uptime_resolver_spec.rb'
-    - 'spec/facter/resolvers/windows/virtualization_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/win_os_description_resolver_spec.rb'
     - 'spec/framework/core/fact_loaders/external_fact_loader_spec.rb'
     - 'spec/framework/core/fact_loaders/fact_loader_spec.rb'

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 
 
+## [4.0.21](https://github.com/puppetlabs/facter-ng/tree/4.0.21) (2020-05-13)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.20...4.0.21)
+
+### Added
+
+- \(FACT-2599\) Run GitHub Actions on Ubuntu 16 and Osx 10 [\#497](https://github.com/puppetlabs/facter-ng/pull/497) ([Filipovici-Andrei](https://github.com/Filipovici-Andrei))
+- \(FACT-2247\) Add networking fact for linux [\#496](https://github.com/puppetlabs/facter-ng/pull/496) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2515\) Define custom fact groups in facter.conf [\#491](https://github.com/puppetlabs/facter-ng/pull/491) ([florindragos](https://github.com/florindragos))
+- \(FACT-2557\) Add rake task for generating list of facts for specified OS [\#488](https://github.com/puppetlabs/facter-ng/pull/488) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- Add os.release facts on FreeBSD [\#485](https://github.com/puppetlabs/facter-ng/pull/485) ([smortex](https://github.com/smortex))
+- \(FACT-2235\) Add Aix processors fact [\#483](https://github.com/puppetlabs/facter-ng/pull/483) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2569\) Run acceptance tests on Ubuntu GitHub actions [\#477](https://github.com/puppetlabs/facter-ng/pull/477) ([Filipovici-Andrei](https://github.com/Filipovici-Andrei))
+- \(FACT-2553\) Quote special string in YAML format [\#471](https://github.com/puppetlabs/facter-ng/pull/471) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2517\) Open3 wrapper for executing system calls [\#469](https://github.com/puppetlabs/facter-ng/pull/469) ([oanatmaria](https://github.com/oanatmaria))
+
+### Fixed
+
+- \(FACT-2533\) Fix for tests/facts/partitions.rb [\#507](https://github.com/puppetlabs/facter-ng/pull/507) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2531\) Fix for tests/facts/validate\_file\_system\_size\_bytes.rb [\#500](https://github.com/puppetlabs/facter-ng/pull/500) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2582\) Date and Time in external YAML fact is not loaded [\#499](https://github.com/puppetlabs/facter-ng/pull/499) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2556\) Refactor existing facts to use the new OS hierarchy [\#486](https://github.com/puppetlabs/facter-ng/pull/486) ([IrimieBogdan](https://github.com/IrimieBogdan))
+
+
+
 ## [4.0.20](https://github.com/puppetlabs/facter-ng/tree/4.0.20) (2020-05-06)
 
 [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.19...4.0.20)

data/README.md

@@ -1,10 +1,13 @@
 # facter-ng
 
-[![Build Status](https://travis-ci.org/puppetlabs/facter-ng.svg?branch=master)](https://travis-ci.org/puppetlabs/facter-ng?branch=master)
-[![Coverage Status](https://coveralls.io/repos/github/puppetlabs/facter-ng/badge.svg?branch=master)](https://coveralls.io/github/puppetlabs/facter-ng?branch=master)
+[![Modules Status](https://github.com/puppetlabs/facter-ng/workflows/Acceptance%20tests/badge.svg?branch=master)](https://github.com/puppetlabs/facter-ng/actions)
+[![Modules Status](https://github.com/puppetlabs/facter-ng/workflows/Unit%20tests/badge.svg?branch=master)](https://github.com/puppetlabs/facter-ng/actions)
+[![Modules Status](https://github.com/puppetlabs/facter-ng/workflows/Checks/badge.svg?branch=master)](https://github.com/puppetlabs/facter-ng/actions)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/bf43445f767f2d64170a/test_coverage)](https://codeclimate.com/github/puppetlabs/facter-ng/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/bf43445f767f2d64170a/maintainability)](https://codeclimate.com/github/puppetlabs/facter-ng/maintainability)
 [<img src="https://img.shields.io/badge/slack-puppet--dev-brightgreen?logo=slack">](https://puppetcommunity.slack.com/messages/C0W1X7ZAL)
 
+
 Facter is a command-line tool that gathers basic facts about nodes (systems) such as hardware details, network settings, OS type and version, and more. These facts are made available as variables in your Puppet manifests and can be used to inform conditional expressions in Puppet.
 
 ## Supported platforms

data/VERSION

@@ -1 +1 @@
-4.0.20
+4.0.21

data/facter.conf

@@ -19,3 +19,7 @@ cli : {
   verbose   : false,
   log-level : "warn"
 }
+
+fact-groups : {
+  cached-custom-facts : ["my_custom_fact"],
+}

data/facter.gemspec

@@ -39,10 +39,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls', '~> 0.8.23'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop', '~> 0.81.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.5'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.38'
-  spec.add_development_dependency 'rubycritic', '~> 4.1.0'
   spec.add_development_dependency 'sys-filesystem', '~> 1.3'
   spec.add_development_dependency 'yard', '~> 0.9'
 

data/lib/custom_facts/core/execution.rb

@@ -51,7 +51,14 @@ module Facter
       # @param path [String] the path to check
       # @param platform [:posix,:windows,nil] the platform logic to use
       def absolute_path?(path, platform = nil)
-        @@impl.absolute_path?(path, platform)
+        case platform
+        when :posix
+          Facter::Core::Execution::Posix.new.absolute_path?(path)
+        when :windows
+          Facter::Core::Execution::Windows.new.absolute_path?(path)
+        else
+          @@impl.absolute_path?(path)
+        end
       end
 
       # Given a command line, this returns the command line with the

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

@@ -4,6 +4,8 @@ module Facter
   module Core
     module Execution
       class Base
+        STDERR_MESSAGE = 'Command %s resulted with the following stderr message: %s'
+
         def with_env(values)
           old = {}
           values.each do |var, value|
@@ -34,12 +36,13 @@ module Facter
         def execute(command, options = {})
           on_fail = options.fetch(:on_fail, :raise)
           expand = options.fetch(:expand, true)
+          logger = options[:logger]
 
           # Set LC_ALL and LANG to force i18n to C for the duration of this exec;
           # this ensures that any code that parses the
           # output of the command can expect it to be in a consistent / predictable format / locale
           with_env 'LC_ALL' => 'C', 'LANG' => 'C' do
-            expanded_command = if !expand && builtin_command?(command)
+            expanded_command = if !expand && builtin_command?(command) || logger
                                  command
                                else
                                  expand_command(command)
@@ -54,18 +57,22 @@ module Facter
               return on_fail
             end
 
-            execute_command(expanded_command, on_fail)
+            execute_command(expanded_command, on_fail, logger)
           end
         end
 
         private
 
-        def log_stderr_from_file(msg, command)
+        def log_stderr(msg, command, logger)
           return if !msg || msg.empty?
 
-          file_name = command.split('/').last
-          logger = Facter::Log.new(file_name)
-          logger.warn(msg.strip)
+          if logger
+            logger.debug(format(STDERR_MESSAGE, command, msg.strip))
+          else
+            file_name = command.split('/').last
+            logger = Facter::Log.new(file_name)
+            logger.warn(format(STDERR_MESSAGE, command, msg.strip))
+          end
         end
 
         def builtin_command?(command)
@@ -73,11 +80,12 @@ module Facter
           output.chomp =~ /builtin/ ? true : false
         end
 
-        def execute_command(command, on_fail)
+        def execute_command(command, on_fail, logger = nil)
           begin
             out, stderr, _status_ = Open3.capture3(command.to_s)
-            log_stderr_from_file(stderr, command)
+            log_stderr(stderr, command, logger)
           rescue StandardError => e
+            return '' if logger
             return on_fail unless on_fail == :raise
 
             raise Facter::Core::Execution::ExecutionFailure.new,

data/lib/custom_facts/util/normalization.rb

@@ -16,7 +16,7 @@ module LegacyFacter
       # @return [void]
       def normalize(value)
         case value
-        when Integer, Float, TrueClass, FalseClass, NilClass, Symbol
+        when Integer, Float, TrueClass, FalseClass, NilClass, Symbol, Date
           value
         when String
           normalize_string(value)

data/lib/custom_facts/util/parser.rb

@@ -4,7 +4,6 @@
 # facts such as scripts, text, json and yaml files.
 #
 # Parsers must subclass this class and provide their own #results method.
-require 'yaml'
 
 module LegacyFacter
   module Util
@@ -93,9 +92,18 @@ module LegacyFacter
         end
       end
 
+      # This regex was taken from Psych and adapted
+      # https://github.com/ruby/psych/blob/d2deaa9adfc88fc0b870df022a434d6431277d08/lib/psych/scalar_scanner.rb#L9
+      # It is used to detect Time in YAML, but we use it to wrap time objects in quotes to be treated as strings.
+      TIME =
+        /(\d{4}-\d{1,2}-\d{1,2}(?:[Tt]|\s+)\d{1,2}:\d\d:\d\d(?:\.\d*)?(?:\s*(?:Z|[-+]\d{1,2}:?(?:\d\d)?))?\s*$)/.freeze
+
       class YamlParser < Base
         def parse_results
-          YAML.safe_load(content)
+          # Add quotes to Yaml time
+          cont = content.gsub(TIME, '"\1"')
+
+          YAML.safe_load(cont, [Date])
         end
       end
 

data/lib/facter.rb

@@ -13,13 +13,12 @@ module Facter
 
   Options.init
   Log.add_legacy_logger(STDOUT)
-  @logger = Log.new(self)
   @already_searched = {}
   @trace = false
 
   class << self
     def clear_messages
-      @logger.debug('clear_messages is not implemented')
+      logger.debug('clear_messages is not implemented')
     end
 
     # Alias method for Facter.fact()
@@ -80,7 +79,7 @@ module Facter
     def debug(msg)
       return unless debugging?
 
-      @logger.debug(msg)
+      logger.debug(msg)
       nil
     end
 
@@ -239,11 +238,9 @@ module Facter
     #
     # @api private
     def to_user_output(cli_options, *args)
-      cli_options = cli_options.map { |(k, v)| [k.to_sym, v] }.to_h
-      Facter::Options.init_from_cli(cli_options, args)
-      @logger.info("executed with command line: #{ARGV.drop(1).join(' ')}")
+      init_cli_options(cli_options, args)
+      logger.info("executed with command line: #{ARGV.drop(1).join(' ')}")
       log_blocked_facts
-
       resolved_facts = Facter::FactManager.instance.resolve_facts(args)
       SessionCache.invalidate_all_caches
       fact_formatter = Facter::FormatterFactory.build(Facter::Options.get)
@@ -265,11 +262,20 @@ module Facter
         arr.concat(exception.backtrace)
       end
 
-      @logger.error(arr.flatten.join("\n"))
+      logger.error(arr.flatten.join("\n"))
     end
 
     private
 
+    def logger
+      @logger ||= Log.new(self)
+    end
+
+    def init_cli_options(options, args)
+      options = options.map { |(k, v)| [k.to_sym, v] }.to_h
+      Facter::Options.init_from_cli(options, args)
+    end
+
     def add_fact_to_searched_facts(user_query, value)
       @already_searched[user_query] ||= ResolvedFact.new(user_query, value)
       @already_searched[user_query].value = value
@@ -324,10 +330,10 @@ module Facter
     #
     # @api private
     def log_blocked_facts
-      block_list = Facter::FactGroups.new(Facter::Options[:config]).block_list
+      block_list = Options[:block_list]
       return unless block_list.any? && Facter::Options[:block]
 
-      @logger.debug("blocking collection of #{block_list.join("\s")} facts")
+      logger.debug("blocking collection of #{block_list.join("\s")} facts")
     end
 
     # Used for printing errors regarding CLI user input validation
@@ -340,7 +346,7 @@ module Facter
     # @api private
     def log_errors(missing_names)
       missing_names.each do |missing_name|
-        @logger.error("fact \"#{missing_name}\" does not exist.", true)
+        logger.error("fact \"#{missing_name}\" does not exist.", true)
       end
     end
 
@@ -354,7 +360,7 @@ module Facter
     #
     # @api private
     def method_missing(name, *args, &block)
-      @logger.error(
+      logger.error(
         "--#{name}-- not implemented but required \n" \
         'with params: ' \
         "#{args.inspect} \n" \

data/lib/facts/{el → aix}/processors/count.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Aix
     module Processors
       class Count
         FACT_NAME = 'processors.count'
         ALIASES = 'processorcount'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Linux::Processors.resolve(:processors)
+          fact_value = Facter::Resolvers::Aix::Processors.resolve(:logical_count)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

data/lib/facts/{el → aix}/processors/isa.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Aix
     module Processors
       class Isa
         FACT_NAME = 'processors.isa'
@@ -9,18 +9,9 @@ module Facts
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:processor)
-          fact_value = get_isa(fact_value)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
-
-        private
-
-        def get_isa(fact_value)
-          value_split = fact_value.split('.')
-
-          value_split.last
-        end
       end
     end
   end