openfact 5.7.0 → 5.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2436b1bee62f23687acd129998826dd14375cfd0db9805b6b0be6bf94d60658
-  data.tar.gz: 914cc3673def6ead78853f0b4cf0addece2313c534c15fcc9850e47a37c39e82
+  metadata.gz: 4806428dc6f3f5dbe7902f6d23e1e4ceb91233910c1ee347df9ce38969c437d0
+  data.tar.gz: 7afa2df9a896fb32a475861fc55b45ff7683ef23f1ff8edd5b824523931f22d3
 SHA512:
-  metadata.gz: 80fbe8822e7b0f6bbdfdfb76eee4a6cee2771e7f36fd251b655e264bfcf032e76034217fa5e1477f59d973d3e7b2a9b264f2ee4fe91f402de7a6507b3d1b034c
-  data.tar.gz: 8adbeb6dad88667ec34f829b830282f3812a3b3e8b54615500b0564b3f2f2d4b911c36c3571207722ee4bc56dba73864d170eeba7cec57423e6c6bd8056e082b
+  metadata.gz: 4dae7933728490f20afda516a3386f8be76bbe4cfebeebcaccc1b9e5c6418d95978c6abd3c82d6cd917ac1dfae51bdacd5c359b5e92c684c416b85ce406231c9
+  data.tar.gz: ad82e01bae10d3f51b00147f7ef118f85dde83e6e82495c582c63b9e5e2f7c40c20ed721ea17c3416b57525642a7ba60787c3159163308a55fc0ec7be81099c7

data/lib/facter/resolvers/ec2.rb

@@ -18,15 +18,38 @@ module Facter
         end
 
         def read_facts(fact_name)
-          @fact_list[:metadata] = {}
-          query_for_metadata(EC2_METADATA_ROOT_URL, @fact_list[:metadata])
-          @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
+          if fact_name == :metadata
+            @fact_list[:metadata] = read_metadata
+          else
+            @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
+          end
+
           @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_data_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)
@@ -34,14 +57,15 @@ module Facter
 
             if http_path_component.end_with?('/')
               child = {}
-              child[http_path_component] = query_for_metadata("#{url}#{http_path_component}", child)
-              child.reject! { |key, _info| key == http_path_component }
+              query_for_metadata("#{url}#{http_path_component}", child)
               name = http_path_component.chomp('/')
               container[name] = child
             else
-              container[http_path_component] = get_data_from("#{url}#{http_path_component}").strip
+              container[http_path_component] = get_metadata_from("#{url}#{http_path_component}").strip
             end
           end
+
+          container
         end
 
         def build_path_component(line)
@@ -55,6 +79,12 @@ module Facter
           Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout }, false)
         end
 
+        def get_metadata_from(url)
+          headers = {}
+          headers['X-aws-ec2-metadata-token'] = v2_token if v2_token
+          Facter::Util::Resolvers::Http.get_request!(url, headers, { session: determine_session_timeout }, false)
+        end
+
         def determine_session_timeout
           session_env = ENV['EC2_SESSION_TIMEOUT']
           session_env ? session_env.to_i : EC2_SESSION_TIMEOUT

data/lib/facter/util/resolvers/http.rb

@@ -6,6 +6,8 @@ module Facter
       module Http
         @log = Facter::Log.new(self)
 
+        class RequestError < StandardError; end
+
         class << self
           CONNECTION_TIMEOUT = 0.6
           SESSION_TIMEOUT = 5
@@ -27,6 +29,15 @@ module Facter
             make_request(url, headers, timeouts, 'GET', proxy)
           end
 
+          # Makes a GET HTTP request and returns its response body.
+          #
+          # Unlike get_request, this method raises when the response code is
+          # not 200 or when the request fails. A successful empty response is
+          # still returned as an empty string.
+          def get_request!(url, headers = {}, timeouts = {}, proxy = true)
+            make_request!(url, headers, timeouts, 'GET', proxy)
+          end
+
           # Makes a PUT HTTP request and returns its response
           # @param (see #get_request)
           # @return (see #get_request)
@@ -37,6 +48,28 @@ module Facter
           private
 
           def make_request(url, headers, timeouts, request_type, proxy)
+            response = perform_request(url, headers, timeouts, request_type, proxy)
+
+            successful_response?(response) ? response.body : ''
+          rescue StandardError => e
+            @log.debug("Trying to connect to #{url} but got: #{e.message}")
+            ''
+          end
+
+          def make_request!(url, headers, timeouts, request_type, proxy)
+            response = perform_request(url, headers, timeouts, request_type, proxy)
+
+            return response.body if successful_response?(response)
+
+            raise RequestError, "Request to #{url} failed with HTTP status #{response.code}"
+          rescue RequestError
+            raise
+          rescue StandardError => e
+            @log.debug("Trying to connect to #{url} but got: #{e.message}")
+            raise
+          end
+
+          def perform_request(url, headers, timeouts, request_type, proxy)
             require 'net/http'
 
             uri = URI.parse(url)
@@ -52,11 +85,7 @@ module Facter
             # Make the request
             response = http.request(request)
             response.uri = url
-
-            successful_response?(response) ? response.body : ''
-          rescue StandardError => e
-            @log.debug("Trying to connect to #{url} but got: #{e.message}")
-            ''
+            response
           end
 
           def http_obj(parsed_url, timeouts, proxy)

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '5.7.0' 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.0
+  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: []