facter 4.2.7 → 4.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5648b99a92b05c556d728186e4df5fed506b8edf3ca2ac1e77708a2ebe9b8359
-  data.tar.gz: 9e58e46ab92d8d4aeffcf54a4b13b8d25ca751e08669f73c067a245cb96bdd93
+  metadata.gz: 72df8d4e967960151a122eb609784efda469ec7eeffd57fcd0ccac160b8e0fcd
+  data.tar.gz: 57f7131294d62d0fa7a36d49e5f722f78aea2d9f9400720d651d896347ec8f67
 SHA512:
-  metadata.gz: 467e8ef226865d0ae6d88fca05bc8c44e4dbbc10dec1e8117947e68dac09b5046878eaf3e2a45d1dd572b9b3b76f44ff14a7c62653df83854ee38172a0e576cf
-  data.tar.gz: 71405bf059cbba0572136a4d67db8700542f62f668a4f50f7fe99a818f82bc5f114bb8f12baa3a86be5bd59e50337e23e34f485dd5bae522c0d0a8ee8206a928
+  metadata.gz: ef543fee67eeff6371587b5c16fc1cb4dfbfee9647a41bb844ca0554111de6499dab5bf16fe3a8e3025489c6ebcfd88f9ccc3ffe2b14f514897066740bb979c6
+  data.tar.gz: 33fbe62bc7d09ed9c8f564f4727a7058c94439eeeb69396be5209d28656d6b4d34577eb271c62c9f93de38b585cab805de56b8d2e7971fca28d6121c6cae9a6c

data/lib/facter/facts/linux/cloud/provider.rb

@@ -10,6 +10,8 @@ module Facts
           provider = case Facter::Util::Facts::Posix::VirtualDetector.platform
                      when 'hyperv'
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                     when 'kvm', 'xen'
+                       'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

data/lib/facter/facts/windows/cloud/provider.rb

@@ -11,6 +11,8 @@ module Facts
           provider = case virtual
                      when 'hyperv'
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                     when 'kvm', 'xen'
+                       'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

data/lib/facter/framework/core/cache_manager.rb

@@ -227,7 +227,7 @@ cache_format_version is incorrect!")
 
       begin
         File.delete(cache_file_name) if File.readable?(cache_file_name)
-      rescue Errno::EACCES => e
+      rescue Errno::EACCES, Errno::EROFS => e
         @log.warn("Could not delete cache: #{e.message}")
       end
     end

data/lib/facter/resolvers/disks.rb

@@ -34,7 +34,7 @@ module Facter
 
           def lsblk(option, disk)
             result = Facter::Core::Execution.execute(
-              "/usr/bin/lsblk -dn -o #{option} /dev/#{disk}", on_fail: '', timeout: 1
+              "lsblk -dn -o #{option} /dev/#{disk}", on_fail: '', timeout: 1
             ).strip
             result.empty? ? nil : result
           end

data/lib/facter/resolvers/virt_what.rb

@@ -34,11 +34,13 @@ module Facter
         end
 
         def determine_other(output)
-          other_vm = output.split("\n").first
+          values = output.split("\n")
+          other_vm = values.first
           return unless other_vm
 
           return 'zlinux' if other_vm =~ /ibm_systemz/
           return retrieve_vserver if other_vm =~ /linux_vserver/
+          return (values - ['redhat']).first if values.include?('redhat')
 
           other_vm
         end

data/lib/facter/util/facts/windows_release_finder.rb

@@ -14,7 +14,7 @@ module Facter
             kernel_version = input[:kernel_version]
 
             if version =~ /10.0/
-              check_version_10(consumerrel, kernel_version)
+              check_version_10_11(consumerrel, kernel_version)
             else
               check_version_6(version, consumerrel) || check_version_5(version, consumerrel, description) || version
             end
@@ -22,10 +22,12 @@ module Facter
 
           private
 
-          def check_version_10(consumerrel, kernel_version)
+          def check_version_10_11(consumerrel, kernel_version)
+            build_number = kernel_version[/([^.]*)$/].to_i
+
+            return '11' if build_number >= 22_000
             return '10' if consumerrel
 
-            build_number = kernel_version[/([^.]*)$/].to_i
             if build_number >= 20_348
               '2022'
             elsif build_number >= 17_623

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.2.7' unless defined?(VERSION)
+  VERSION = '4.2.10' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.7
+  version: 4.2.10
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1094,7 +1094,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Facter, a system inventory tool