RubyGems - facter - Versions diffs - 4.0.47 → 4.0.52 - Mend

facter 4.0.47 → 4.0.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (240) hide show

data/lib/facter/resolvers/release_from_first_line.rb ADDED Viewed

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+module Facter
+  module Resolvers
+    class ReleaseFromFirstLine < BaseResolver
+      # :release
+      init_resolver
+      class << self
+        private
+        def post_resolve(fact_name, options)
+          @fact_list.fetch(fact_name) { read_release_file(fact_name, options) }
+        end
+        def read_release_file(fact_name, options)
+          release_file = options[:release_file]
+          return unless release_file
+          output = Facter::Util::FileHelper.safe_read(release_file, nil)
+          return @fact_list[fact_name] = nil if output.nil?
+          @fact_list[:release] = retrieve_version(output)
+          @fact_list[fact_name]
+        end
+        def retrieve_version(output)
+          if output[/(Rawhide)$/]
+            'Rawhide'
+          elsif output['release']
+            output.strip =~ /release (\d[\d.]*)/ ? Regexp.last_match(1) : nil
+          else
+            output.strip =~ /Amazon Linux (\d+)/ ? Regexp.last_match(1) : nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/{ruby_resolver.rb → ruby.rb} RENAMED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_ruby_information(fact_name) }
         end

data/lib/facter/resolvers/{selinux_resolver.rb → selinux.rb} RENAMED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_facts(fact_name) }
         end

data/lib/facter/resolvers/solaris/disks.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_disks_info(fact_name) }
           end

data/lib/facter/resolvers/solaris/dmi.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts(fact_name) }
           end

data/lib/facter/resolvers/solaris/dmi_sparc.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts(fact_name) }
           end

data/lib/facter/resolvers/solaris/ffi/functions.rb CHANGED Viewed

@@ -6,7 +6,7 @@ module Facter
       module FFI
         module Ioctl
           extend ::FFI::Library
-          ffi_lib ::FFI::Library::LIBC, '/usr/lib/libsocket.so'
+          ffi_lib ::FFI::Library::LIBC, 'socket'
           attach_function :ioctl_base, :ioctl, %i[int int pointer], :int
           attach_function :open_socket, :socket, %i[int int int], :int

data/lib/facter/resolvers/solaris/filesystems.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_sysdef_file(fact_name) }
           end

data/lib/facter/resolvers/solaris/ipaddress.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_ipaddress(fact_name) }
           end

data/lib/facter/resolvers/solaris/ldom.rb CHANGED Viewed

@@ -31,7 +31,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { call_virtinfo(fact_name) }
           end

data/lib/facter/resolvers/solaris/memory.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { calculate_memory(fact_name) }
           end

data/lib/facter/resolvers/solaris/mountpoints.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_mounts(fact_name) }
           end

data/lib/facter/resolvers/solaris/networking.rb CHANGED Viewed

@@ -11,7 +11,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts(fact_name) }
           end

data/lib/facter/resolvers/solaris/os_release.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { build_release_facts(fact_name) }
           end

data/lib/facter/resolvers/solaris/processors.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { collect_kstat_info(fact_name) }
           end

data/lib/facter/resolvers/solaris/zone.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { build_zone_fact(fact_name) }
           end

data/lib/facter/resolvers/solaris/zone_name.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { build_current_zone_name_fact(fact_name) }
           end

data/lib/facter/resolvers/specific_release_file.rb ADDED Viewed

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module Facter
+  module Resolvers
+    class SpecificReleaseFile < BaseResolver
+      # :release
+      init_resolver
+      class << self
+        private
+        def post_resolve(fact_name, options)
+          @fact_list.fetch(fact_name) { read_release_file(fact_name, options) }
+        end
+        def read_release_file(fact_name, options)
+          release_file = options[:release_file]
+          return unless release_file
+          output = Facter::Util::FileHelper.safe_read(release_file, nil)
+          return @fact_list[fact_name] = nil if output.nil?
+          if options[:regex]
+            @fact_list[:release] = output.strip =~ /#{options[:regex]}/ ? Regexp.last_match : nil
+            return @fact_list[fact_name]
+          end
+          @fact_list[:release] = output.strip
+          @fact_list[fact_name]
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/{ssh_resolver.rb → ssh.rb} RENAMED Viewed

@@ -2,7 +2,7 @@
 module Facter
   module Resolvers
-    class SshResolver < BaseResolver
+    class Ssh < BaseResolver
       @log = Facter::Log.new(self)
       init_resolver
@@ -13,7 +13,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_info(fact_name) }
         end

data/lib/facter/resolvers/{suse_release_resolver.rb → suse_release.rb} RENAMED Viewed

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_suse_release(fact_name) }
         end

data/lib/facter/resolvers/{sw_vers_resolver.rb → sw_vers.rb} RENAMED Viewed

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { software_version_system_call(fact_name) }
         end

data/lib/facter/resolvers/{timezone_resolver.rb → timezone.rb} RENAMED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { determine_timezone }
         end

data/lib/facter/resolvers/{uname_resolver.rb → uname.rb} RENAMED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { uname_system_call(fact_name) }
         end

data/lib/facter/resolvers/{uptime_resolver.rb → uptime.rb} RENAMED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { uptime_system_call(fact_name) }
         end

data/lib/facter/resolvers/virt_what.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_from_virt_what(fact_name) }
         end

data/lib/facter/resolvers/vmware.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { vmware_command(fact_name) }
         end

data/lib/facter/resolvers/windows/aio_agent_version.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_version(fact_name) }
           end

data/lib/facter/resolvers/windows/{dmi_bios_resolver.rb → dmi_bios.rb} RENAMED Viewed

@@ -12,7 +12,7 @@ module Facter
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_bios(fact_name) }
         end

data/lib/facter/resolvers/windows/{dmi_computersystem_resolver.rb → dmi_computersystem.rb} RENAMED Viewed

@@ -12,7 +12,7 @@ module Facter
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_computer_system(fact_name) }
         end

data/lib/facter/resolvers/windows/ffi/network_utils.rb CHANGED Viewed

@@ -31,8 +31,7 @@ class NetworkUtils
     def find_mac_address(adapter)
       adapter[:PhysicalAddress].first(adapter[:PhysicalAddressLength])
-                               .map { |e| format('%<mac_address>02x', mac_address: e.to_i) }
-                               .join(':').upcase
+                               .map { |e| format('%<mac_address>02x', mac_address: e.to_i) }.join(':').upcase
     end
   end
 end

data/lib/facter/resolvers/windows/{fips_resolver.rb → fips.rb} RENAMED Viewed

@@ -12,7 +12,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
           end

data/lib/facter/resolvers/windows/{hardware_architecture_resolver.rb → hardware_architecture.rb} RENAMED Viewed

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_hardware_information(fact_name) }
         end

data/lib/facter/resolvers/windows/{identity_resolver.rb → identity.rb} RENAMED Viewed

@@ -11,7 +11,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_facts(fact_name) }
         end

data/lib/facter/resolvers/windows/{kernel_resolver.rb → kernel.rb} RENAMED Viewed

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_os_version_information(fact_name) }
         end

data/lib/facter/resolvers/windows/{memory_resolver.rb → memory.rb} RENAMED Viewed

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { validate_info(fact_name) }
         end

data/lib/facter/resolvers/windows/{netkvm_resolver.rb → netkvm.rb} RENAMED Viewed

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
         end

data/lib/facter/resolvers/windows/{networking_resolver.rb → networking.rb} RENAMED Viewed

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_network_information(fact_name) }
           end
@@ -24,6 +24,8 @@ module Facter
             return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
+            retrieve_domain_from_registry
             iterate_list(adapter_addresses)
             Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
@@ -69,7 +71,11 @@ module Facter
                 adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
                 next
               end
-              @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
+              if !@fact_list[:domain] || @fact_list[:domain].empty?
+                @fact_list[:domain] = adapter_address[:DnsSuffix].read_wide_string_without_length
+              end
               name = adapter_address[:FriendlyName].read_wide_string_without_length
               net_interface[name] = build_interface_info(adapter_address, name)
             end
@@ -130,6 +136,17 @@ module Facter
               @fact_list[:primary_interface] = name.to_s
             end
           end
+          def retrieve_domain_from_registry
+            ::Win32::Registry::HKEY_LOCAL_MACHINE.open('SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters') do |rg|
+              rg.each do |name, _value|
+                @fact_list[:domain] = rg[name] if name == 'Domain'
+              end
+            end
+          rescue Win32::Registry::Error
+            @log.debug('Could not read TCPIP Parameters from registry')
+            nil
+          end
         end
       end
     end