(FACT-2541) Add TYPE for legacy facts (#439)

puppetlabs · Apr 8, 2020 · 673dff5 · 673dff5
1 parent e2fdbd6
commit 673dff5
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 1 deletion.
diff --git a/lib/facts/el/processor.rb b/lib/facts/el/processor.rb
@@ -4,6 +4,7 @@ module Facts
   module El
     class Processor
       FACT_NAME = 'processor.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/el/sshalgorithmkey.rb b/lib/facts/el/sshalgorithmkey.rb
@@ -4,6 +4,7 @@ module Facts
   module El
     class Sshalgorithmkey
       FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

diff --git a/lib/facts/el/sshfp_algorithm.rb b/lib/facts/el/sshfp_algorithm.rb
@@ -4,6 +4,7 @@ module Facts
   module El
     class SshfpAlgorithm
       FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

diff --git a/lib/facts/macosx/sshalgorithmkey.rb b/lib/facts/macosx/sshalgorithmkey.rb
@@ -4,6 +4,7 @@ module Facts
   module Macosx
     class Sshalgorithmkey
       FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

diff --git a/lib/facts/macosx/sshfp_algorithm.rb b/lib/facts/macosx/sshfp_algorithm.rb
@@ -4,6 +4,7 @@ module Facts
   module Macosx
     class SshfpAlgorithm
       FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

diff --git a/lib/facts/sles/processor.rb b/lib/facts/sles/processor.rb
@@ -4,6 +4,7 @@ module Facts
   module Sles
     class Processor
       FACT_NAME = 'processor.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/sles/sshalgorithmkey.rb b/lib/facts/sles/sshalgorithmkey.rb
@@ -4,6 +4,7 @@ module Facts
   module Sles
     class Sshalgorithmkey
       FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

diff --git a/lib/facts/sles/sshfp_algorithm.rb b/lib/facts/sles/sshfp_algorithm.rb
@@ -4,6 +4,7 @@ module Facts
   module Sles
     class SshfpAlgorithm
       FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

diff --git a/lib/facts/windows/ipaddress6_interfaces.rb b/lib/facts/windows/ipaddress6_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Ipaddress6Interfaces
       FACT_NAME = 'ipaddress6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/ipaddress_interfaces.rb b/lib/facts/windows/ipaddress_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class IpaddressInterfaces
       FACT_NAME = 'ipaddress_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/macaddress_interfaces.rb b/lib/facts/windows/macaddress_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class MacaddressInterfaces
       FACT_NAME = 'macaddress_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/mtu_interfaces.rb b/lib/facts/windows/mtu_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class MtuInterfaces
       FACT_NAME = 'mtu_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/netmask6_interfaces.rb b/lib/facts/windows/netmask6_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Netmask6Interfaces
       FACT_NAME = 'netmask6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/netmask_interfaces.rb b/lib/facts/windows/netmask_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class NetmaskInterfaces
       FACT_NAME = 'netmask_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/network6_interfaces.rb b/lib/facts/windows/network6_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Network6Interfaces
       FACT_NAME = 'network6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/network_interfaces.rb b/lib/facts/windows/network_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class NetworkInterfaces
       FACT_NAME = 'network_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/processor.rb b/lib/facts/windows/processor.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Processor
       FACT_NAME = 'processor.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/facts/windows/scope6_interfaces.rb b/lib/facts/windows/scope6_interfaces.rb
@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Scope6Interfaces
       FACT_NAME = 'scope6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

diff --git a/lib/framework/core/fact_loaders/internal_fact_loader.rb b/lib/framework/core/fact_loaders/internal_fact_loader.rb
@@ -37,7 +37,7 @@ def load_for_os(operating_system)
         # if fact is already loaded, skip it
         next if @facts.any? { |fact| fact.name == fact_name }
 
-        type = fact_name.end_with?('.*') ? :legacy : :core
+        type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
         load_fact(fact_name, class_name, type)
         next unless class_name.const_defined?('ALIASES')