openfact 5.7.1 → 5.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40ca49d6a933b0b0a72db330d0c4eb03e5b391f7604e22e23ef12753257987a
-  data.tar.gz: 82062ea6a8217bd955e37c2f33f30653e4e20a1869b00de7dd99eb15007574e5
+  metadata.gz: 4806428dc6f3f5dbe7902f6d23e1e4ceb91233910c1ee347df9ce38969c437d0
+  data.tar.gz: 7afa2df9a896fb32a475861fc55b45ff7683ef23f1ff8edd5b824523931f22d3
 SHA512:
-  metadata.gz: e90cd6387fb767064000a5b5681ce56796666b267c5d6ca11b60eca0b875aa3fe8177b09e421831fd09c73fc09823b229523d7960e1d74e47bafec941f307e30
-  data.tar.gz: 6a6d9b5468083643e89518afbbcba2eb4c6ca7f3498b1324e8a27faa0c844d6660e4ae6c0991f5f01b24fb97951cda9fe06200b933632890551b0d256127baaa
+  metadata.gz: 4dae7933728490f20afda516a3386f8be76bbe4cfebeebcaccc1b9e5c6418d95978c6abd3c82d6cd917ac1dfae51bdacd5c359b5e92c684c416b85ce406231c9
+  data.tar.gz: ad82e01bae10d3f51b00147f7ef118f85dde83e6e82495c582c63b9e5e2f7c40c20ed721ea17c3416b57525642a7ba60787c3159163308a55fc0ec7be81099c7

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openfact
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 5.7.2
 platform: ruby
 authors:
 - OpenVox Project
@@ -1299,7 +1299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: OpenFact, a system inventory tool
 test_files: []