openfact 6.2.0 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bad8912857bdd63fa3c31cacf9e6e5d6113e85216f1a57662c0b0101c20f2f9
-  data.tar.gz: 16f3de88eecfd77e0f67d7d85c48d07b228fbad61d020a7998841d184ee327a5
+  metadata.gz: d6abc7bb997faa4bef38adcfe94b44215a33c7c90abef73364980446765c8aa5
+  data.tar.gz: 627301bef10445b49b513b8ed60e175fa1f7d62a39763edd899d9d61d9e95a59
 SHA512:
-  metadata.gz: 0d7c6eda30361358651330ccd7a1a2dc6ffab30530e6a67806f5e65249128870bd2faf75553176c829e26fb9850e805b6f581733efe5714b06873ae5c5c60e56
-  data.tar.gz: 1fc5de3dc1cfafc7039fae02c708fc6baa8d36d2cb56bdabdf85fe2be43d0eac82bc24b7643e8f9921e28addea138778453ea2176bc38314ddafdc26c8e93382
+  metadata.gz: '03408be381d6f7ebe5371d866e167af5056e81393bddea1d942db8c57ce6d87af962569857546387e6af424806dd6a95cbfd703cdf98a5cb4d6a66b8f3fb9459'
+  data.tar.gz: 5346ddb96b985b96cef97b8945515e8768b3db1982e66290e81ee667e33ca4a6b07e5e9f1ed4f60956b3d87bf86263b80963fbcabbf773d9d79436ede3c842aa

data/lib/facter/custom_facts/core/execution/base.rb

@@ -44,8 +44,13 @@ module Facter
         def execute(command, options = {})
           on_fail, expand, logger, timeout = extract_options(options)
 
-          expanded_command = if (!expand && builtin_command?(command)) || logger
+          expanded_command = if !expand && builtin_command?(command)
                                command
+                             elsif logger
+                               # Internal resolvers rely on search_paths to find commands
+                               # outside of PATH (e.g. /usr/sbin/zpool on Solaris). Fall back
+                               # to the command as given so failures are logged, not raised.
+                               expand_command(command) || command
                              else
                                expand_command(command)
                              end

data/lib/facter/resolvers/ec2.rb

@@ -19,9 +19,7 @@ module Facter
 
         def read_facts(fact_name)
           if fact_name == :metadata
-            metadata = {}
-            query_for_metadata(EC2_METADATA_ROOT_URL, metadata)
-            @fact_list[:metadata] = metadata
+            @fact_list[:metadata] = read_metadata
           else
             @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
           end
@@ -29,9 +27,29 @@ module Facter
           @fact_list[fact_name]
         end
 
+        # A failed root listing means no EC2-compatible metadata service is
+        # available, so there is no metadata to report. Once the root listing
+        # succeeds, any failed child request rejects the whole result.
+        def read_metadata
+          root_listing = root_metadata_listing
+          return {} unless root_listing
+
+          add_metadata_entries(EC2_METADATA_ROOT_URL, root_listing, {})
+        end
+
+        def root_metadata_listing
+          get_metadata_from(EC2_METADATA_ROOT_URL)
+        rescue StandardError => e
+          log.debug("EC2 metadata is not available: #{e.message}")
+          nil
+        end
+
         def query_for_metadata(url, container)
-          metadata = get_metadata_from(url)
-          metadata.each_line do |line|
+          add_metadata_entries(url, get_metadata_from(url), container)
+        end
+
+        def add_metadata_entries(url, listing, container)
+          listing.each_line do |line|
             next if line.empty?
 
             http_path_component = build_path_component(line)

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

@@ -14,13 +14,12 @@ module Facter
           end
 
           def read_ipaddress(fact_name)
-            ip = nil
             primary_interface = read_primary_interface
             unless primary_interface.nil?
               output = Facter::Core::Execution.execute("ifconfig #{primary_interface}", logger: log)
               output.each_line do |str|
                 if str.strip =~ /inet\s(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}) .+/
-                  @fact_list[:ip] = ip = Regexp.last_match(1)
+                  @fact_list[:ip] = Regexp.last_match(1)
                   break
                 end
               end

data/lib/facter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openfact
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.2
 platform: ruby
 authors:
 - OpenVox Project
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.91.0
+        version: 1.92.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.91.0
+        version: 1.92.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement