facter 4.0.36 → 4.0.41

data/lib/facter/resolvers/aix/mountpoints.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Mountpoints < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         BLOCK_SIZE = 512
 

data/lib/facter/resolvers/aix/networking_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Networking < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/aix/nim.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Nim < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/aix/os_level.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class OsLevel < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_oslevel(fact_name) }
+          end
+
+          def read_oslevel(fact_name)
+            output = Facter::Core::Execution.execute('/usr/bin/oslevel -s', { limit: 2, logger: log })
+            @fact_list[:build] = output unless output.empty?
+            @fact_list[:kernel] = 'AIX'
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/aix/partitions.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Partitions < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -14,8 +13,6 @@ module Facter
           end
 
           def query_cudv(fact_name)
-            @fact_list[:partitions] = {}
-
             odmquery = Facter::ODMQuery.new
             odmquery.equals('PdDvLn', 'logical_volume/lvsubclass/lvtype')
 
@@ -23,6 +20,8 @@ module Facter
 
             return unless result
 
+            @fact_list[:partitions] = {}
+
             result.each_line do |line|
               next unless line.include?('name')
 

data/lib/facter/resolvers/aix/processors.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Processors < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/aix/serialnumber.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Serialnumber < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/augeas_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Augeas < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/base_resolver.rb

@@ -16,15 +16,20 @@ module Facter
       end
 
       def self.resolve(fact_name)
-        @semaphore.synchronize do
-          subscribe_to_manager
-          post_resolve(fact_name)
-        end
+        subscribe_to_manager
+        post_resolve(fact_name)
+
+        validate_resolution(fact_name)
       rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 
+      def self.validate_resolution(fact_name)
+        @fact_list.fetch(fact_name) { @fact_list[fact_name] = nil }
+        @fact_list[fact_name]
+      end
+
       def self.post_resolve(_fact_name)
         raise NotImplementedError, "You must implement post_resolve(fact_name) method in #{name}"
       end

data/lib/facter/resolvers/bsd/processors.rb

@@ -5,7 +5,6 @@ module Facter
     module Bsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/cloud.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Cloud < BaseResolver
+      # cloud_provider
+
+      @fact_list ||= {}
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { detect_azure(fact_name) }
+        end
+
+        def detect_azure(fact_name)
+          search_dirs = %w[/var/lib/dhcp /var/lib/NetworkManager]
+          search_dirs.each do |path|
+            next if !File.readable?(path) || !File.directory?(path)
+
+            files = Dir.entries(path)
+            files.select! { |filename| filename =~ /^dhclient.*lease.*$/ }
+            files.each do |file|
+              path = File.join([path, file])
+              output = Util::FileHelper.safe_read(path)
+
+              if output.include?('option unknown-245') || output.include?('option 245')
+                @fact_list[:cloud_provider] = 'azure'
+                return @fact_list[fact_name]
+              end
+            end
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/containers.rb

@@ -6,7 +6,6 @@ module Facter
       # :virtual
       # :hypervisor
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
       INFO = { 'docker' => 'id', 'lxc' => 'name' }.freeze
 

data/lib/facter/resolvers/debian_version.rb

@@ -7,7 +7,6 @@ module Facter
       # :minor
       # :full
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/disk_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class Disk < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         DIR = '/sys/block'
         FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor' }.freeze

data/lib/facter/resolvers/dmi_decode.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DmiDecode < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       ADDRESS_TO_VERSION = {
@@ -38,6 +37,7 @@ module Facter
           @fact_list[:virtualbox_version] = output.match(/vboxVer_(\S+)/)&.captures&.first
           @fact_list[:virtualbox_revision] = output.match(/vboxRev_(\S+)/)&.captures&.first
           @fact_list[:vmware_version] = extract_vmware_version(output)
+          @fact_list[:vendor] = output.match(/Vendor: (\S+)/)&.captures&.first
 
           @fact_list[fact_name]
         end

data/lib/facter/resolvers/dmi_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class DmiBios < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/ec2.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Ec2 < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       EC2_METADATA_ROOT_URL = 'http://169.254.169.254/latest/meta-data/'
       EC2_USERDATA_ROOT_URL = 'http://169.254.169.254/latest/user-data/'

data/lib/facter/resolvers/eos_release_resolver.rb

@@ -7,7 +7,6 @@ module Facter
       # :version
       # :codename
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/facterversion_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Facterversion < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/filesystems_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class Filesystems < BaseResolver
         # :systems
-        @semaphore = Mutex.new
         @fact_list ||= {}
         @log = Facter::Log.new(self)
         class << self

data/lib/facter/resolvers/fips_enabled_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class FipsEnabled < BaseResolver
         #:fips_enabled
-        @semaphore = Mutex.new
         @fact_list ||= {}
         @log = Facter::Log.new(self)
         class << self

data/lib/facter/resolvers/freebsd/dmi_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Freebsd
       class DmiBios < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/freebsd/freebsd_version_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Freebsd
       class FreebsdVersion < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/freebsd/geom_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Freebsd
       class Geom < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/freebsd/processors.rb

@@ -7,7 +7,6 @@ module Facter
     module Freebsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/freebsd/swap_memory_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Freebsd
       class SwapMemory < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/freebsd/system_memory_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Freebsd
       class SystemMemory < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/gce.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Gce < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       METADATA_URL = 'http://metadata.google.internal/computeMetadata/v1/?recursive=true&alt=json'
       HEADERS = { "Metadata-Flavor": 'Google', "Accept": 'application/json' }.freeze

data/lib/facter/resolvers/hostname_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Hostname < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

data/lib/facter/resolvers/identity_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class PosxIdentity < BaseResolver
       @log = Facter::Log.new(self)
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/linux/docker_uptime.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class DockerUptime < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/linux/load_averages.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class LoadAverages < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/load_averages.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class LoadAverages < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

data/lib/facter/resolvers/lpar_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Lpar < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/lsb_release_resolver.rb

@@ -9,7 +9,6 @@ module Facter
       # :release
       # :codename
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/lspci.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Lspci < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       REGEX_VALUES = { 'VirtualBox' => 'virtualbox', 'XenSource' => 'xenhvm',

data/lib/facter/resolvers/macosx/dmi_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class DmiBios < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/macosx/filesystems_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Macosx
       class Filesystems < BaseResolver
         # :macosx_filesystems
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self
@@ -17,11 +16,7 @@ module Facter
 
           def read_filesystems(fact_name)
             output = Facter::Core::Execution.execute('mount', logger: log)
-            filesystems = []
-            output.each_line do |line|
-              filesystem = line.match(/\(([a-z]+)\,*/).to_s
-              filesystems << filesystem[1..-2]
-            end
+            filesystems = output.scan(/\(([a-z]+)\,*/).flatten
             @fact_list[:macosx_filesystems] = filesystems.uniq.sort.join(',')
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/macosx/load_averages_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class LoadAverages < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private