facter 4.0.28 → 4.0.29

data/lib/resolvers/macosx/utils/system_profile_executor.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Macosx
+      class SystemProfileExecutor
+        @log = Log.new(self)
+
+        class << self
+          def execute(category_name)
+            @log.debug "Executing command: system_profiler #{category_name}"
+            output = Facter::Core::Execution.execute(
+              "system_profiler #{category_name}", logger: @log
+            )&.force_encoding('UTF-8')
+
+            return unless output
+
+            system_profiler_hash = output_to_hash(output)
+
+            normalize_keys(system_profiler_hash)
+          end
+
+          private
+
+          def output_to_hash(output)
+            output.scan(/.*:[ ].*$/).map { |e| e.strip.match(/(.*?): (.*)/).captures }.to_h
+          end
+
+          def normalize_keys(system_profiler_hash)
+            system_profiler_hash.map do |k, v|
+              [k.downcase.tr(' ', '_').delete("\(\)").to_sym, v]
+            end.to_h
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/networking_linux_resolver.rb

@@ -22,6 +22,7 @@ module Facter
           retrieve_interface_info
           retrieve_interfaces_mac_and_mtu
           retrieve_default_interface
+          ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
           @fact_list[fact_name]
         end
 
@@ -46,8 +47,6 @@ module Facter
             find_dhcp!(ip_tokens, interfaces)
           end
 
-          ::Resolvers::Utils::Networking.expand_main_bindings(interfaces)
-
           @fact_list[:interfaces] = interfaces
         end
 

data/lib/resolvers/os_release_resolver.rb

@@ -37,6 +37,7 @@ module Facter
           fill_fact_list(pairs)
           process_name
           pad_version_id
+          normalize_opensuse_identifier
 
           @fact_list[fact_name]
         end
@@ -61,6 +62,10 @@ module Facter
                                 @fact_list[:name].split(' ')[0].strip
                               end
         end
+
+        def normalize_opensuse_identifier
+          @fact_list[:identifier] = 'opensuse' if @fact_list[:identifier] =~ /opensuse/i
+        end
       end
     end
   end

data/lib/resolvers/utils/networking.rb

@@ -17,11 +17,12 @@ module Resolvers
           { address: addr, netmask: mask.to_s, network: ip.mask(mask_length).to_s }
         end
 
-        def expand_main_bindings(interfaces)
-          interfaces.each_value do |values|
-            expand_binding(values, values[:bindings]) if values[:bindings]
-            expand_binding(values, values[:bindings6], false) if values[:bindings6]
-          end
+        def expand_main_bindings(networking_facts)
+          primary = networking_facts[:primary_interface]
+          interfaces = networking_facts[:interfaces]
+
+          expand_interfaces(interfaces) unless interfaces.nil?
+          expand_primary_interface(networking_facts, primary) unless primary.nil? || interfaces.nil?
         end
 
         def get_scope(ip)
@@ -55,6 +56,19 @@ module Resolvers
 
         private
 
+        def expand_interfaces(interfaces)
+          interfaces.each_value do |values|
+            expand_binding(values, values[:bindings]) if values[:bindings]
+            expand_binding(values, values[:bindings6], false) if values[:bindings6]
+          end
+        end
+
+        def expand_primary_interface(networking_facts, primary)
+          networking_facts[:interfaces][primary].each do |key, value|
+            networking_facts[key] = value unless %i[bindings bindings6].include?(key)
+          end
+        end
+
         def expand_binding(values, bindings, ipv4_type = true)
           binding = find_valid_binding(bindings)
           ip_protocol_type = ipv4_type ? '' : '6'

data/lib/resolvers/windows/ffi/network_utils.rb

@@ -34,32 +34,5 @@ class NetworkUtils
                                .map { |e| format('%<mac_address>02x', mac_address: e.to_i) }
                                .join(':').upcase
     end
-
-    def build_binding(addr, mask_length)
-      ip = IPAddr.new(addr)
-      mask = if ip.ipv6?
-               IPAddr.new('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff').mask(mask_length)
-             else
-               IPAddr.new('255.255.255.255').mask(mask_length)
-             end
-      { address: addr, netmask: mask.to_s, network: ip.mask(mask_length).to_s }
-    end
-
-    def get_scope(sockaddr)
-      require 'socket'
-      scope6 = []
-      addrinfo = Addrinfo.new(['AF_INET6', 0, nil, sockaddr], :INET6)
-
-      scope6 << 'compat,' if addrinfo.ipv6_v4compat?
-      scope6 << if addrinfo.ipv6_linklocal?
-                  'link'
-                elsif addrinfo.ipv6_sitelocal?
-                  'site'
-                elsif addrinfo.ipv6_loopback?
-                  'host'
-                else 'global'
-                end
-      scope6.join
-    end
   end
 end

data/lib/resolvers/windows/networking_resolver.rb

@@ -26,8 +26,9 @@ module Facter
           return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
 
           iterate_list(adapter_addresses)
-          set_interfaces_other_facts if @fact_list[:interfaces]
-          @fact_list[:primary_interface] = @fact_list[:primary_interface].to_s
+
+          ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+
           @fact_list[fact_name]
         end
 
@@ -70,7 +71,7 @@ module Facter
               next
             end
             @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
-            name = adapter_address[:FriendlyName].read_wide_string_without_length.to_sym
+            name = adapter_address[:FriendlyName].read_wide_string_without_length
             net_interface[name] = build_interface_info(adapter_address, name)
           end
 
@@ -120,58 +121,14 @@ module Facter
         def find_bindings(sock_addr, unicast, addr)
           return unless [NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family])
 
-          NetworkUtils.build_binding(addr, unicast[:OnLinkPrefixLength])
+          ::Resolvers::Utils::Networking.build_binding(addr, unicast[:OnLinkPrefixLength])
         end
 
         def find_primary_interface(sock_addr, name, addr)
           if !@fact_list[:primary_interface] &&
              ([NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family]) &&
-                 !NetworkUtils.ignored_ip_address(addr))
-            @fact_list[:primary_interface] = name
-          end
-        end
-
-        def set_interfaces_other_facts
-          @fact_list[:interfaces].each do |interface_name, value|
-            if value[:bindings]
-              binding = find_valid_binding(value[:bindings])
-              populate_interface(binding, value)
-            end
-            if value[:bindings6]
-              binding = find_valid_binding(value[:bindings6])
-              populate_interface(binding, value, true)
-            end
-            set_networking_other_facts(value, interface_name)
-          end
-        end
-
-        def find_valid_binding(bindings)
-          bindings.each do |binding|
-            return binding unless NetworkUtils.ignored_ip_address(binding[:address])
-          end
-          bindings.empty? ? nil : bindings.first
-        end
-
-        def populate_interface(bind, interface, ipv6 = false)
-          return if !bind || bind.empty?
-
-          if ipv6
-            interface[:ip6] = bind[:address]
-            interface[:netmask6] = bind[:netmask]
-            interface[:network6] = bind[:network]
-            interface[:scope6] =  NetworkUtils.get_scope(bind[:address])
-          else
-            interface[:network] = bind[:network]
-            interface[:netmask] = bind[:netmask]
-            interface[:ip] = bind[:address]
-          end
-        end
-
-        def set_networking_other_facts(value, interface_name)
-          return unless @fact_list[:primary_interface] == interface_name
-
-          %i[mtu dhcp mac ip ip6 scope6 netmask netmask6 network network6].each do |key|
-            @fact_list[key] = value[key]
+                 !::Resolvers::Utils::Networking.ignored_ip_address(addr))
+            @fact_list[:primary_interface] = name.to_s
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.28
+  version: 4.0.29
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -383,17 +383,35 @@ files:
 - lib/facts/aix/identity/privileged.rb
 - lib/facts/aix/identity/uid.rb
 - lib/facts/aix/identity/user.rb
+- lib/facts/aix/interfaces.rb
+- lib/facts/aix/ipaddress6_interfaces.rb
+- lib/facts/aix/ipaddress_interfaces.rb
 - lib/facts/aix/kernel.rb
 - lib/facts/aix/kernelmajversion.rb
 - lib/facts/aix/kernelrelease.rb
 - lib/facts/aix/kernelversion.rb
 - lib/facts/aix/load_averages.rb
+- lib/facts/aix/macaddress_interfaces.rb
 - lib/facts/aix/mountpoints.rb
+- lib/facts/aix/mtu_interfaces.rb
+- lib/facts/aix/netmask6_interfaces.rb
+- lib/facts/aix/netmask_interfaces.rb
+- lib/facts/aix/network6_interfaces.rb
+- lib/facts/aix/network_interfaces.rb
 - lib/facts/aix/networking/domain.rb
 - lib/facts/aix/networking/fqdn.rb
 - lib/facts/aix/networking/hostname.rb
+- lib/facts/aix/networking/interfaces.rb
 - lib/facts/aix/networking/ip.rb
+- lib/facts/aix/networking/ip6.rb
+- lib/facts/aix/networking/mac.rb
+- lib/facts/aix/networking/mtu.rb
+- lib/facts/aix/networking/netmask.rb
+- lib/facts/aix/networking/netmask6.rb
+- lib/facts/aix/networking/network.rb
+- lib/facts/aix/networking/network6.rb
 - lib/facts/aix/networking/primary.rb
+- lib/facts/aix/networking/scope6.rb
 - lib/facts/aix/nim_type.rb
 - lib/facts/aix/os/architecture.rb
 - lib/facts/aix/os/family.rb
@@ -402,6 +420,7 @@ files:
 - lib/facts/aix/os/release.rb
 - lib/facts/aix/partitions.rb
 - lib/facts/aix/path.rb
+- lib/facts/aix/processor.rb
 - lib/facts/aix/processors/count.rb
 - lib/facts/aix/processors/isa.rb
 - lib/facts/aix/processors/models.rb
@@ -410,6 +429,7 @@ files:
 - lib/facts/aix/ruby/platform.rb
 - lib/facts/aix/ruby/sitedir.rb
 - lib/facts/aix/ruby/version.rb
+- lib/facts/aix/scope6_interfaces.rb
 - lib/facts/aix/ssh.rb
 - lib/facts/aix/system_uptime/days.rb
 - lib/facts/aix/system_uptime/hours.rb
@@ -644,6 +664,7 @@ files:
 - lib/facts/macosx/system_uptime/seconds.rb
 - lib/facts/macosx/system_uptime/uptime.rb
 - lib/facts/macosx/timezone.rb
+- lib/facts/macosx/virtual.rb
 - lib/facts/rhel/os/distro/codename.rb
 - lib/facts/rhel/os/distro/description.rb
 - lib/facts/rhel/os/distro/id.rb
@@ -869,11 +890,12 @@ files:
 - lib/resolvers/macosx/filesystems_resolver.rb
 - lib/resolvers/macosx/load_averages_resolver.rb
 - lib/resolvers/macosx/mountpoints_resolver.rb
-- lib/resolvers/macosx/networking.rb
+- lib/resolvers/macosx/networking_resolver.rb
 - lib/resolvers/macosx/processor_resolver.rb
 - lib/resolvers/macosx/swap_memory_resolver.rb
 - lib/resolvers/macosx/system_memory_resolver.rb
 - lib/resolvers/macosx/system_profiler_resolver.rb
+- lib/resolvers/macosx/utils/system_profile_executor.rb
 - lib/resolvers/memory_resolver.rb
 - lib/resolvers/mountpoints_resolver.rb
 - lib/resolvers/networking_linux_resolver.rb