facter 4.0.29 → 4.0.34

data/lib/facter/facts/macosx/dhcp_servers.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class DhcpServers
+      FACT_NAME = 'dhcp_servers'
+
+      def call_the_resolver
+        fact_value = construct_addresses_hash
+        fact_value = !fact_value || fact_value.empty? ? nil : fact_value
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+
+      private
+
+      def construct_addresses_hash
+        primary_dhcp = Facter::Resolvers::Macosx::Networking.resolve(:dhcp)
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        return unless interfaces
+
+        servers = { system: primary_dhcp }
+        interfaces&.each { |interface_name, info| servers[interface_name] = info[:dhcp] if info[:dhcp] }
+        servers
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/ipaddress6_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class Ipaddress6Interfaces
+      FACT_NAME = 'ipaddress6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("ipaddress6_#{interface_name}", info[:ip6], :legacy) if info[:ip6]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/ipaddress_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class IpaddressInterfaces
+      FACT_NAME = 'ipaddress_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("ipaddress_#{interface_name}", info[:ip], :legacy) if info[:ip]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/macaddress_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class MacaddressInterfaces
+      FACT_NAME = 'macaddress_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("macaddress_#{interface_name}", info[:mac], :legacy) if info[:mac]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/mtu_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class MtuInterfaces
+      FACT_NAME = 'mtu_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("mtu_#{interface_name}", info[:mtu], :legacy) if info[:mtu]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/netmask6_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class Netmask6Interfaces
+      FACT_NAME = 'netmask6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("netmask6_#{interface_name}", info[:netmask6], :legacy) if info[:netmask6]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/netmask_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class NetmaskInterfaces
+      FACT_NAME = 'netmask_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("netmask_#{interface_name}", info[:netmask], :legacy) if info[:netmask]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/network6_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class Network6Interfaces
+      FACT_NAME = 'network6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("network6_#{interface_name}", info[:network6], :legacy) if info[:network6]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/network_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class NetworkInterfaces
+      FACT_NAME = 'network_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("network_#{interface_name}", info[:network], :legacy) if info[:network]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/scope6_interfaces.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    class Scope6Interfaces
+      FACT_NAME = 'scope6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        resolved_facts = []
+        interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+        primary_scope6 = Facter::Resolvers::Macosx::Networking.resolve(:scope6)
+
+        interfaces&.each do |interface_name, info|
+          if info[:scope6]
+            resolved_facts << Facter::ResolvedFact.new("scope6_#{interface_name}", info[:scope6], :legacy)
+          end
+        end
+        resolved_facts << Facter::ResolvedFact.new('scope6', primary_scope6, :legacy) if primary_scope6
+        resolved_facts
+      end
+    end
+  end
+end

data/lib/{facts → facter/facts}/macosx/ssh.rb

@@ -9,6 +9,8 @@ module Facts
         result = Facter::Resolvers::SshResolver.resolve(:ssh)
         ssh_facts = {}
         result.each { |ssh| ssh_facts.merge!(create_ssh_fact(ssh)) }
+
+        ssh_facts = nil if ssh_facts.empty?
         Facter::ResolvedFact.new(FACT_NAME, ssh_facts)
       end
 

data/lib/{facts → facter/facts}/macosx/system_profiler/hardware_uuid.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class HardwareUuid
         FACT_NAME = 'system_profiler.hardware_uuid'
-        ALIASES = 'sp_hardware_uuid'
+        ALIASES = 'sp_platform_uuid'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:hardware_uuid)

data/lib/{facts → facter/facts}/macosx/system_profiler/l2_cache_per_core.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class L2CachePerCore
         FACT_NAME = 'system_profiler.l2_cache_per_core'
-        ALIASES = 'sp_l2_cache_per_core'
+        ALIASES = 'sp_l2_cache_core'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:l2_cache_per_core)

data/lib/{facts → facter/facts}/macosx/system_profiler/memory.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class Memory
         FACT_NAME = 'system_profiler.memory'
-        ALIASES = 'sp_memory'
+        ALIASES = 'sp_physical_memory'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:memory)

data/lib/{facts → facter/facts}/macosx/system_profiler/processor_name.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class ProcessorName
         FACT_NAME = 'system_profiler.processor_name'
-        ALIASES = 'sp_processor_name'
+        ALIASES = 'sp_cpu_type'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:processor_name)

data/lib/{facts → facter/facts}/macosx/system_profiler/processors.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class Processors
         FACT_NAME = 'system_profiler.processors'
-        ALIASES = 'sp_cpu_type'
+        ALIASES = 'sp_packages'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:number_of_processors)