facter 4.1.1 → 4.2.3

data/lib/facter/util/linux/dhcp.rb

@@ -75,7 +75,10 @@ module Facter
           def search_with_dhcpcd_command(interface_name)
             @log.debug("Attempt to get DHCP for interface #{interface_name}, from dhcpcd command")
 
-            output = Facter::Core::Execution.execute("dhcpcd -U #{interface_name}", logger: @log)
+            @dhcpcd_command ||= Facter::Core::Execution.which('dhcpcd')
+            return unless @dhcpcd_command
+
+            output = Facter::Core::Execution.execute("#{@dhcpcd_command} -U #{interface_name}", logger: @log)
             dhcp = output.match(/dhcp_server_identifier='(.*)'/)
             dhcp[1] if dhcp
           end

data/lib/facter/util/linux/if_inet6.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'ipaddr'
+
+module Facter
+  module Util
+    module Linux
+      class IfInet6
+        class << self
+          IFA_FLAGS = {
+            'temporary' => 0x01,
+            'noad' => 0x02,
+            'optimistic' => 0x04,
+            'dadfailed' => 0x08,
+            'homeaddress' => 0x10,
+            'deprecated' => 0x20,
+            'tentative' => 0x40,
+            'permanent' => 0x80
+            # /proc/net/if_inet6 only supports the old 8bit flags
+            # I have been unable to find a simple solution to accesses
+            # the full 32bit flags.  netlink is all I can could find but
+            # that will likely be ugly
+            # 'managetempaddr' => 0x100,
+            # 'noprefixroute' => 0x200,
+            # 'mcautojoin' => 0x400,
+            # 'stableprivacy' => 0x800
+          }.freeze
+
+          def read_flags
+            return read_flags_from_proc if File.exist?('/proc/net/if_inet6')
+
+            {}
+          end
+
+          private
+
+          def read_flags_from_proc
+            flags = init_flags
+            Facter::Util::FileHelper.safe_read('/proc/net/if_inet6', nil).each_line do |line|
+              iface = line.split
+              next unless iface.size == 6
+
+              ip = parse_ip(iface[0])
+              flags[iface[5]][ip] = parse_ifa_flags(iface[4])
+            end
+            flags
+          end
+
+          def init_flags
+            Hash.new { |h1, k1| h1[k1] = Hash.new { |h2, k2| h2[k2] = [] } }
+          end
+
+          def parse_ifa_flags(flag)
+            flag = flag.hex
+            flags = []
+            IFA_FLAGS.each_pair do |name, value|
+              next if (flag & value).zero?
+
+              flags << name
+            end
+            flags
+          end
+
+          def parse_ip(ip)
+            # The ip address in if_net6 is a long string wit no colons
+            ip = ip.scan(/(\h{4})/).join(':')
+            IPAddr.new(ip).to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/util/linux/socket_parser.rb

@@ -59,8 +59,23 @@ module Facter
           end
 
           def bond_master_of(interface_name)
-            content = Facter::Core::Execution.execute("ip link show #{interface_name}", logger: @log)
-            content.match(/master (\S*) /)&.captures&.first
+            content = get_ip_link_show_data(interface_name)
+            content&.match(/master (\S*) /)&.captures&.first
+          end
+
+          def get_ip_link_show_data(interface_name)
+            @ip_link_show_data ||= read_ip_link_show_data
+            @ip_link_show_data[interface_name]
+          end
+
+          def read_ip_link_show_data
+            ip_link_show_data = {}
+            output = Facter::Core::Execution.execute('ip -o link show', logger: @log)
+            output.each_line do |line|
+              interface_name = line.split(':')[1]&.strip if line
+              ip_link_show_data[interface_name] = line if interface_name
+            end
+            ip_link_show_data
           end
 
           def mac_from(ifaddr)

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.1.1' unless defined?(VERSION)
+  VERSION = '4.2.3' unless defined?(VERSION)
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.3
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -108,6 +114,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +190,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: New version of Facter
+description: You can prove anything with facts!
 email:
 - team-nw@puppet.com
 executables:
@@ -164,6 +198,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - bin/facter
 - lib/docs/generate.rb
 - lib/docs/generate_cli.rb
@@ -179,7 +214,6 @@ files:
 - lib/facter/custom_facts/core/execution/windows.rb
 - lib/facter/custom_facts/core/file_loader.rb
 - lib/facter/custom_facts/core/legacy_facter.rb
-- lib/facter/custom_facts/core/logging.rb
 - lib/facter/custom_facts/core/resolvable.rb
 - lib/facter/custom_facts/core/suitable.rb
 - lib/facter/custom_facts/util/collection.rb
@@ -774,6 +808,7 @@ files:
 - lib/facter/facts/windows/interfaces.rb
 - lib/facter/facts/windows/ipaddress6_interfaces.rb
 - lib/facter/facts/windows/ipaddress_interfaces.rb
+- lib/facter/facts/windows/is_virtual.rb
 - lib/facter/facts/windows/kernel.rb
 - lib/facter/facts/windows/kernelmajversion.rb
 - lib/facter/facts/windows/kernelrelease.rb
@@ -836,8 +871,7 @@ files:
 - lib/facter/facts/windows/system_uptime/seconds.rb
 - lib/facter/facts/windows/system_uptime/uptime.rb
 - lib/facter/facts/windows/timezone.rb
-- lib/facter/facts/windows/virtualization/is_virtual.rb
-- lib/facter/facts/windows/virtualization/virtual.rb
+- lib/facter/facts/windows/virtual.rb
 - lib/facter/framework/benchmarking/timer.rb
 - lib/facter/framework/cli/cli.rb
 - lib/facter/framework/cli/cli_launcher.rb
@@ -847,7 +881,6 @@ files:
 - lib/facter/framework/core/fact/external/external_fact_manager.rb
 - lib/facter/framework/core/fact/internal/core_fact.rb
 - lib/facter/framework/core/fact/internal/internal_fact_manager.rb
-- lib/facter/framework/core/fact_augmenter.rb
 - lib/facter/framework/core/fact_filter.rb
 - lib/facter/framework/core/fact_loaders/class_discoverer.rb
 - lib/facter/framework/core/fact_loaders/external_fact_loader.rb
@@ -1011,12 +1044,13 @@ files:
 - lib/facter/util/aix/odm_query.rb
 - lib/facter/util/api_debugger.rb
 - lib/facter/util/facts/facts_utils.rb
+- lib/facter/util/facts/posix/virtual_detector.rb
 - lib/facter/util/facts/unit_converter.rb
 - lib/facter/util/facts/uptime_parser.rb
-- lib/facter/util/facts/virtual_detector.rb
 - lib/facter/util/facts/windows_release_finder.rb
 - lib/facter/util/file_helper.rb
 - lib/facter/util/linux/dhcp.rb
+- lib/facter/util/linux/if_inet6.rb
 - lib/facter/util/linux/routing_table.rb
 - lib/facter/util/linux/socket_parser.rb
 - lib/facter/util/macosx/system_profile_executor.rb
@@ -1037,7 +1071,7 @@ files:
 - lib/facter/version.rb
 homepage: https://github.com/puppetlabs/facter
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -1045,9 +1079,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.3'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1057,5 +1094,5 @@ requirements: []
 rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: New version of Facter
+summary: Facter, a system inventory tool
 test_files: []

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

@@ -1,203 +0,0 @@
-# frozen_string_literal: true
-
-module LegacyFacter
-  module Core
-    module Logging
-      extend self
-
-      # @api private
-      GREEN = "\e[0;32m"
-      # @api private
-      RESET = "\e[0m"
-
-      RED = "\e[31m"
-
-      # @api private
-      @@debug = false
-      # @api private
-      @@timing = false
-      # @api private
-      @@trace = false
-
-      # @api private
-      @@warn_messages = {}
-      # @api private
-      @@debug_messages = {}
-
-      # @api private
-      @@message_callback = nil
-
-      # Used to register a callback that is called when a message is logged.
-      # If a block is given, Facter will not log messages.
-      # If a block is not given, Facter will resume logging messages.
-      # @param block [Proc] the callback to call when a message is logged.
-      #   The first argument to the callback will be a symbol representing a level. The supported
-      #   levels are: :trace, :debug, :info, :warn, :error, and :fatal.
-      #   The second argument to the callback will be a string containing the message
-      #   that was logged.
-      # @api public
-      def on_message(&block)
-        @@message_callback = block
-      end
-
-      # Prints a debug message if debugging is turned on
-      #
-      # @param msg [String] the debug message
-      # @return [void]
-      def debug(msg)
-        return unless debugging?
-
-        if msg.nil? || msg.empty?
-          invoker = caller(1..1).first.slice(/.*:\d+/)
-          self.warn "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
-        elsif @@message_callback
-          @@message_callback.call(:debug, msg)
-        else
-          puts GREEN + msg + RESET
-        end
-      end
-
-      # Prints a debug message only once.
-      #
-      # @note Uniqueness is based on the string, not the specific location
-      #   of the method call.
-      #
-      # @param msg [String] the debug message
-      # @return [void]
-      def debugonce(msg)
-        return unless msg && !msg.empty? && @@debug_messages[msg].nil?
-
-        @@debug_messages[msg] = true
-        debug(msg)
-      end
-
-      # Prints a warning message. The message is only printed if debugging
-      # is enabled.
-      #
-      # @param msg [String] the warning message to be printed
-      #
-      # @return [void]
-      def warn(msg)
-        if msg.nil? || msg.empty?
-          invoker = caller(1..1).first.slice(/.*:\d+/)
-          msg = "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
-        end
-        if @@message_callback
-          @@message_callback.call(:warn, msg)
-        else
-          Kernel.warn msg
-        end
-      end
-
-      # Prints a warning message only once per process. Each unique string
-      # is printed once.
-      #
-      # @note Unlike {warn} the message will be printed even if debugging is
-      #   not turned on. This behavior is likely to change and should not be
-      #   relied on.
-      #
-      # @param msg [String] the warning message to be printed
-      #
-      # @return [void]
-      def warnonce(msg)
-        return unless @@warn_messages[msg].nil?
-
-        self.warn(msg)
-        @@warn_messages[msg] = true
-      end
-
-      def log_exception(exception, message = :default)
-        self.warn(format_exception(exception, message, @@trace))
-      end
-
-      def format_exception(exception, message, trace)
-        arr = []
-
-        if message == :default
-          arr << exception.message
-        elsif message
-          arr << message
-        end
-
-        if trace
-          arr << 'backtrace:'
-          arr.concat(exception.backtrace)
-        end
-
-        "#{RED}#{arr.flatten.join("\n")}#{RESET}"
-      end
-
-      # Print an exception message, and optionally a backtrace if trace is set
-
-      # Print timing information
-      #
-      # @param string [String] the time to print
-      # @return [void]
-      #
-      # @api private
-      def show_time(string)
-        return unless string && timing?
-
-        if @@message_callback
-          @@message_callback.call(:info, string)
-        else
-          $stderr.puts "#{GREEN}#{string}#{RESET}"
-        end
-      end
-
-      # Enable or disable logging of debug messages
-      #
-      # @param bool [true, false]
-      # @return [void]
-      #
-      # @api private
-      def debugging(bool)
-        @@debug = bool
-      end
-
-      # Is debugging enabled?
-      #
-      # @return [true, false]
-      #
-      # @api private
-      def debugging?
-        @@debug
-      end
-
-      # Enable or disable logging of timing information
-      #
-      # @param bool [true, false]
-      # @return [void]
-      #
-      # @api private
-      def timing(bool)
-        @@timing = bool
-      end
-
-      # Returns whether timing output is turned on
-      #
-      # @api private
-      def timing?
-        @@timing
-      end
-
-      def trace(bool)
-        @@trace = bool
-      end
-
-      def trace?
-        @@trace
-      end
-
-      # Clears the seen state of debug and warning messages. See {debugonce} and {warnonce}.
-      #
-      # @return [void]
-      #
-      # @api private
-      def clear_messages
-        @@debug_messages.clear
-        @@warn_messages.clear
-      end
-    end
-  end
-end