facter 4.1.1 → 4.2.0

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !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 +170,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:
@@ -774,6 +788,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 +851,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 +861,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 +1024,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
@@ -1045,9 +1059,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 +1074,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/facts/windows/virtualization/is_virtual.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Windows
-    module Virtualization
-      class IsVirtual
-        FACT_NAME = 'is_virtual'
-
-        def call_the_resolver
-          fact_value = Facter::Resolvers::Virtualization.resolve(:is_virtual)
-
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
-        end
-      end
-    end
-  end
-end

data/lib/facter/facts/windows/virtualization/virtual.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Windows
-    module Virtualization
-      class Virtual
-        FACT_NAME = 'virtual'
-
-        def call_the_resolver
-          fact_value = Facter::Resolvers::Virtualization.resolve(:virtual)
-
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
-        end
-      end
-    end
-  end
-end

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

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module FactAugmenter
-    def self.augment_resolved_facts(searched_facts, resolved_facts)
-      augumented_resolved_facts = []
-      searched_facts.each do |searched_fact|
-        matched_facts = get_resolved_facts_for_searched_fact(searched_fact, resolved_facts)
-        augment_resolved_fact_for_user_query!(searched_fact, matched_facts)
-        augumented_resolved_facts.concat(matched_facts)
-      end
-
-      augumented_resolved_facts
-    end
-
-    private_class_method def self.get_resolved_facts_for_searched_fact(searched_fact, resolved_facts)
-      if searched_fact.name.include?('.*')
-        resolved_facts
-          .select { |resolved_fact| resolved_fact.name.match(searched_fact.name) }
-          .reject(&:user_query)
-          .uniq(&:name)
-      else
-        resolved_facts.select do |resolved_fact|
-          valid_fact(searched_fact, resolved_fact)
-        end.reject(&:user_query).uniq(&:name)
-      end
-    end
-
-    private_class_method def self.augment_resolved_fact_for_user_query!(searched_fact, matched_facts)
-      matched_facts.each do |matched_fact|
-        matched_fact.user_query = searched_fact.user_query
-        matched_fact.filter_tokens = searched_fact.filter_tokens
-      end
-    end
-
-    private_class_method def self.valid_fact(searched_fact, resolved_fact)
-      return false unless searched_fact.name.eql?(resolved_fact.name)
-
-      if searched_fact.filter_tokens.any?
-        case resolved_fact.value
-        when Array, Hash
-          begin
-            resolved_fact.value.dig(*searched_fact.filter_tokens)
-          rescue TypeError
-            return false
-          end
-        else
-          return false
-        end
-      end
-      true
-    end
-  end
-end

data/lib/facter/util/facts/virtual_detector.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Util
-    module Facts
-      class VirtualDetector
-        def initialize
-          @log = Facter::Log.new(self)
-        end
-
-        def platform
-          @@fact_value ||= check_docker_lxc || check_freebsd || check_gce || retrieve_from_virt_what
-          @@fact_value ||= check_vmware || check_open_vz || check_vserver || check_xen || check_other_facts
-          @@fact_value ||= check_lspci || 'physical'
-
-          @@fact_value
-        end
-
-        private
-
-        def check_docker_lxc
-          @log.debug('Checking Docker and LXC')
-          Facter::Resolvers::Containers.resolve(:vm)
-        end
-
-        def check_gce
-          @log.debug('Checking GCE')
-          bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
-          'gce' if bios_vendor&.include?('Google')
-        end
-
-        def check_vmware
-          @log.debug('Checking VMware')
-          Facter::Resolvers::Vmware.resolve(:vm)
-        end
-
-        def retrieve_from_virt_what
-          @log.debug('Checking virtual_what')
-          Facter::Resolvers::VirtWhat.resolve(:vm)
-        end
-
-        def check_open_vz
-          @log.debug('Checking OpenVZ')
-          Facter::Resolvers::OpenVz.resolve(:vm)
-        end
-
-        def check_vserver
-          @log.debug('Checking VServer')
-          Facter::Resolvers::VirtWhat.resolve(:vserver)
-        end
-
-        def check_xen
-          @log.debug('Checking XEN')
-          Facter::Resolvers::Xen.resolve(:vm)
-        end
-
-        def check_freebsd
-          return unless Object.const_defined?('Facter::Resolvers::Freebsd::Virtual')
-
-          @log.debug('Checking if jailed')
-          Facter::Resolvers::Freebsd::Virtual.resolve(:vm)
-        end
-
-        def check_other_facts
-          @log.debug('Checking others')
-          product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
-          bios_vendor =  Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
-          return 'kvm' if bios_vendor&.include?('Amazon EC2')
-          return unless product_name
-
-          Facter::Util::Facts::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
-
-          nil
-        end
-
-        def check_lspci
-          @log.debug('Checking lspci')
-          Facter::Resolvers::Lspci.resolve(:vm)
-        end
-      end
-    end
-  end
-end