aws-sdk-core 2.4.0 → 3.53.0

data/lib/aws-sdk-core/ini_parser.rb

@@ -1,4 +1,5 @@
 module Aws
+  # @api private
   class IniParser
     class << self
 

data/lib/aws-sdk-core/instance_profile_credentials.rb

@@ -51,7 +51,7 @@ module Aws
       super
     end
 
-    # @return [Integer] The number of times to retry failed atttempts to
+    # @return [Integer] The number of times to retry failed attempts to
     #   fetch credentials from the instance metadata service. Defaults to 0.
     attr_reader :retries
 
@@ -76,26 +76,35 @@ module Aws
           c['SecretAccessKey'],
           c['Token']
         )
-        @expiration = c['Expiration'] ? Time.parse(c['Expiration']) : nil
+        @expiration = c['Expiration'] ? Time.iso8601(c['Expiration']) : nil
       end
     end
 
     def get_credentials
       # Retry loading credentials a configurable number of times if
       # the instance metadata service is not responding.
-      begin
-        retry_errors(NETWORK_ERRORS, max_retries: @retries) do
-          open_connection do |conn|
-            path = '/latest/meta-data/iam/security-credentials/'
-            profile_name = http_get(conn, path).lines.first.strip
-            http_get(conn, path + profile_name)
+      if _metadata_disabled?
+        '{}'
+      else
+        begin
+          retry_errors(NETWORK_ERRORS, max_retries: @retries) do
+            open_connection do |conn|
+              path = '/latest/meta-data/iam/security-credentials/'
+              profile_name = http_get(conn, path).lines.first.strip
+              http_get(conn, path + profile_name)
+            end
           end
+        rescue
+          '{}'
         end
-      rescue
-        '{}'
       end
     end
 
+    def _metadata_disabled?
+      flag = ENV["AWS_EC2_METADATA_DISABLED"]
+      !flag.nil? && flag.downcase == "true"
+    end
+
     def open_connection
       http = Net::HTTP.new(@ip_address, @port, nil)
       http.open_timeout = @http_open_timeout
@@ -106,7 +115,7 @@ module Aws
     end
 
     def http_get(connection, path)
-      response = connection.request(Net::HTTP::Get.new(path))
+      response = connection.request(Net::HTTP::Get.new(path, {"User-Agent" => "aws-sdk-ruby3/#{CORE_GEM_VERSION}"}))
       if response.code.to_i == 200
         response.body
       else
@@ -119,7 +128,7 @@ module Aws
       retries = 0
       begin
         yield
-      rescue *error_classes => error
+      rescue *error_classes
         if retries < max_retries
           @backoff.call(retries)
           retries += 1

data/lib/aws-sdk-core/json.rb

@@ -1,14 +1,13 @@
 require 'json'
+require_relative 'json/builder'
+require_relative 'json/error_handler'
+require_relative 'json/handler'
+require_relative 'json/parser'
 
 module Aws
   # @api private
   module Json
 
-    autoload :Builder, 'aws-sdk-core/json/builder'
-    autoload :ErrorHandler, 'aws-sdk-core/json/error_handler'
-    autoload :Handler, 'aws-sdk-core/json/handler'
-    autoload :Parser, 'aws-sdk-core/json/parser'
-
     class ParseError < StandardError
 
       def initialize(error)

data/lib/aws-sdk-core/json/builder.rb

@@ -56,9 +56,11 @@ module Aws
       end
 
       def timestamp(ref, value)
-        if ref['timestampFormat'] == 'iso8601'
-          value.utc.iso8601
+        case ref['timestampFormat'] || ref.shape['timestampFormat']
+        when 'iso8601' then value.utc.iso8601
+        when 'rfc822' then value.utc.httpdate
         else
+          # rest-json and jsonrpc default to unixTimestamp
           value.to_i
         end
       end

data/lib/aws-sdk-core/json/error_handler.rb

@@ -17,9 +17,10 @@ module Aws
         json = Json.load(body)
         code = error_code(json, context)
         message = error_message(code, json)
-        [code, message]
+        data = parse_error_data(context, code)
+        [code, message, data]
       rescue Json::ParseError
-        [http_status_error_code(context), '']
+        [http_status_error_code(context), '', EmptyStructure.new]
       end
 
       def error_code(json, context)
@@ -41,6 +42,22 @@ module Aws
         end
       end
 
+      def parse_error_data(context, code)
+        data = EmptyStructure.new
+        if error_rules = context.operation.errors
+          error_rules.each do |rule|
+            # match modeled shape name with the type(code) only
+            # some type(code) might contains invalid characters
+            # such as ':' (efs) etc
+            match = rule.shape.name == code.gsub(/[^^a-zA-Z0-9]/, '')
+            if match && rule.shape.members.any?
+              data = Parser.new(rule).parse(context.http_response.body_contents)
+            end
+          end
+        end
+        data
+      end
+
     end
   end
 end

data/lib/aws-sdk-core/json/handler.rb

@@ -38,10 +38,29 @@ module Aws
       def parse_body(context)
         if simple_json?(context)
           Json.load(context.http_response.body_contents)
-        else
-          rules = context.operation.output
+        elsif rules = context.operation.output
           json = context.http_response.body_contents
-          Parser.new(rules).parse(json == '' ? '{}' : json)
+          if json.is_a?(Array)
+            # an array of emitted events
+            if json[0].respond_to?(:response)
+              # initial response exists
+              # it must be the first event arrived
+              resp_struct = json.shift.response
+            else
+              resp_struct = context.operation.output.shape.struct_class.new
+            end
+
+            rules.shape.members.each do |name, ref|
+              if ref.eventstream
+                resp_struct.send("#{name}=", json.to_enum)
+              end
+            end
+            resp_struct
+          else
+            Parser.new(rules).parse(json == '' ? '{}' : json)
+          end
+        else
+          EmptyStructure.new
         end
       end
 

data/lib/aws-sdk-core/json/parser.rb

@@ -21,7 +21,7 @@ module Aws
 
       def structure(ref, values, target = nil)
         shape = ref.shape
-        target = ref[:struct_class].new if target.nil?
+        target = ref.shape.struct_class.new if target.nil?
         values.each do |key, value|
           member_name, member_ref = shape.member_by_location_name(key)
           if member_ref

data/lib/aws-sdk-core/log/param_filter.rb

@@ -9,9 +9,10 @@ module Aws
       # logs. This is updated automatically as part of each release. See the
       # `tasks/sensitive.rake` for more information.
       #
-      # ** DO NOT EDIT THE FOLLOWING LINE OF CODE **
-      #
-      SENSITIVE = [:access_token, :admin_contact, :artifact_credentials, :auth_code, :base_32_string_seed, :client_id, :client_secret, :copy_source_sse_customer_key, :local_console_password, :new_password, :old_password, :password, :plaintext, :previous_password, :private_key, :proposed_password, :qr_code_png, :registrant_contact, :secret_access_key, :secret_hash, :shared_secret, :sse_customer_key, :ssekms_key_id, :tech_contact, :trust_password, :upload_credentials, :username, :value]
+      # @api private
+      # begin
+      SENSITIVE = [:access_token, :account_name, :account_password, :address, :admin_contact, :admin_password, :artifact_credentials, :auth_code, :authentication_token, :authorization_result, :backup_plan_tags, :backup_vault_tags, :base_32_string_seed, :body, :bot_configuration, :bot_email, :cause, :client_id, :client_secret, :configuration, :copy_source_sse_customer_key, :credentials, :current_password, :custom_attributes, :db_password, :default_phone_number, :definition, :description, :display_name, :e164_phone_number, :email, :email_address, :email_message, :embed_url, :error, :feedback_token, :file, :first_name, :id, :id_token, :input, :input_text, :key_id, :key_store_password, :kms_key_id, :kms_master_key_id, :lambda_function_arn, :last_name, :local_console_password, :master_account_email, :master_user_password, :message, :name, :new_password, :next_password, :notes, :old_password, :outbound_events_https_endpoint, :output, :owner_information, :parameters, :passphrase, :password, :payload, :phone_number, :plaintext, :previous_password, :primary_email, :primary_provisioned_number, :private_key, :proposed_password, :public_key, :qr_code_png, :query, :recovery_point_tags, :refresh_token, :registrant_contact, :request_attributes, :search_query, :secret_access_key, :secret_binary, :secret_code, :secret_hash, :secret_string, :security_token, :service_password, :session_attributes, :share_notes, :shared_secret, :slots, :sse_customer_key, :ssekms_key_id, :status_message, :tag_key_list, :tags, :task_parameters, :tech_contact, :temporary_password, :text, :token, :trust_password, :upload_credentials, :upload_url, :user_email, :user_name, :username, :value, :values, :variables, :zip_file]
+      # end
 
       def initialize(options = {})
         @filters = Set.new(SENSITIVE + Array(options[:filter]))

data/lib/aws-sdk-core/pageable_response.rb

@@ -120,6 +120,7 @@ module Aws
     # to call on a pageable response, as this would trigger n api calls
     # simply to count the number of response pages, when likely what is
     # wanted is to access count on the data. Same for #to_h.
+    # @api private
     module UnsafeEnumerableMethods
 
       def count

data/lib/aws-sdk-core/pager.rb

@@ -1,14 +1,16 @@
+require 'jmespath'
+
 module Aws
   # @api private
   class Pager
 
-    def initialize(rules)
-      @more_results = rules['more_results']
-      @more_results = underscore(@more_results) if @more_results
-      if rules['limit_key']
-        @limit_key = underscore(rules['limit_key']).to_sym
-      end
-      map_tokens(rules)
+    # @option options [required, Hash<JMESPath,JMESPath>] :tokens
+    # @option options [String<JMESPath>] :limit_key
+    # @option options [String<JMESPath>] :more_results
+    def initialize(options)
+      @tokens = options.fetch(:tokens)
+      @limit_key = options.fetch(:limit_key, nil)
+      @more_results = options.fetch(:more_results, nil)
     end
 
     # @return [Symbol, nil]
@@ -37,32 +39,35 @@ module Aws
       if @more_results
         JMESPath.search(@more_results, response.data)
       else
-        next_tokens = self.next_tokens(response)
-        prev_tokens = self.prev_tokens(response)
-        !(next_tokens.empty? || next_tokens == prev_tokens)
+        next_t = next_tokens(response)
+        prev_t = prev_tokens(response)
+        !(next_t.empty? || next_t == prev_t)
       end
     end
 
     private
 
-    def map_tokens(rules)
-      input = Array(rules['input_token'])
-      output = Array(rules['output_token'])
-      @tokens = {}
-      input.each.with_index do |key, n|
-        @tokens[underscore(output[n])] = underscore(key)
-      end
-    end
-
-    def underscore(str)
-      str.
-        gsub(' or ', '||').
-        gsub(/\w+/) { |part| Seahorse::Util.underscore(part) }
-    end
-
     def empty_value?(value)
       value.nil? || value == '' || value == [] || value == {}
     end
 
+    class NullPager
+
+      # @return [nil]
+      attr_reader :limit_key
+
+      def next_tokens
+        {}
+      end
+
+      def prev_tokens
+        {}
+      end
+
+      def truncated?(response)
+        false
+      end
+
+    end
   end
 end

data/lib/aws-sdk-core/param_converter.rb

@@ -40,7 +40,7 @@ module Aws
 
     def structure(ref, values)
       values = c(ref, values)
-      if Struct === values || Hash === values
+      if ::Struct === values || Hash === values
         values.each_pair do |k, v|
           unless v.nil?
             if ref.shape.member?(k)
@@ -165,10 +165,10 @@ module Aws
     end
 
     add(StructureShape, Hash) { |h| h.dup }
-    add(StructureShape, Struct)
+    add(StructureShape, ::Struct)
 
     add(MapShape, Hash) { |h| h.dup }
-    add(MapShape, Struct) do |s|
+    add(MapShape, ::Struct) do |s|
       s.members.each.with_object({}) {|k,h| h[k] = s[k] }
     end
 

data/lib/aws-sdk-core/param_validator.rb

@@ -16,8 +16,13 @@ module Aws
     # @param [Seahorse::Model::Shapes::ShapeRef] rules
     # @option options [Boolean] :validate_required (true)
     def initialize(rules, options = {})
-      @rules = rules
+      @rules = rules || begin
+        shape = StructureShape.new
+        shape.struct_class = EmptyStructure
+        ShapeRef.new(shape: shape)
+      end
       @validate_required = options[:validate_required] != false
+      @input = options[:input].nil? ? true : !!options[:input]
     end
 
     # @param [Hash] params
@@ -34,28 +39,50 @@ module Aws
       # ensure the value is hash like
       return unless correct_type?(ref, values, errors, context)
 
-      shape = ref.shape
-
-      # ensure required members are present
-      if @validate_required
-        shape.required.each do |member_name|
-          if values[member_name].nil?
-            param = "#{context}[#{member_name.inspect}]"
-            errors << "missing required parameter #{param}"
+      if ref.eventstream
+        # input eventstream is provided from event signals
+        values.each do |value|
+          # each event is structure type
+          case value[:message_type]
+          when 'event'
+            val = value.dup
+            val.delete(:message_type)
+            structure(ref.shape.member(val[:event_type]), val, errors, context)
+          when 'error' # Error is unmodeled
+          when 'exception' # Pending
+            raise Aws::Errors::EventStreamParserError.new(
+              ':exception event validation is not supported')
+          end
+        end
+      else
+        shape = ref.shape
+
+        # ensure required members are present
+        if @validate_required
+          shape.required.each do |member_name|
+            input_eventstream = ref.shape.member(member_name).eventstream && @input
+            if values[member_name].nil? && !input_eventstream
+              param = "#{context}[#{member_name.inspect}]"
+              errors << "missing required parameter #{param}"
+            end
           end
         end
-      end
 
-      # validate non-nil members
-      values.each_pair do |name, value|
-        unless value.nil?
-          if shape.member?(name)
-            member_ref = shape.member(name)
-            shape(member_ref, value, errors, context + "[#{name.inspect}]")
-          else
-            errors << "unexpected value at #{context}[#{name.inspect}]"
+        # validate non-nil members
+        values.each_pair do |name, value|
+          unless value.nil?
+            # :event_type is not modeled
+            # and also needed when construct body
+            next if name == :event_type
+            if shape.member?(name)
+              member_ref = shape.member(name)
+              shape(member_ref, value, errors, context + "[#{name.inspect}]")
+            else
+              errors << "unexpected value at #{context}[#{name.inspect}]"
+            end
           end
         end
+
       end
     end
 
@@ -74,8 +101,10 @@ module Aws
     end
 
     def map(ref, values, errors, context)
-
-      return unless correct_type?(ref, values, errors, context)
+      unless Hash === values
+        errors << expected_got(context, "a hash", values)
+        return
+      end
 
       key_ref = ref.shape.key
       value_ref = ref.shape.value
@@ -121,9 +150,15 @@ module Aws
     end
 
     def correct_type?(ref, value, errors, context)
+      if ref.eventstream && @input
+        errors << "instead of providing value directly for eventstreams at input,"\
+          " expected to use #signal events per stream"
+        return false
+      end
       case value
       when Hash then true
-      when ref[:struct_class] then true
+      when ref.shape.struct_class then true
+      when Enumerator then ref.eventstream && value.respond_to?(:event_types)
       else
         errors << expected_got(context, "a hash", value)
         false

data/lib/aws-sdk-core/plugins/api_key.rb

@@ -0,0 +1,52 @@
+module Aws
+  module Plugins
+
+    # Provide support for `api_key` parameter for `api-gateway` protocol
+    # specific `api-gateway` protocol gems' user-agent
+    class ApiKey < Seahorse::Client::Plugin
+
+      option(:api_key,
+        default: nil,
+        doc_type: 'String',
+        docstring: <<-DOCS)
+When provided, `x-api-key` header will be injected with the value provided.
+        DOCS
+
+      def add_handlers(handlers, config)
+        handlers.add(OptionHandler, step: :initialize)
+        handlers.add(ApiKeyHandler, step: :build, priority: 0)
+      end
+
+      # @api private
+      class OptionHandler < Seahorse::Client::Handler
+        def call(context)
+          if context.operation.require_apikey
+            api_key = context.params.delete(:api_key)
+            api_key = context.config.api_key if api_key.nil?
+            context[:api_key] = api_key
+          end
+
+          @handler.call(context)
+        end
+
+      end
+
+      # @api private
+      class ApiKeyHandler < Seahorse::Client::Handler
+
+        def call(context)
+          if context[:api_key]
+            apply_api_key(context)
+          end
+          @handler.call(context)
+        end
+
+        private
+
+        def apply_api_key(context)
+          context.http_request.headers['x-api-key'] = context[:api_key]
+        end
+      end
+    end
+  end
+end