aws-sdk-core 2.11.212 → 3.170.0

data/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
 module Aws
   module Stubbing
     module Protocols
       class RestXml < Rest
 
-        include Seahorse::Model::Shapes
-
         def body_for(api, operation, rules, data)
-          xml = []
-          rules.location_name = operation.name + 'Result'
-          rules['xmlNamespace'] = { 'uri' => api.metadata['xmlNamespace'] }
-          Xml::Builder.new(rules, target:xml).to_xml(data)
-          xml.join
+          if eventstream?(rules)
+            encode_eventstream_response(rules, data, Xml::Builder)
+          else
+            xml = []
+            rules.location_name = operation.name + 'Result'
+            rules['xmlNamespace'] = { 'uri' => api.metadata['xmlNamespace'] }
+            Xml::Builder.new(rules, target:xml).to_xml(data)
+            xml.join
+          end
         end
 
         def stub_error(error_code)

data/lib/aws-sdk-core/stubbing/stub_data.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Aws
+  # @api private
   module Stubbing
     class StubData
 
@@ -19,14 +22,26 @@ module Aws
       def remove_paging_tokens(stub)
         if @pager
           @pager.instance_variable_get("@tokens").keys.each do |path|
-            key = path.split(/\b/)[0]
-            stub[key] = nil
+            if divide = (path[' || '] || path[' or '])
+              path = path.split(divide)[0]
+            end
+            parts = path.split(/\b/)
+            # if nested struct/expression, EmptyStub auto-pop "string"
+            # currently not support remove "string" for nested/expression
+            # as it requires reverse JMESPATH search
+            stub[parts[0]] = nil if parts.size == 1
+          end
+          if more_results = @pager.instance_variable_get('@more_results')
+            parts = more_results.split(/\b/)
+            # if nested struct/expression, EmptyStub auto-pop false value
+            # no further work needed
+            stub[parts[0]] = false if parts.size == 1
           end
         end
       end
 
       def apply_data(data, stub)
-        ParamValidator.new(@rules, validate_required:false).validate!(data)
+        ParamValidator.new(@rules, validate_required: false, input: false).validate!(data)
         DataApplicator.new(@rules).apply_data(data, stub)
       end
     end

data/lib/aws-sdk-core/stubbing/xml_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Stubbing
     class XmlError

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Aws
+  class Token
+
+    # @param [String] token
+    # @param [Time] expiration
+    def initialize(token, expiration=nil)
+      @token = token
+      @expiration = expiration
+    end
+
+    # @return [String, nil]
+    attr_reader :token
+
+    # @return [Time, nil]
+    attr_reader :expiration
+
+    # @return [Boolean] Returns `true` if token is set
+    def set?
+      !token.nil? && !token.empty?
+    end
+
+    # Removing the token from the default inspect string.
+    # @api private
+    def inspect
+      "#<#{self.class.name} token=[FILTERED]> expiration=#{expiration}>"
+    end
+
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Aws
+  module TokenProvider
+
+    # @return [Token]
+    attr_reader :token
+
+    # @return [Boolean]
+    def set?
+      !!token && token.set?
+    end
+
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Aws
+  # @api private
+  class TokenProviderChain
+    def initialize(config = nil)
+      @config = config
+    end
+
+    # @return [TokenProvider, nil]
+    def resolve
+      providers.each do |method_name, options|
+        provider = send(method_name, options.merge(config: @config))
+        return provider if provider && provider.set?
+      end
+      nil
+    end
+
+    private
+
+    def providers
+      [
+        [:static_profile_sso_token, {}],
+        [:sso_token, {}]
+      ]
+    end
+
+    def static_profile_sso_token(options)
+      if Aws.shared_config.config_enabled? && options[:config] && options[:config].profile
+        Aws.shared_config.sso_token_from_config(
+          profile: options[:config].profile
+        )
+      end
+    end
+
+
+    def sso_token(options)
+      profile_name = determine_profile_name(options)
+      if Aws.shared_config.config_enabled?
+        Aws.shared_config.sso_token_from_config(profile: profile_name)
+      end
+    rescue Errors::NoSuchProfileError
+      nil
+    end
+
+    def determine_profile_name(options)
+      (options[:config] && options[:config].profile) || ENV['AWS_PROFILE'] || ENV['AWS_DEFAULT_PROFILE'] || 'default'
+    end
+
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   # @api private
   class TypeBuilder

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'cgi'
+
+module Aws
+  # @api private
+  module Util
+    class << self
+
+      def deep_merge(left, right)
+        case left
+        when Hash then left.merge(right) { |key, v1, v2| deep_merge(v1, v2) }
+        when Array then right + left
+        else right
+        end
+      end
+
+      def copy_hash(hash)
+        if Hash === hash
+          deep_copy(hash)
+        else
+          raise ArgumentError, "expected hash, got `#{hash.class}`"
+        end
+      end
+
+      def deep_copy(obj)
+        case obj
+        when nil then nil
+        when true then true
+        when false then false
+        when Hash
+          obj.inject({}) do |h, (k,v)|
+            h[k] = deep_copy(v)
+            h
+          end
+        when Array
+          obj.map { |v| deep_copy(v) }
+        else
+          if obj.respond_to?(:dup)
+            obj.dup
+          elsif obj.respond_to?(:clone)
+            obj.clone
+          else
+            obj
+          end
+        end
+      end
+
+      def monotonic_milliseconds
+        if defined?(Process::CLOCK_MONOTONIC)
+          Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+        else
+          DateTime.now.strftime('%Q').to_i
+        end
+      end
+
+      def monotonic_seconds
+        monotonic_milliseconds / 1000.0
+      end
+
+      def str_2_bool(str)
+        case str.to_s
+        when "true" then true
+        when "false" then false
+        else
+          nil
+        end
+      end
+
+    end
+  end
+end

data/lib/aws-sdk-core/waiters/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Waiters
     module Errors

data/lib/aws-sdk-core/waiters/poller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Waiters
 
@@ -9,10 +11,12 @@ module Aws
       # @api private
       RAISE_HANDLER = Seahorse::Client::Plugins::RaiseResponseErrors::Handler
 
+      # @option options [required, String] :operation_name
+      # @option options [required, Array<Hash>] :acceptors
       # @api private
       def initialize(options = {})
-        @operation_name = underscore(options['operation']).to_sym
-        @acceptors = options['acceptors'] || []
+        @operation_name = options.fetch(:operation_name)
+        @acceptors = options.fetch(:acceptors)
       end
 
       # @return [Symbol]
@@ -95,9 +99,7 @@ module Aws
       end
 
       def path(acceptor)
-        acceptor['argument'].gsub(/(?<![`'])\b\w+\b(?![`'])/) do |str|
-          Seahorse::Util.underscore(str)
-        end
+        acceptor['argument']
       end
 
       def non_empty_array(acceptor, response, &block)
@@ -109,10 +111,6 @@ module Aws
         end
       end
 
-      def underscore(str)
-        Seahorse::Util.underscore(str)
-      end
-
     end
   end
 end

data/lib/aws-sdk-core/waiters/waiter.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module Aws
   module Waiters
+    # @api private
     class Waiter
 
       # @api private
@@ -49,7 +52,7 @@ module Aws
       #
       # @yieldparam [Integer] attempts The number of attempts made.
       def before_attempt(&block)
-        @before_attempt << Proc.new
+        @before_attempt << block if block_given?
       end
 
       # Register a callback that is invoked after an attempt but before
@@ -80,7 +83,7 @@ module Aws
       # @yieldparam [Seahorse::Client::Response] response The response from
       #   the previous polling attempts.
       def before_wait(&block)
-        @before_wait << Proc.new
+        @before_wait << block if block_given?
       end
 
       # @option options [Client] :client

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

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'waiters/errors'
+require_relative 'waiters/poller'
+require_relative 'waiters/waiter'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Aws
@@ -9,9 +11,9 @@ module Aws
       def initialize(rules, options = {})
         @rules = rules
         @xml = options[:target] || []
-        indent = options[:indent] || '  '
+        indent = options[:indent] || ''
         pad = options[:pad] || ''
-        @builder = DocBuilder.new(target:@xml, indent:indent, pad:pad)
+        @builder = DocBuilder.new(target: @xml, indent: indent, pad: pad)
       end
 
       def to_xml(params)
@@ -46,7 +48,7 @@ module Aws
       end
 
       def list(name, ref, values)
-        if ref['flattened']
+        if ref[:flattened] || ref.shape.flattened
           values.each do |value|
             member(ref.shape.member.location_name || name, ref.shape.member, value)
           end
@@ -63,7 +65,7 @@ module Aws
       def map(name, ref, hash)
         key_ref = ref.shape.key
         value_ref = ref.shape.value
-        if ref['flattened']
+        if ref.shape.flattened
           hash.each do |key, value|
             node(name, ref) do
               member(key_ref.location_name || 'key', key_ref, key)
@@ -87,7 +89,7 @@ module Aws
         when StructureShape then structure(name, ref, value)
         when ListShape      then list(name, ref, value)
         when MapShape       then map(name, ref, value)
-        when TimestampShape then node(name, ref, timestamp(value))
+        when TimestampShape then node(name, ref, timestamp(ref, value))
         when BlobShape      then node(name, ref, blob(value))
         else
           node(name, ref, value.to_s)
@@ -99,8 +101,14 @@ module Aws
         Base64.strict_encode64(value)
       end
 
-      def timestamp(value)
-        value.utc.iso8601
+      def timestamp(ref, value)
+        case ref['timestampFormat'] || ref.shape['timestampFormat']
+        when 'unixTimestamp' then value.to_i
+        when 'rfc822' then value.utc.httpdate
+        else
+          # xml defaults to iso8601
+          value.utc.iso8601
+        end
       end
 
       # The `args` list may contain:

data/lib/aws-sdk-core/xml/default_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     # @api private

data/lib/aws-sdk-core/xml/default_map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     # @api private

data/lib/aws-sdk-core/xml/doc_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     class DocBuilder
@@ -6,7 +8,11 @@ module Aws
       # @option options [String] :pad ('')
       # @option options [String] :indent ('')
       def initialize(options = {})
-        @target = options[:target] || ''
+        @target = options[:target] || (
+          # The String has to be mutable
+          # because @target implements `<<` method.
+          String.new
+        )
         @indent = options[:indent] || ''
         @pad = options[:pad] || ''
         @end_of_line = @indent == '' ? '' : "\n"
@@ -32,7 +38,7 @@ module Aws
         if block_given?
           @target << open_el(name, attrs)
           @target << @end_of_line
-          increase_pad { yield }
+          increase_pad(&block)
           @target << @pad
           @target << close_el(name)
         elsif args.empty?
@@ -61,7 +67,12 @@ module Aws
       end
 
       def escape(string, text_or_attr)
-        string.to_s.encode(:xml => text_or_attr)
+        string.to_s
+          .encode(:xml => text_or_attr)
+          .gsub("\u{000D}", '&#xD;') # Carriage Return
+          .gsub("\u{000A}", '&#xA;') # Line Feed
+          .gsub("\u{0085}", '&#x85;') # Next Line
+          .gsub("\u{2028}", '&#x2028;') # Line Separator
       end
 
       def attributes(attr)
@@ -77,7 +88,7 @@ module Aws
       def increase_pad(&block)
         pre_increase = @pad
         @pad = @pad + @indent
-        yield
+        block.call
         @pad = pre_increase
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cgi'
 
 module Aws
@@ -6,7 +8,7 @@ module Aws
 
       def call(context)
         @handler.call(context).on(300..599) do |response|
-          response.error = error(context)
+          response.error = error(context) unless response.error
           response.data = nil
         end
       end
@@ -18,21 +20,44 @@ module Aws
         if body.empty?
           code = http_status_error_code(context)
           message = ''
+          data = EmptyStructure.new
         else
-          code, message = extract_error(body, context)
+          code, message, data = extract_error(body, context)
         end
-        svc = context.client.class.name.split('::')[1]
-        errors_module = Aws.const_get(svc).const_get(:Errors)
-        errors_module.error_class(code).new(context, message)
+        context[:request_id] = request_id(body)
+        errors_module = context.client.class.errors_module
+        error_class = errors_module.error_class(code).new(context, message, data)
+        error_class
       end
 
       def extract_error(body, context)
+        code = error_code(body, context)
         [
-          error_code(body, context),
+          code,
           error_message(body),
+          error_data(context, code)
         ]
       end
 
+      def error_data(context, code)
+        data = EmptyStructure.new
+        if error_rules = context.operation.errors
+          error_rules.each do |rule|
+            # for modeled shape with error trait
+            # match `code` in the error trait before
+            # match modeled shape name
+            error_shape_code = rule.shape['error']['code'] if rule.shape['error']
+            match = (code == error_shape_code || code == rule.shape.name)
+            if match && rule.shape.members.any?
+              data = Parser.new(rule).parse(context.http_response.body_contents)
+            end
+          end
+        end
+        data
+      rescue Xml::Parser::ParsingError
+        EmptyStructure.new
+      end
+
       def error_code(body, context)
         if matches = body.match(/<Code>(.+?)<\/Code>/)
           remove_prefix(unescape(matches[1]), context)
@@ -70,6 +95,12 @@ module Aws
         end
       end
 
+      def request_id(body)
+        if matches = body.match(/<RequestId>(.+?)<\/RequestId>/m)
+          matches[1]
+        end
+      end
+
       def unescape(str)
         CGI.unescapeHTML(str)
       end

data/lib/aws-sdk-core/xml/parser/engines/libxml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'libxml'
 
 module Aws

data/lib/aws-sdk-core/xml/parser/engines/nokogiri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 
 module Aws

data/lib/aws-sdk-core/xml/parser/engines/oga.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# Oga Java requires JRuby.runtime
+require 'jruby' if RUBY_PLATFORM == 'java'
 require 'oga'
 
 module Aws

data/lib/aws-sdk-core/xml/parser/engines/ox.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ox'
 require 'stringio'
 
@@ -14,7 +16,7 @@ module Aws
           Ox.sax_parse(
             @stack, StringIO.new(xml),
             :convert_special => true,
-            :skip => :skip_white
+            :skip => :skip_return
           )
         end
 

data/lib/aws-sdk-core/xml/parser/engines/rexml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 require 'rexml/streamlistener'
 
@@ -15,7 +17,8 @@ module Aws
 
         def parse(xml)
           begin
-            source = REXML::Source.new(xml)
+            mutable_xml = xml.dup # REXML only accepts mutable string
+            source = REXML::Source.new(mutable_xml)
             REXML::Parsers::StreamParser.new(source, self).parse
           rescue REXML::ParseException => error
             @stack.error(error.message)