facter 4.0.47 → 4.0.52

data/lib/facter/resolvers/aix/{load_averages_resolver.rb → load_averages.rb}

@@ -9,14 +9,14 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_load_averages(fact_name) }
           end
 
           def read_load_averages(fact_name)
             require_relative 'ffi/ffi_helper'
             @fact_list[:load_averages] = {}.tap do |h|
-              h['1m'], h['5m'], h['15m'] = Facter::Aix::FfiHelper.read_load_averages
+              h['1m'], h['5m'], h['15m'] = FfiHelper.read_load_averages
             end
 
             @fact_list[fact_name]

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

@@ -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) { execute_svmon(fact_name) }
           end
 

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

@@ -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_mount(fact_name) }
           end
 

data/lib/facter/resolvers/aix/{networking_resolver.rb → networking.rb}

@@ -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_netstat(fact_name) }
           end
 
@@ -17,7 +17,7 @@ module Facter
             @fact_list[:interfaces] = {}
             output = Facter::Core::Execution.execute('netstat -rn', logger: log)
             output = output.each_line.select { |line| (line =~ /\s\s[0-9]+.[0-9]+.[0-9]+.[0-9]+|\s\s.*:[0-9a-f]+/) }
-            extract_interfaces(output)
+            @fact_list[:interfaces] = load_interfaces
 
             populate_with_mtu_and_mac!(@fact_list[:interfaces])
             get_primary_interface_info(output)
@@ -26,23 +26,10 @@ module Facter
           end
 
           def get_primary_interface_info(output)
-            primary_interface_info = output.find { |line| line =~ /=>/ }&.split(' ')
+            primary_interface_info = output.find { |line| line =~ /default/ }&.split(' ')
             @fact_list[:primary_interface] = primary_interface_info[5] if primary_interface_info
           end
 
-          def extract_interfaces(netstat_output)
-            netstat_output.each do |line|
-              next if line =~ /default/
-
-              info = line.split("\s")
-              mask_length = info[0].match(%r{/([0-9]+)|%([0-9]+)})
-              next unless mask_length
-
-              is_ipv4 = info[1] =~ /[0-9]+.[0-9]+.[0-9]+.[0-9]+/
-              build_bindings(info[5], info[1], mask_length[1] || mask_length[2], is_ipv4)
-            end
-          end
-
           def build_bindings(name, ip, mask_length, is_ipv4)
             bind_to_add = is_ipv4 ? :bindings : :bindings6
             ip = ip.gsub(/%[0-9]$/, '') # remove mask information if it exists
@@ -69,6 +56,12 @@ module Facter
           def format_mac_address(address)
             address.split('.').map { |e| format('%<mac_address>02s', mac_address: e) }.join(':').tr(' ', '0')
           end
+
+          def load_interfaces
+            require_relative 'ffi/ffi_helper'
+
+            FfiHelper.read_interfaces
+          end
         end
       end
     end

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

@@ -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_niminfo(fact_name) }
           end
 

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

@@ -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_oslevel(fact_name) }
           end
 

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

@@ -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) { query_cudv(fact_name) }
           end
 

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

@@ -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) { query_pddv(fact_name) }
           end
 

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

@@ -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_serialnumber(fact_name) }
           end
 

data/lib/facter/resolvers/{augeas_resolver.rb → augeas.rb}

@@ -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_augeas_version(fact_name) }
         end
 

data/lib/facter/resolvers/az.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Az < BaseResolver
+      init_resolver
+
+      AZ_METADATA_URL = 'http://169.254.169.254/metadata/instance?api-version=2020-09-01'
+      AZ_SESSION_TIMEOUT = 5
+
+      class << self
+        private
+
+        def post_resolve(fact_name, _options)
+          log.debug('Querying Az metadata')
+          @fact_list.fetch(fact_name) { read_facts(fact_name) }
+        end
+
+        def read_facts(fact_name)
+          @fact_list[:metadata] = {}
+          data = get_data_from(AZ_METADATA_URL)
+          @fact_list[:metadata] = JSON.parse(data) unless data.empty?
+
+          @fact_list[fact_name]
+        end
+
+        def get_data_from(url)
+          headers = { Metadata: 'true' }
+          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
+        end
+
+        def determine_session_timeout
+          session_env = ENV['AZ_SESSION_TIMEOUT']
+          session_env ? session_env.to_i : AZ_SESSION_TIMEOUT
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/base_resolver.rb

@@ -20,10 +20,10 @@ module Facter
         Facter::SessionCache.subscribe(self)
       end
 
-      def self.resolve(fact_name)
+      def self.resolve(fact_name, options = {})
         @semaphore.synchronize do
           subscribe_to_manager
-          post_resolve(fact_name)
+          post_resolve(fact_name, options)
 
           cache_nil_for_unresolved_facts(fact_name)
         end
@@ -40,8 +40,8 @@ module Facter
         @fact_list[fact_name]
       end
 
-      def self.post_resolve(_fact_name)
-        raise NotImplementedError, "You must implement post_resolve(fact_name) method in #{name}"
+      def self.post_resolve(_fact_name, _options)
+        raise NotImplementedError, "You must implement post_resolve(fact_name, options) method in #{name}"
       end
     end
   end

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

@@ -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) { collect_processors_info(fact_name) }
           end
 

data/lib/facter/resolvers/containers.rb

@@ -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) { read_cgroup(fact_name) }
         end
 

data/lib/facter/resolvers/debian_version.rb

@@ -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_debian_version(fact_name) }
         end
 

data/lib/facter/resolvers/{disk_resolver.rb → disk.rb}

@@ -14,7 +14,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/{dmi_resolver.rb → dmi.rb}

@@ -25,7 +25,7 @@ module Facter
 
           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/dmi_decode.rb

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

data/lib/facter/resolvers/ec2.rb

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           log.debug('Querying Ec2 metadata')
           @fact_list.fetch(fact_name) { read_facts(fact_name) }
         end

data/lib/facter/resolvers/{eos_release_resolver.rb → eos_release.rb}

@@ -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_eos_release(fact_name) }
         end
 

data/lib/facter/resolvers/{facterversion_resolver.rb → facterversion.rb}

@@ -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_version_file }
         end
 

data/lib/facter/resolvers/{filesystems_resolver.rb → filesystems.rb}

@@ -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) { read_filesystems(fact_name) }
           end
 

data/lib/facter/resolvers/{fips_enabled_resolver.rb → fips_enabled.rb}

@@ -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) { read_fips_file(fact_name) }
           end
 

data/lib/facter/resolvers/freebsd/{dmi_resolver.rb → dmi.rb}

@@ -11,7 +11,7 @@ module Facter
 
           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/freebsd/{freebsd_version_resolver.rb → freebsd_version.rb}

@@ -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) { freebsd_version_system_call(fact_name) }
           end
 

data/lib/facter/resolvers/freebsd/{geom_resolver.rb → geom.rb}

@@ -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_facts(fact_name) }
           end
 

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

@@ -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) { collect_processors_info(fact_name) }
           end
 

data/lib/facter/resolvers/freebsd/{swap_memory_resolver.rb → swap_memory.rb}

@@ -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_swap_memory(fact_name) }
           end
 

data/lib/facter/resolvers/freebsd/{system_memory_resolver.rb → system_memory.rb}

@@ -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) { calculate_system_memory(fact_name) }
           end
 

data/lib/facter/resolvers/freebsd/{virtual_resolver.rb → virtual.rb}

@@ -19,7 +19,7 @@ module Facter
 
           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/gce.rb

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

data/lib/facter/resolvers/{hostname_resolver.rb → hostname.rb}

@@ -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) { retrieve_info(fact_name) }
         end
 

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

@@ -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) { retrieve_identity(fact_name) }
         end
 

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

@@ -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) { detect_uptime(fact_name) }
           end