facter 4.3.1 → 4.4.1

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

@@ -16,6 +16,10 @@ module Facter
         @options || {}
       end
 
+      def clear
+        @options = {}
+      end
+
       private
 
       def augment_structured_facts(global_conf)

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

@@ -55,8 +55,15 @@ module Facter
       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?
-
+      default_external_dir = Facter::OptionStore.default_external_dir
+      # --puppet/-p option adds an external directory and is not an explicitly
+      # set external_dir from cli or config file
+      default_external_dir += [Puppet[:pluginfactdest]] if puppet && const_defined?('Puppet')
+      external_dir = if options[:external_dir].nil? || options[:external_dir].none?
+                       false
+                     else
+                       options[:external_dir] != default_external_dir
+                     end
       [
         { 'no-ruby' => no_ruby, 'custom-dir' => custom_dir },
         { 'no-external-facts' => !options[:external_facts], 'external-dir' => external_dir },

data/lib/facter/framework/detector/os_hierarchy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/config'
+require_relative '../../../facter/config'
 
 module Facter
   class OsHierarchy

data/lib/facter/framework/formatters/legacy_fact_formatter.rb

@@ -95,7 +95,7 @@ module Facter
       # quotation marks that come after \ are not removed
       @log.debug('Remove unnecessary comma and quotation marks on root facts')
       output.split("\n")
-            .map! { |line| line =~ /^[\s]+/ ? line : line.gsub(/,$|(?<!\\)\"/, '').gsub('\\"', '"') }.join("\n")
+            .map! { |line| /^[\s]+/.match?(line) ? line : line.gsub(/,$|(?<!\\)\"/, '').gsub('\\"', '"') }.join("\n")
     end
   end
 end

data/lib/facter/framework/formatters/yaml_fact_formatter.rb

@@ -52,9 +52,9 @@ module Facter
     end
 
     def needs_quote?(value)
-      return false if value =~ /true|false/
+      return false if /true|false/.match?(value)
       return false if value[/^[0-9]+$/]
-      return true if value =~ /y|Y|yes|Yes|YES|n|N|no|No|NO|True|TRUE|False|FALSE|on|On|ON|off|Off|OFF|:/
+      return true if /y|Y|yes|Yes|YES|n|N|no|No|NO|True|TRUE|False|FALSE|on|On|ON|off|Off|OFF|:/.match?(value)
       return false if value[/[a-zA-Z]/]
       return false if value[/[0-9]+\.[0-9]+/]
 

data/lib/facter/framework/parsers/query_parser.rb

@@ -85,7 +85,8 @@ module Facter
 
         return false if fact_with_wildcard && !query_fact.match("^#{fact_name}$")
 
-        return false unless fact_with_wildcard || fact_name.match("^#{processed_equery_fact}($|\\.)")
+        # Must escape metacharacters (like dots) to ensure the correct fact is found
+        return false unless fact_with_wildcard || fact_name.match("^#{Regexp.escape(processed_equery_fact)}($|\\.)")
 
         true
       end

data/lib/facter/patches/sysfilesystem/sys/statvfs.rb

@@ -10,7 +10,7 @@ module Sys
         # it the second time will make FFI log a warning message.
         remove_instance_variable(:@layout) if @layout
 
-        if RbConfig::CONFIG['host_os'] =~ /darwin|osx|mach/i
+        if /darwin|osx|mach/i.match?(RbConfig::CONFIG['host_os'])
           layout(
             :f_bsize, :ulong,
             :f_frsize, :ulong,
@@ -24,7 +24,7 @@ module Sys
             :f_flag, :ulong,
             :f_namemax, :ulong
           )
-        elsif RbConfig::CONFIG['host'] =~ /bsd/i
+        elsif /bsd/i.match?(RbConfig::CONFIG['host'])
           layout(
             :f_bavail, :uint64,
             :f_bfree, :uint64,
@@ -38,7 +38,7 @@ module Sys
             :f_fsid, :ulong,
             :f_namemax, :ulong
           )
-        elsif RbConfig::CONFIG['host'] =~ /sunos|solaris/i
+        elsif /sunos|solaris/i.match?(RbConfig::CONFIG['host'])
           layout(
             :f_bsize, :ulong,
             :f_frsize, :ulong,
@@ -55,7 +55,7 @@ module Sys
             :f_fstr, [:char, 32],
             :f_filler, [:ulong, 16]
           )
-        elsif RbConfig::CONFIG['host'] =~ /i686/i
+        elsif /i686/i.match?(RbConfig::CONFIG['host'])
           layout(
             :f_bsize, :ulong,
             :f_frsize, :ulong,

data/lib/facter/resolvers/aix/architecture.rb

@@ -14,7 +14,7 @@ module Facter
         end
 
         def read_architecture(fact_name)
-          require 'facter/util/aix/odm_query'
+          require_relative '../../../facter/util/aix/odm_query'
 
           proc_number = read_proc
           odmquery = Facter::Util::Aix::ODMQuery.new

data/lib/facter/resolvers/aix/filesystem.rb

@@ -18,7 +18,7 @@ module Facter
             return if file_content.empty?
 
             file_content = file_content.map do |line|
-              next if line =~ /#|%/ # skip lines that are comments or defaultvfs line
+              next if /#|%/.match?(line) # skip lines that are comments or defaultvfs line
 
               line.split(' ').first
             end

data/lib/facter/resolvers/aix/hardware.rb

@@ -14,7 +14,7 @@ module Facter
         end
 
         def read_hardware(fact_name)
-          require 'facter/util/aix/odm_query'
+          require_relative '../../../facter/util/aix/odm_query'
           odmquery = Facter::Util::Aix::ODMQuery.new
           odmquery
             .equals('name', 'sys0')

data/lib/facter/resolvers/aix/memory.rb

@@ -25,7 +25,7 @@ module Facter
 
             result.each_line do |line|
               @fact_list[:system] = populate_system(line, pagesize) if line.include?('memory')
-              @fact_list[:swap] = populate_swap(line, pagesize) if line =~ /pg\sspace/
+              @fact_list[:swap] = populate_swap(line, pagesize) if /pg\sspace/.match?(line)
             end
 
             @fact_list[fact_name]

data/lib/facter/resolvers/aix/mountpoints.rb

@@ -19,7 +19,7 @@ module Facter
             @fact_list[:mountpoints] = {}
             output = Facter::Core::Execution.execute('mount', logger: log)
             output.split("\n").drop(2).map do |line|
-              next if line =~ /procfs|ahafs/
+              next if /procfs|ahafs/.match?(line)
 
               add_mount_points_fact(line)
             end
@@ -40,7 +40,7 @@ module Facter
           def retrieve_sizes_for_mounts
             output = Facter::Core::Execution.execute('df -P', logger: log)
             output.split("\n").drop(1).map do |line|
-              next if line =~ /-\s+-\s+-/
+              next if /-\s+-\s+-/.match?(line)
 
               mount_info = line.split("\s")
               mount_info[3] = translate_to_bytes(mount_info[3])

data/lib/facter/resolvers/aix/networking.rb

@@ -43,13 +43,15 @@ module Facter
           def populate_with_mtu_and_mac!(interfaces)
             output = Facter::Core::Execution.execute('netstat -in', logger: log)
             output.each_line do |line|
-              next if line =~ /Name\s/
+              next if /Name\s/.match?(line)
 
               info = line.split("\s")
               interface_name = info[0]
               mac = info[3][/^([0-9a-f]{1,2}[\.:-]){5}([0-9a-f]{1,2})$/]
-              interfaces[interface_name][:mtu] = info[1].to_i
-              interfaces[interface_name][:mac] = format_mac_address(mac) if mac
+              if interfaces[interface_name]
+                interfaces[interface_name][:mtu] = info[1].to_i
+                interfaces[interface_name][:mac] = format_mac_address(mac) if mac
+              end
             end
           end
 

data/lib/facter/resolvers/aix/partitions.rb

@@ -50,8 +50,8 @@ module Facter
             }
             mount = info_hash['MOUNT POINT']
             label = info_hash['LABEL']
-            part_info[:mount] = mount unless %r{N/A} =~ mount
-            part_info[:label] = label.strip unless /None/ =~ label
+            part_info[:mount] = mount unless %r{N/A}.match?(mount)
+            part_info[:label] = label.strip unless /None/.match?(label)
             part_info
           end
 

data/lib/facter/resolvers/bsd/processors.rb

@@ -15,7 +15,7 @@ module Facter
           end
 
           def collect_processors_info(fact_name)
-            require 'facter/resolvers/bsd/ffi/ffi_helper'
+            require_relative '../../../facter/resolvers/bsd/ffi/ffi_helper'
 
             count = logical_count
             model = processor_model

data/lib/facter/resolvers/freebsd/processors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/bsd/processors'
+require_relative '../../../facter/resolvers/bsd/processors'
 
 module Facter
   module Resolvers
@@ -17,7 +17,7 @@ module Facter
           end
 
           def collect_processors_info(fact_name)
-            require 'facter/resolvers/freebsd/ffi/ffi_helper'
+            require_relative '../../../facter/resolvers/freebsd/ffi/ffi_helper'
 
             count = logical_count
             model = processors_model

data/lib/facter/resolvers/freebsd/swap_memory.rb

@@ -13,7 +13,7 @@ module Facter
             @fact_list.fetch(fact_name) { read_swap_memory(fact_name) }
           end
 
-          def read_swap_memory(fact_name) # rubocop:disable Metrics/AbcSize
+          def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
             data = output.split("\n")[1..-1].map { |line| line.split(/\s+/) }
 

data/lib/facter/resolvers/gce.rb

@@ -39,6 +39,15 @@ module Facter
           instance_data = gce_data['instance']
           return if instance_data.nil? || instance_data.empty?
 
+          # See https://cloud.google.com/compute/docs/metadata for information about these values
+          %w[sshKeys ssh-keys].each do |name|
+            keys = gce_data.dig('project', 'attributes', name)
+            gce_data['project']['attributes'][name] = keys.strip.split("\n") if keys
+
+            keys = instance_data.dig('attributes', name)
+            instance_data['attributes'][name] = keys.strip.split("\n") if keys
+          end
+
           %w[image machineType zone].each do |key|
             instance_data[key] = instance_data[key].split('/').last if instance_data[key]
           end

data/lib/facter/resolvers/linux/hostname.rb

@@ -40,7 +40,7 @@ module Facter
             output = Socket.gethostname || ''
             if output.empty? || output['0.0.0.0']
               begin
-                require 'facter/util/resolvers/ffi/hostname'
+                require_relative '../../../facter/util/resolvers/ffi/hostname'
 
                 output = Facter::Util::Resolvers::Ffi::Hostname.getffihostname
               rescue LoadError => e
@@ -76,7 +76,7 @@ module Facter
           end
 
           def retrieve_fqdn_for_host_with_ffi(host)
-            require 'facter/util/resolvers/ffi/hostname'
+            require_relative '../../../facter/util/resolvers/ffi/hostname'
 
             fqdn = Facter::Util::Resolvers::Ffi::Hostname.getffiaddrinfo(host)
             log.debug("FFI getaddrinfo was called and it retrieved: #{fqdn}")

data/lib/facter/resolvers/load_averages.rb

@@ -13,7 +13,7 @@ module Facter
         end
 
         def read_load_averages(fact_name)
-          require 'facter/util/resolvers/ffi/load_averages'
+          require_relative '../../facter/util/resolvers/ffi/load_averages'
 
           log.debug('loading cpu load averages')
           @fact_list[:load_averages] = %w[1m 5m 15m].zip(Facter::Util::Resolvers::Ffi::LoadAverages

data/lib/facter/resolvers/lspci.rb

@@ -26,7 +26,7 @@ module Facter
         end
 
         def retrieve_vm(output)
-          output.each_line { |line| REGEX_VALUES.each { |key, value| return value if line =~ /#{key}/ } }
+          output.each_line { |line| REGEX_VALUES.each { |key, value| return value if /#{key}/.match?(line) } }
 
           nil
         end

data/lib/facter/resolvers/macosx/swap_memory.rb

@@ -13,7 +13,7 @@ module Facter
             @fact_list.fetch(fact_name) { read_swap_memory(fact_name) }
           end
 
-          def read_swap_memory(fact_name) # rubocop:disable Metrics/AbcSize
+          def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('sysctl -n vm.swapusage', logger: log)
             data = output.match(/^total = ([\d.]+)M  used = ([\d.]+)M  free = ([\d.]+)M  (\(encrypted\))$/)
 

data/lib/facter/resolvers/networking.rb

@@ -71,7 +71,7 @@ module Facter
         end
 
         def extract_dhcp(interface_name, raw_data, parsed_interface_data)
-          return unless raw_data =~ /status:\s+active/
+          return unless /status:\s+active/.match?(raw_data)
 
           result = Facter::Core::Execution.execute("ipconfig getoption #{interface_name} " \
                                                      'server_identifier', logger: log)

data/lib/facter/resolvers/open_vz.rb

@@ -29,7 +29,7 @@ module Facter
             parts = line.split("\s")
             next unless parts.size.equal?(2)
 
-            next unless /^envID:/ =~ parts[0]
+            next unless /^envID:/.match?(parts[0])
 
             @fact_list[:id] = parts[1]
 

data/lib/facter/resolvers/os_release.rb

@@ -49,7 +49,7 @@ module Facter
 
           pairs = []
           content.each do |line|
-            pairs << line.strip.delete('"').split('=', 2)
+            pairs << line.strip.delete('"').split('=', 2) unless line.start_with?('#')
           end
 
           pairs
@@ -63,13 +63,13 @@ module Facter
         def process_version_id
           return unless @fact_list[:version_id]
 
-          @fact_list[:version_id] = "#{@fact_list[:version_id]}.0" unless @fact_list[:version_id] =~ /\./
+          @fact_list[:version_id] = "#{@fact_list[:version_id]}.0" unless /\./.match?(@fact_list[:version_id])
         end
 
         def process_id
           return unless @fact_list[:id]
 
-          @fact_list[:id] = 'opensuse' if @fact_list[:id] =~ /opensuse/i
+          @fact_list[:id] = 'opensuse' if /opensuse/i.match?(@fact_list[:id])
         end
 
         def process_name

data/lib/facter/resolvers/selinux.rb

@@ -26,7 +26,7 @@ module Facter
           mountpoint = ''
 
           output.each_line do |line|
-            next unless line =~ /selinuxfs/
+            next unless /selinuxfs/.match?(line)
 
             mountpoint = line.split("\s")[1]
             break
@@ -54,8 +54,8 @@ module Facter
           file_lines = Facter::Util::FileHelper.safe_readlines('/etc/selinux/config')
 
           file_lines.map do |line|
-            @fact_list[:config_mode] = line.split('=').last.strip if line =~ /^SELINUX=/
-            @fact_list[:config_policy] = line.split('=').last.strip if line =~ /^SELINUXTYPE=/
+            @fact_list[:config_mode] = line.split('=').last.strip if /^SELINUX=/.match?(line)
+            @fact_list[:config_policy] = line.split('=').last.strip if /^SELINUXTYPE=/.match?(line)
           end
 
           !file_lines.empty? ? true : false

data/lib/facter/resolvers/solaris/ffi/functions.rb

@@ -15,9 +15,11 @@ module Facter
 
           def self.ioctl(call_const, pointer, address_family = AF_INET)
             fd = Ioctl.open_socket(address_family, SOCK_DGRAM, 0)
-            result = ioctl_base(fd, call_const, pointer)
-            Ioctl.close_socket(fd, 2)
-            result
+            begin
+              ioctl_base(fd, call_const, pointer)
+            ensure
+              Ioctl.close_socket(fd, 2)
+            end
           end
         end
       end

data/lib/facter/resolvers/solaris/filesystems.rb

@@ -18,7 +18,7 @@ module Facter
 
             file_content = Facter::Core::Execution.execute('/usr/sbin/sysdef', logger: log)
             files = file_content.split("\n").map do |line|
-              line.split('/').last if line =~ /^fs\.*/
+              line.split('/').last if /^fs\.*/.match?(line)
             end
 
             @fact_list[:file_systems] = files.compact.sort.join(',')

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -21,7 +21,7 @@ module Facter
             end
           end
 
-          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def read_mounts(fact_name) # rubocop:disable Metrics/MethodLength
             @mounts = []
             @auto_home_paths = []
 

data/lib/facter/resolvers/virt_what.rb

@@ -28,9 +28,9 @@ module Facter
           return unless xen_info
 
           xen_info = xen_info.to_s
-          return 'xenu' if xen_info =~ /xen-domu/
-          return 'xenhvm' if xen_info =~ /xen-hvm/
-          return 'xen0' if xen_info =~ /xen-dom0/
+          return 'xenu' if /xen-domu/.match?(xen_info)
+          return 'xenhvm' if /xen-hvm/.match?(xen_info)
+          return 'xen0' if /xen-dom0/.match?(xen_info)
         end
 
         def determine_other(output)
@@ -38,8 +38,8 @@ module Facter
           other_vm = values.first
           return unless other_vm
 
-          return 'zlinux' if other_vm =~ /ibm_systemz/
-          return retrieve_vserver if other_vm =~ /linux_vserver/
+          return 'zlinux' if /ibm_systemz/.match?(other_vm)
+          return retrieve_vserver if /linux_vserver/.match?(other_vm)
           return (values - ['redhat']).first if values.include?('redhat')
 
           other_vm
@@ -53,7 +53,7 @@ module Facter
             parts = line.split("\s")
             next unless parts.size.equal?(2)
 
-            next unless parts[0] =~ /^s_context:|^VxID:/
+            next unless /^s_context:|^VxID:/.match?(parts[0])
             return @fact_list[:vserver] = 'vserver_host' if parts[1] == '0'
 
             return @fact_list[:vserver] = 'vserver'

data/lib/facter/resolvers/windows/ffi/hardware_ffi.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/windows/ffi/ffi'
-require 'facter/resolvers/windows/ffi/system_info'
+require_relative '../../../../facter/resolvers/windows/ffi/ffi'
+require_relative '../../../../facter/resolvers/windows/ffi/system_info'
 
 module HardwareFFI
   extend FFI::Library

data/lib/facter/resolvers/windows/ffi/identity_ffi.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/windows/ffi/ffi'
+require_relative '../../../../facter/resolvers/windows/ffi/ffi'
 
 module IdentityFFI
   extend FFI::Library

data/lib/facter/resolvers/windows/ffi/kernel_ffi.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/windows/ffi/ffi'
-require 'facter/resolvers/windows/ffi/os_version_info_ex'
+require_relative '../../../../facter/resolvers/windows/ffi/ffi'
+require_relative '../../../../facter/resolvers/windows/ffi/os_version_info_ex'
 
 module KernelFFI
   extend FFI::Library

data/lib/facter/resolvers/windows/ffi/memory_ffi.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/windows/ffi/ffi'
-require 'facter/resolvers/windows/ffi/performance_information'
+require_relative '../../../../facter/resolvers/windows/ffi/ffi'
+require_relative '../../../../facter/resolvers/windows/ffi/performance_information'
 
 module MemoryFFI
   extend FFI::Library

data/lib/facter/resolvers/windows/ffi/networking_ffi.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/windows/ffi/ffi'
-require 'facter/resolvers/windows/ffi/network_utils'
-require 'facter/resolvers/windows/ffi/ip_adapter_addresses_lh'
+require_relative '../../../../facter/resolvers/windows/ffi/ffi'
+require_relative '../../../../facter/resolvers/windows/ffi/network_utils'
+require_relative '../../../../facter/resolvers/windows/ffi/ip_adapter_addresses_lh'
 
 module NetworkingFFI
   extend FFI::Library

data/lib/facter/resolvers/windows/ffi/system32_ffi.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/windows/ffi/ffi'
+require_relative '../../../../facter/resolvers/windows/ffi/ffi'
 
 module System32FFI
   extend FFI::Library

data/lib/facter/resolvers/windows/ffi/winnls_ffi.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/resolvers/windows/ffi/ffi'
+require_relative '../../../../facter/resolvers/windows/ffi/ffi'
 
 module WinnlsFFI
   extend FFI::Library

data/lib/facter/resolvers/windows/hardware_architecture.rb

@@ -13,7 +13,7 @@ module Facter
         end
 
         def read_hardware_information(fact_name)
-          require 'facter/resolvers/windows/ffi/hardware_ffi'
+          require_relative '../../../facter/resolvers/windows/ffi/hardware_ffi'
 
           sys_info_ptr = FFI::MemoryPointer.new(SystemInfo.size)
           HardwareFFI::GetNativeSystemInfo(sys_info_ptr)

data/lib/facter/resolvers/windows/identity.rb

@@ -16,7 +16,7 @@ module Facter
         end
 
         def find_username
-          require 'facter/resolvers/windows/ffi/identity_ffi'
+          require_relative '../../../facter/resolvers/windows/ffi/identity_ffi'
 
           size_ptr = FFI::MemoryPointer.new(:win32_ulong, 1)
           IdentityFFI::GetUserNameExW(NAME_SAM_COMPATIBLE, FFI::Pointer::NULL, size_ptr)

data/lib/facter/resolvers/windows/kernel.rb

@@ -15,7 +15,7 @@ module Facter
         end
 
         def read_os_version_information(fact_name)
-          require 'facter/resolvers/windows/ffi/kernel_ffi'
+          require_relative '../../../facter/resolvers/windows/ffi/kernel_ffi'
 
           ver_ptr = FFI::MemoryPointer.new(OsVersionInfoEx.size)
           ver = OsVersionInfoEx.new(ver_ptr)

data/lib/facter/resolvers/windows/memory.rb

@@ -15,7 +15,7 @@ module Facter
         end
 
         def read_performance_information
-          require 'facter/resolvers/windows/ffi/memory_ffi'
+          require_relative '../../../facter/resolvers/windows/ffi/memory_ffi'
 
           state_ptr = FFI::MemoryPointer.new(PerformanceInformation.size)
           if MemoryFFI::GetPerformanceInfo(state_ptr, state_ptr.size) == FFI::WIN32FALSE

data/lib/facter/resolvers/windows/networking.rb

@@ -15,7 +15,7 @@ module Facter
           end
 
           def read_network_information(fact_name)
-            require 'facter/resolvers/windows/ffi/networking_ffi'
+            require_relative '../../../facter/resolvers/windows/ffi/networking_ffi'
 
             size_ptr = FFI::MemoryPointer.new(NetworkingFFI::BUFFER_LENGTH)
             adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)

data/lib/facter/resolvers/windows/system32.rb

@@ -15,7 +15,7 @@ module Facter
         end
 
         def retrieve_windows_binaries_path
-          require 'facter/resolvers/windows/ffi/system32_ffi'
+          require_relative '../../../facter/resolvers/windows/ffi/system32_ffi'
 
           windows_path = ENV['SystemRoot']
 

data/lib/facter/resolvers/windows/timezone.rb

@@ -31,7 +31,7 @@ module Facter
           end
 
           def codepage_from_api
-            require 'facter/resolvers/windows/ffi/winnls_ffi'
+            require_relative '../../../facter/resolvers/windows/ffi/winnls_ffi'
             WinnlsFFI.GetACP.to_s
           end
         end

data/lib/facter/resolvers/windows/virtualization.rb

@@ -42,9 +42,9 @@ module Facter
             manufacturer = comp.Manufacturer
             if comp.Model =~ /^Virtual Machine/ && manufacturer =~ /^Microsoft/
               'hyperv'
-            elsif manufacturer =~ /^Xen/
+            elsif /^Xen/.match?(manufacturer)
               'xen'
-            elsif manufacturer =~ /^Amazon EC2/
+            elsif /^Amazon EC2/.match?(manufacturer)
               'kvm'
             else
               'physical'

data/lib/facter/resolvers/xen.rb

@@ -45,7 +45,7 @@ module Facter
           return if output.empty?
 
           output.each_line do |line|
-            next if line =~ /Domain-0|Name/
+            next if /Domain-0|Name/.match?(line)
 
             domain = line.match(/^([^\s]*)\s/)
             domain = domain&.captures&.first

data/lib/facter/util/api_debugger.rb

@@ -3,7 +3,7 @@
 module Facter
   module Util
     module ApiDebugger
-      def self.prepended(receiver) # rubocop:disable Metrics/AbcSize
+      def self.prepended(receiver)
         exclude, print_caller = parse_options(ENV['API_DEBUG'])
 
         receiver_methods = receiver.instance_methods - Object.methods