(FACT-2399) Restructure utils

treydock · Nov 25, 2020 · c3164f4 · c3164f4
1 parent 7245bc3
commit c3164f4
Show file tree

Hide file tree

Showing 230 changed files with 1,238 additions and 1,043 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,5 @@ build-iPhoneSimulator/
 .rspec_status
 Gemfile.lock
 Gemfile.local
+acceptance/vendor
+.beaker
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -28,9 +28,9 @@ RSpec/FilePath:
     - 'spec/custom_facts/util/normalization_spec.rb'
     - 'spec/custom_facts/util/parser_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
-    - 'spec/facter/facts_utils/uptime_parser_spec.rb'
-    - 'spec/facter/facts_utils/windows_release_finder_spec.rb'
-    - 'spec/facter/facts_utils/virtual_detector_spec.rb'
+    - 'spec/facter/util/facts/uptime_parser_spec.rb'
+    - 'spec/facter/util/facts/windows_release_finder_spec.rb'
+    - 'spec/facter/util/facts/virtual_detector_spec.rb'
     - 'spec/facter/model/fact_collection_spec.rb'
     - 'spec/facter/model/resolved_fact_spec.rb'
     - 'spec/facter/resolvers/aix/architecture_resolver_spec.rb'
@@ -54,7 +54,7 @@ RSpec/FilePath:
     - 'spec/facter/resolvers/system_profile_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/aix/odm_query_spec.rb'
     - 'spec/facter/resolvers/utils/macosx/filesystem_helper_spec.rb'
-    - 'spec/facter/resolvers/utils/windows/win32ole_spec.rb'
+    - 'spec/facter/util/windows/win32ole_spec.rb'
     - 'spec/facter/resolvers/windows/dmi_bios_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/dmi_computersystem_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/hardware_architecture_resolver_spec.rb'
@@ -104,7 +104,7 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/custom_facts/shared_contexts/platform.rb'
     - 'spec/custom_facts/util/collection_spec.rb'
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
-    - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
+    - 'spec/facter/util/windows/network_utils_spec.rb'
 
 # Offense count: 93
 # Configuration parameters: EnforcedStyle.
@@ -159,7 +159,7 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/windows/processors/physicalcount_spec.rb'
     - 'spec/facter/facts/windows/ruby/platform_spec.rb'
     - 'spec/facter/facts/windows/ruby/sitedir_spec.rb'
-    - 'spec/facter/resolvers/utils/aix/odm_query_spec.rb'
+    - 'spec/facter/util/aix/odm_query_spec.rb'
 
 # Offense count: 26
 RSpec/SubjectStub:
@@ -208,8 +208,8 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/resolvers/freebsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/mountpoints_resolver_spec.rb'
-    - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
-    - 'spec/facter/resolvers/utils/windows/win32ole_spec.rb'
+    - 'spec/facter/util/windows/network_utils_spec.rb'
+    - 'spec/facter/util/windows/win32ole_spec.rb'
     - 'spec/facter/resolvers/windows/dmi_bios_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/dmi_computersystem_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/hardware_architecture_resolver_spec.rb'

diff --git a/lib/facter/facts/aix/memory/swap/available.rb b/lib/facter/facts/aix/memory/swap/available.rb
@@ -11,7 +11,7 @@ class Available
           def call_the_resolver
             fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
             if fact_value
-              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:available_bytes])
+              fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value[:available_bytes])
             end
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/aix/memory/swap/available_bytes.rb b/lib/facter/facts/aix/memory/swap/available_bytes.rb
@@ -13,7 +13,7 @@ def call_the_resolver
             fact_value = fact_value[:available_bytes] if fact_value
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/aix/memory/swap/total.rb b/lib/facter/facts/aix/memory/swap/total.rb
@@ -11,7 +11,7 @@ class Total
           def call_the_resolver
             fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
             if fact_value
-              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:total_bytes])
+              fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value[:total_bytes])
             end
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/aix/memory/swap/total_bytes.rb b/lib/facter/facts/aix/memory/swap/total_bytes.rb
@@ -13,7 +13,7 @@ def call_the_resolver
             fact_value = fact_value[:total_bytes] if fact_value
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/aix/memory/swap/used.rb b/lib/facter/facts/aix/memory/swap/used.rb
@@ -10,7 +10,7 @@ class Used
           def call_the_resolver
             fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
             if fact_value
-              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:used_bytes])
+              fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value[:used_bytes])
             end
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

diff --git a/lib/facter/facts/aix/memory/system/available.rb b/lib/facter/facts/aix/memory/system/available.rb
@@ -11,7 +11,7 @@ class Available
           def call_the_resolver
             fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
             if fact_value
-              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:available_bytes])
+              fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value[:available_bytes])
             end
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/aix/memory/system/available_bytes.rb b/lib/facter/facts/aix/memory/system/available_bytes.rb
@@ -13,7 +13,7 @@ def call_the_resolver
             fact_value = fact_value[:available_bytes] if fact_value
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/aix/memory/system/total.rb b/lib/facter/facts/aix/memory/system/total.rb
@@ -11,7 +11,7 @@ class Total
           def call_the_resolver
             fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
             if fact_value
-              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:total_bytes])
+              fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value[:total_bytes])
             end
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/aix/memory/system/total_bytes.rb b/lib/facter/facts/aix/memory/system/total_bytes.rb
@@ -13,7 +13,7 @@ def call_the_resolver
             fact_value = fact_value[:total_bytes] if fact_value
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/aix/memory/system/used.rb b/lib/facter/facts/aix/memory/system/used.rb
@@ -10,7 +10,7 @@ class Used
           def call_the_resolver
             fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
             if fact_value
-              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:used_bytes])
+              fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value[:used_bytes])
             end
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

diff --git a/lib/facter/facts/aix/processors/speed.rb b/lib/facter/facts/aix/processors/speed.rb
@@ -8,7 +8,7 @@ class Speed
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Aix::Processors.resolve(:speed)
-          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          speed = Facter::Util::Facts::UnitConverter.hertz_to_human_readable(fact_value)
           Facter::ResolvedFact.new(FACT_NAME, speed)
         end
       end

diff --git a/lib/facter/facts/bsd/processors/speed.rb b/lib/facter/facts/bsd/processors/speed.rb
@@ -8,7 +8,7 @@ class Speed
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Bsd::Processors.resolve(:speed)
-          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          speed = Facter::Util::Facts::UnitConverter.hertz_to_human_readable(fact_value)
           Facter::ResolvedFact.new(FACT_NAME, speed)
         end
       end

diff --git a/lib/facter/facts/freebsd/is_virtual.rb b/lib/facter/facts/freebsd/is_virtual.rb
@@ -6,7 +6,7 @@ class IsVirtual
       FACT_NAME = 'is_virtual'
 
       def initialize
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver
@@ -18,7 +18,7 @@ def call_the_resolver
       private
 
       def check_if_virtual(found_vm)
-        Facter::FactsUtils::PHYSICAL_HYPERVISORS.count(found_vm).zero?
+        Facter::Util::Facts::PHYSICAL_HYPERVISORS.count(found_vm).zero?
       end
     end
   end

diff --git a/lib/facter/facts/freebsd/memory/swap/available.rb b/lib/facter/facts/freebsd/memory/swap/available.rb
@@ -10,7 +10,7 @@ class Available
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:available_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/freebsd/memory/swap/available_bytes.rb b/lib/facter/facts/freebsd/memory/swap/available_bytes.rb
@@ -11,7 +11,7 @@ class AvailableBytes
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:available_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/freebsd/memory/swap/total.rb b/lib/facter/facts/freebsd/memory/swap/total.rb
@@ -10,7 +10,7 @@ class Total
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:total_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/freebsd/memory/swap/total_bytes.rb b/lib/facter/facts/freebsd/memory/swap/total_bytes.rb
@@ -11,7 +11,7 @@ class TotalBytes
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:total_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/freebsd/memory/swap/used.rb b/lib/facter/facts/freebsd/memory/swap/used.rb
@@ -9,7 +9,7 @@ class Used
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:used_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
 
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

diff --git a/lib/facter/facts/freebsd/memory/system/available.rb b/lib/facter/facts/freebsd/memory/system/available.rb
@@ -10,7 +10,7 @@ class Available
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:available_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/freebsd/memory/system/available_bytes.rb b/lib/facter/facts/freebsd/memory/system/available_bytes.rb
@@ -11,7 +11,7 @@ class AvailableBytes
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:available_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/freebsd/memory/system/total.rb b/lib/facter/facts/freebsd/memory/system/total.rb
@@ -10,7 +10,7 @@ class Total
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:total_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

diff --git a/lib/facter/facts/freebsd/memory/system/total_bytes.rb b/lib/facter/facts/freebsd/memory/system/total_bytes.rb
@@ -11,7 +11,7 @@ class TotalBytes
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:total_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/freebsd/memory/system/used.rb b/lib/facter/facts/freebsd/memory/system/used.rb
@@ -9,7 +9,7 @@ class Used
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:used_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
 
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

diff --git a/lib/facter/facts/freebsd/processors/speed.rb b/lib/facter/facts/freebsd/processors/speed.rb
@@ -8,7 +8,7 @@ class Speed
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Freebsd::Processors.resolve(:speed)
-          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          speed = Facter::Util::Facts::UnitConverter.hertz_to_human_readable(fact_value)
           Facter::ResolvedFact.new(FACT_NAME, speed)
         end
       end

diff --git a/lib/facter/facts/freebsd/virtual.rb b/lib/facter/facts/freebsd/virtual.rb
@@ -7,7 +7,7 @@ class Virtual
 
       def initialize
         @log = Facter::Log.new(self)
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver

diff --git a/lib/facter/facts/linux/ec2_metadata.rb b/lib/facter/facts/linux/ec2_metadata.rb
@@ -6,7 +6,7 @@ class Ec2Metadata
       FACT_NAME = 'ec2_metadata'
 
       def initialize
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver

diff --git a/lib/facter/facts/linux/ec2_userdata.rb b/lib/facter/facts/linux/ec2_userdata.rb
@@ -6,7 +6,7 @@ class Ec2Userdata
       FACT_NAME = 'ec2_userdata'
 
       def initialize
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver

diff --git a/lib/facter/facts/linux/hypervisors/kvm.rb b/lib/facter/facts/linux/hypervisors/kvm.rb
@@ -29,7 +29,7 @@ def discover_hypervisor
 
           return unless product_name
 
-          Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+          Facter::Util::Facts::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
 
           product_name
         end

diff --git a/lib/facter/facts/linux/hypervisors/xen.rb b/lib/facter/facts/linux/hypervisors/xen.rb
@@ -42,7 +42,7 @@ def discover_hypervisor
           product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
           return unless product_name
 
-          Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+          Facter::Util::Facts::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
 
           product_name
         end

diff --git a/lib/facter/facts/linux/is_virtual.rb b/lib/facter/facts/linux/is_virtual.rb
@@ -6,7 +6,7 @@ class IsVirtual
       FACT_NAME = 'is_virtual'
 
       def initialize
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver
@@ -18,7 +18,7 @@ def call_the_resolver
       private
 
       def check_if_virtual(found_vm)
-        Facter::FactsUtils::PHYSICAL_HYPERVISORS.count(found_vm).zero?
+        Facter::Util::Facts::PHYSICAL_HYPERVISORS.count(found_vm).zero?
       end
     end
   end

diff --git a/lib/facter/facts/linux/memory/swap/available.rb b/lib/facter/facts/linux/memory/swap/available.rb
@@ -10,7 +10,7 @@ class Available
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end
         end

diff --git a/lib/facter/facts/linux/memory/swap/available_bytes.rb b/lib/facter/facts/linux/memory/swap/available_bytes.rb
@@ -12,7 +12,7 @@ def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free)
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/linux/memory/swap/total.rb b/lib/facter/facts/linux/memory/swap/total.rb
@@ -10,7 +10,7 @@ class Total
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end
         end

diff --git a/lib/facter/facts/linux/memory/swap/total_bytes.rb b/lib/facter/facts/linux/memory/swap/total_bytes.rb
@@ -11,7 +11,7 @@ class TotalBytes
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

diff --git a/lib/facter/facts/linux/memory/swap/used.rb b/lib/facter/facts/linux/memory/swap/used.rb
@@ -9,7 +9,7 @@ class Used
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_used_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end

diff --git a/lib/facter/facts/linux/memory/system/available.rb b/lib/facter/facts/linux/memory/system/available.rb
@@ -10,7 +10,7 @@ class Available
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:memfree)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
 
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end