Merge pull request #2096 from puppetlabs/revert-2087-FACT-2748

Revert "(FACT-2748) Fix fact types on all platforms-Part 1"

lib/facter/facts/aix/hypervisors/lpar.rb

@@ -11,7 +11,7 @@ def call_the_resolver
           return Facter::ResolvedFact.new(FACT_NAME, nil) unless lpar_partition_number&.positive?
 
           Facter::ResolvedFact.new(FACT_NAME,
-                                   partition_number: lpar_partition_number.to_s,
+                                   partition_number: lpar_partition_number,
                                    partition_name: Facter::Resolvers::Lpar.resolve(:lpar_partition_name))
         end
       end

lib/facter/facts/linux/identity/gid.rb

@@ -8,7 +8,6 @@ class Gid
 
         def call_the_resolver
           fact_value = Facter::Resolvers::PosxIdentity.resolve(:gid)
-          fact_value = fact_value ? fact_value.to_s : nil
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end
       end

lib/facter/facts/linux/identity/uid.rb

@@ -8,7 +8,6 @@ class Uid
 
         def call_the_resolver
           fact_value = Facter::Resolvers::PosxIdentity.resolve(:uid)
-          fact_value = fact_value ? fact_value.to_s : nil
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end
       end

lib/facter/facts/linux/is_virtual.rb

@@ -57,7 +57,7 @@ def check_lspci
       end
 
       def check_if_virtual(found_vm)
-        Facter::FactsUtils::PHYSICAL_HYPERVISORS.count(found_vm).zero?.to_s
+        Facter::FactsUtils::PHYSICAL_HYPERVISORS.count(found_vm).zero?
       end
     end
   end

lib/facter/facts/linux/memory/swap/available_bytes.rb

@@ -10,9 +10,8 @@ class AvailableBytes
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free)
-            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value.to_s),
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
              Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end

lib/facter/facts/linux/memory/swap/total_bytes.rb

@@ -10,9 +10,7 @@ class TotalBytes
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total)
-            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
-
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value.to_s),
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
              Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end

lib/facter/facts/linux/memory/swap/used_bytes.rb

@@ -9,9 +9,7 @@ class UsedBytes
 
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_used_bytes)
-            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
-
-            Facter::ResolvedFact.new(FACT_NAME, fact_value.to_s)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

lib/facter/facts_utils/unit_converter.rb

@@ -9,7 +9,7 @@ def bytes_to_mb(value_in_bytes)
 
           value_in_bytes = value_in_bytes.to_i
 
-          (value_in_bytes / (1024.0 * 1024.0)).round(2).to_s
+          (value_in_bytes / (1024.0 * 1024.0)).round(2)
         end
 
         def hertz_to_human_readable(speed)

lib/facter/resolvers/fips_enabled_resolver.rb

@@ -16,7 +16,7 @@ def post_resolve(fact_name)
 
           def read_fips_file(fact_name)
             file_output = Util::FileHelper.safe_read('/proc/sys/crypto/fips_enabled')
-            @fact_list[:fips_enabled] = (file_output.strip == '1').to_s
+            @fact_list[:fips_enabled] = file_output.strip == '1'
             @fact_list[fact_name]
           end
         end

lib/facter/resolvers/identity_resolver.rb

@@ -19,7 +19,7 @@ def retrieve_identity(fact_name)
           login_info = Etc.getpwuid
           @fact_list[:gid] = login_info.gid
           @fact_list[:group] = Etc.getgrgid(login_info.gid).name
-          @fact_list[:privileged] = login_info.uid.zero?.to_s
+          @fact_list[:privileged] = login_info.uid.zero?
           @fact_list[:uid] = login_info.uid
           @fact_list[:user] = login_info.name
           @fact_list[fact_name]

lib/facter/resolvers/linux/load_averages.rb

@@ -14,7 +14,7 @@ def post_resolve(fact_name)
 
           def read_load_averages_file(fact_name)
             output = Util::FileHelper.safe_read('/proc/loadavg')
-            @fact_list[:load_averages] = {}.tap { |h| h['1m'], h['5m'], h['15m'], = output.split }
+            @fact_list[:load_averages] = {}.tap { |h| h['1m'], h['5m'], h['15m'], = output.split.map(&:to_f) }
 
             @fact_list[fact_name]
           end

lib/facter/resolvers/memory_resolver.rb

@@ -57,10 +57,7 @@ def reclaimable_memory(output)
           end
 
           def compute_capacity(used, total)
-            capacity = (used / total.to_f * 100)
-            return '0%' if capacity.zero?
-
-            format('%<computed_capacity>.2f', computed_capacity: capacity) + '%'
+            format('%<computed_capacity>.2f', computed_capacity: (used / total.to_f * 100)) + '%'
           end
 
           def compute_used(total, free)

spec/facter/facts/aix/hypervisors/lpar_spec.rb

@@ -5,7 +5,6 @@
     subject(:fact) { Facts::Aix::Hypervisors::Lpar.new }
 
     let(:value) { { 'partition_number' => 13, 'partition_name' => 'aix6-7' } }
-    let(:result) { { 'partition_number' => '13', 'partition_name' => 'aix6-7' } }
 
     before do
       allow(Facter::Resolvers::Lpar).to receive(:resolve).with(:lpar_partition_number)
@@ -26,7 +25,7 @@
 
     it 'returns a hypervisors.lpar fact' do
       expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
-        have_attributes(name: 'hypervisors.lpar', value: result)
+        have_attributes(name: 'hypervisors.lpar', value: value)
     end
   end
 end

spec/facter/facts/aix/memory/swap/available_bytes_spec.rb

@@ -6,7 +6,7 @@
 
     let(:value) { { available_bytes: 2_332_425, total_bytes: 2_332_999, used_bytes: 1024 } }
     let(:result) { 2_332_425 }
-    let(:value_mb) { '2.22' }
+    let(:value_mb) { 2.22 }
 
     before do
       allow(Facter::Resolvers::Aix::Memory).to \

spec/facter/facts/aix/memory/swap/total_bytes_spec.rb

@@ -6,7 +6,7 @@
 
     let(:value) { { available_bytes: 2_332_425, total_bytes: 2_332_999, used_bytes: 1024 } }
     let(:result) { 2_332_999 }
-    let(:value_mb) { '2.22' }
+    let(:value_mb) { 2.22 }
 
     before do
       allow(Facter::Resolvers::Aix::Memory).to \

spec/facter/facts/aix/memory/system/available_bytes_spec.rb

@@ -6,7 +6,7 @@
 
     let(:resolver_output) { { available_bytes: 2_332_425, total_bytes: 2_332_999, used_bytes: 1024 } }
     let(:value) { 2_332_425 }
-    let(:value_mb) { '2.22' }
+    let(:value_mb) { 2.22 }
 
     before do
       allow(Facter::Resolvers::Aix::Memory).to \

spec/facter/facts/aix/memory/system/total_bytes_spec.rb

@@ -6,7 +6,7 @@
 
     let(:resolver_output) { { available_bytes: 2_332_425, total_bytes: 2_332_999, used_bytes: 1024 } }
     let(:value) { 2_332_999 }
-    let(:value_mb) { '2.22' }
+    let(:value_mb) { 2.22 }
 
     before do
       allow(Facter::Resolvers::Aix::Memory).to \

spec/facter/facts/freebsd/memory/swap/available_bytes_spec.rb

@@ -5,7 +5,7 @@
     subject(:fact) { Facts::Freebsd::Memory::Swap::AvailableBytes.new }
 
     let(:value) { 1024 * 1024 }
-    let(:value_mb) { '1.0' }
+    let(:value_mb) { 1 }
 
     before do
       allow(Facter::Resolvers::Freebsd::SwapMemory).to receive(:resolve).with(:available_bytes).and_return(value)

spec/facter/facts/freebsd/memory/swap/total_bytes_spec.rb

@@ -5,7 +5,7 @@
     subject(:fact) { Facts::Freebsd::Memory::Swap::TotalBytes.new }
 
     let(:value) { 1024 * 1024 }
-    let(:value_mb) { '1.0' }
+    let(:value_mb) { 1 }
 
     before do
       allow(Facter::Resolvers::Freebsd::SwapMemory).to receive(:resolve).with(:total_bytes).and_return(value)

spec/facter/facts/freebsd/memory/system/available_bytes_spec.rb

@@ -5,7 +5,7 @@
     subject(:fact) { Facts::Freebsd::Memory::System::AvailableBytes.new }
 
     let(:value) { 1024 * 1024 }
-    let(:value_mb) { '1.0' }
+    let(:value_mb) { 1 }
 
     before do
       allow(Facter::Resolvers::Freebsd::SystemMemory).to receive(:resolve).with(:available_bytes).and_return(value)

spec/facter/facts/freebsd/memory/system/total_bytes_spec.rb

@@ -5,7 +5,7 @@
     subject(:fact) { Facts::Freebsd::Memory::System::TotalBytes.new }
 
     let(:value) { 1024 * 1024 }
-    let(:value_mb) { '1.0' }
+    let(:value_mb) { 1 }
 
     before do
       allow(Facter::Resolvers::Freebsd::SystemMemory).to receive(:resolve).with(:total_bytes).and_return(value)

spec/facter/facts/linux/is_virtual_spec.rb

@@ -5,7 +5,7 @@
     subject(:fact) { Facts::Linux::IsVirtual.new }
 
     let(:vm) { 'docker' }
-    let(:value) { 'true' }
+    let(:value) { true }
 
     before do
       allow(Facter::Resolvers::Containers).to receive(:resolve).with(:vm).and_return(vm)
@@ -23,7 +23,7 @@
 
     context 'when is gce' do
       let(:vm) { nil }
-      let(:value) { 'true' }
+      let(:value) { true }
 
       before do
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return('Google Engine')
@@ -38,7 +38,7 @@
     context 'when is vmware' do
       let(:vm) { nil }
       let(:vmware_value) { 'vmware_fusion' }
-      let(:value) { 'true' }
+      let(:value) { true }
 
       before do
         allow(Facter::Resolvers::Vmware).to receive(:resolve).with(:vm).and_return(vmware_value)
@@ -53,7 +53,7 @@
     context 'when is xen-hvm' do
       let(:vm) { nil }
       let(:virtwhat_value) { 'xenhvm' }
-      let(:value) { 'true' }
+      let(:value) { true }
 
       before do
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
@@ -69,7 +69,7 @@
     context 'when is openVz' do
       let(:vm) { nil }
       let(:openvz_value) { 'openvzve' }
-      let(:value) { 'true' }
+      let(:value) { true }
 
       before do
         allow(Facter::Resolvers::OpenVz).to receive(:resolve).with(:vm).and_return(openvz_value)
@@ -84,7 +84,7 @@
     context 'when is vserver' do
       let(:vm) { nil }
       let(:virtwhat_value) { 'vserver_host' }
-      let(:value) { 'false' }
+      let(:value) { false }
 
       before do
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vm).and_return(nil)
@@ -100,7 +100,7 @@
     context 'when is xen priviledged' do
       let(:vm) { nil }
       let(:xen_value) { 'xen0' }
-      let(:value) { 'false' }
+      let(:value) { false }
 
       before do
         allow(Facter::Resolvers::Xen).to receive(:resolve).with(:vm).and_return(xen_value)
@@ -114,7 +114,7 @@
 
     context 'when is bochs discovered with dmi product_name' do
       let(:vm) { nil }
-      let(:value) { 'true' }
+      let(:value) { true }
 
       before do
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
@@ -130,7 +130,7 @@
     context 'when is hyper-v discovered with lspci' do
       let(:vm) { nil }
       let(:lspci_value) { 'hyperv' }
-      let(:value) { 'true' }
+      let(:value) { true }
 
       before do
         allow(Facter::Resolvers::Lspci).to receive(:resolve).with(:vm).and_return(lspci_value)
@@ -143,10 +143,9 @@
     end
 
     context 'when resolvers return nil ' do
-      let(:vm) { 'false' }
+      let(:vm) { false }
 
       before do
-        allow(Facter::Resolvers::Containers).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return(nil)
         allow(Facter::Resolvers::Lspci).to receive(:resolve).with(:vm).and_return(nil)
@@ -159,7 +158,7 @@
     end
 
     context 'when product name is not found in the HYPERVISORS_HASH' do
-      let(:vm) { 'false' }
+      let(:vm) { false }
 
       before do
         allow(Facter::Resolvers::Containers).to receive(:resolve).with(:vm).and_return(nil)

spec/facter/facts/linux/memory/swap/available_bytes_spec.rb

@@ -7,9 +7,6 @@
     let(:value) { 2_332_425 }
     let(:value_mb) { 2.22 }
 
-    let(:result) { '2332425' }
-    let(:result_mb) { '2.22' }
-
     before do
       allow(Facter::Resolvers::Linux::Memory).to \
         receive(:resolve).with(:swap_free).and_return(value)
@@ -22,16 +19,17 @@
 
     it 'returns swap available bytes fact' do
       expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
-        contain_exactly(an_object_having_attributes(name: 'memory.swap.available_bytes', value: result),
-                        an_object_having_attributes(name: 'swapfree_mb', value: result_mb, type: :legacy))
+        contain_exactly(an_object_having_attributes(name: 'memory.swap.available_bytes', value: value),
+                        an_object_having_attributes(name: 'swapfree_mb', value: value_mb, type: :legacy))
     end
 
     describe '#call_the_resolver when resolver returns nil' do
       let(:value) { nil }
 
       it 'returns swap available memory in bytes fact as nil' do
-        expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
-          have_attributes(name: 'memory.swap.available_bytes', value: value)
+        expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
+          contain_exactly(an_object_having_attributes(name: 'memory.swap.available_bytes', value: value),
+                          an_object_having_attributes(name: 'swapfree_mb', value: value, type: :legacy))
       end
     end
   end

spec/facter/facts/linux/memory/swap/total_bytes_spec.rb

@@ -5,8 +5,7 @@
     subject(:fact) { Facts::Linux::Memory::Swap::TotalBytes.new }
 
     let(:value) { 2_332_425 }
-    let(:result) { '2332425' }
-    let(:value_mb) { '2.22' }
+    let(:value_mb) { 2.22 }
 
     before do
       allow(Facter::Resolvers::Linux::Memory).to \
@@ -20,16 +19,17 @@
 
     it 'returns swap total memory in bytes fact' do
       expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
-        contain_exactly(an_object_having_attributes(name: 'memory.swap.total_bytes', value: result),
+        contain_exactly(an_object_having_attributes(name: 'memory.swap.total_bytes', value: value),
                         an_object_having_attributes(name: 'swapsize_mb', value: value_mb, type: :legacy))
     end
 
     describe '#call_the_resolver when resolver returns nil' do
       let(:value) { nil }
 
       it 'returns swap total memory in bytes fact as nil' do
-        expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
-          have_attributes(name: 'memory.swap.total_bytes', value: value)
+        expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
+          contain_exactly(an_object_having_attributes(name: 'memory.swap.total_bytes', value: value),
+                          an_object_having_attributes(name: 'swapsize_mb', value: value, type: :legacy))
       end
     end
   end

spec/facter/facts/linux/memory/swap/used_bytes_spec.rb

@@ -5,7 +5,6 @@
     subject(:fact) { Facts::Linux::Memory::Swap::UsedBytes.new }
 
     let(:value) { 1024 }
-    let(:result) { '1024' }
 
     before do
       allow(Facter::Resolvers::Linux::Memory).to \
@@ -19,7 +18,7 @@
 
     it 'returns swap used memory in bytes fact' do
       expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
-        have_attributes(name: 'memory.swap.used_bytes', value: result)
+        have_attributes(name: 'memory.swap.used_bytes', value: value)
     end
   end
 end

spec/facter/facts/linux/memory/system/available_bytes_spec.rb

@@ -5,7 +5,7 @@
     subject(:fact) { Facts::Linux::Memory::System::AvailableBytes.new }
 
     let(:value) { 2_332_425 }
-    let(:value_mb) { '2.22' }
+    let(:value_mb) { 2.22 }
 
     before do
       allow(Facter::Resolvers::Linux::Memory).to \