aws-sdk-core 2.11.212 → 3.170.0

data/lib/aws-sdk-core/query/ec2_param_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Aws
@@ -45,7 +47,7 @@ module Aws
         when ListShape      then list(ref, value, prefix)
         when MapShape       then raise NotImplementedError
         when BlobShape      then set(prefix, blob(value))
-        when TimestampShape then set(prefix, timestamp(value))
+        when TimestampShape then set(prefix, timestamp(ref, value))
         else
           set(prefix, value.to_s)
         end
@@ -68,8 +70,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
+          # ec2 defaults to iso8601
+          value.utc.iso8601
+        end
       end
 
     end

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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Aws
+  # @api private
   module Query
     class Handler < Seahorse::Client::Handler
 
@@ -6,16 +9,16 @@ module Aws
 
       CONTENT_TYPE = 'application/x-www-form-urlencoded; charset=utf-8'
 
-      WRAPPER_STRUCT = Structure.new(:result, :response_metadata)
+      WRAPPER_STRUCT = ::Struct.new(:result, :response_metadata)
 
-      METADATA_STRUCT = Structure.new(:request_id)
+      METADATA_STRUCT = ::Struct.new(:request_id)
 
       METADATA_REF = begin
         request_id = ShapeRef.new(
           shape: StringShape.new,
           location_name: 'RequestId')
         response_metadata = StructureShape.new
-        response_metadata[:struct_class] = METADATA_STRUCT
+        response_metadata.struct_class = METADATA_STRUCT
         response_metadata.add_member(:request_id, request_id)
         ShapeRef.new(shape: response_metadata, location_name: 'ResponseMetadata')
       end
@@ -26,7 +29,12 @@ module Aws
         build_request(context)
         @handler.call(context).on_success do |response|
           response.error = nil
-          response.data = parse_xml(context)
+          parsed = parse_xml(context)
+          if parsed.nil? || parsed == EmptyStructure
+            response.data = EmptyStructure.new
+          else
+            response.data = parsed
+          end
         end
       end
 
@@ -49,12 +57,8 @@ module Aws
       end
 
       def parse_xml(context)
-        if context.operation.output
-          data = Xml::Parser.new(rules(context)).parse(xml(context))
-          remove_wrapper(data, context)
-        else
-          EmptyStructure.new
-        end
+        data = Xml::Parser.new(rules(context)).parse(xml(context))
+        remove_wrapper(data, context)
       end
 
       def xml(context)
@@ -63,11 +67,13 @@ module Aws
 
       def rules(context)
         shape = Seahorse::Model::Shapes::StructureShape.new
-        shape.add_member(:result, ShapeRef.new(
-          shape: context.operation.output.shape,
-          location_name: context.operation.name + 'Result'
-        ))
-        shape[:struct_class] = WRAPPER_STRUCT
+        if context.operation.output
+          shape.add_member(:result, ShapeRef.new(
+            shape: context.operation.output.shape,
+            location_name: context.operation.name + 'Result'
+          ))
+        end
+        shape.struct_class = WRAPPER_STRUCT
         shape.add_member(:response_metadata, METADATA_REF)
         ShapeRef.new(shape: shape)
       end
@@ -77,7 +83,7 @@ module Aws
           if data.response_metadata
             context[:request_id] = data.response_metadata.request_id
           end
-          data.result || Structure.new(context.operation.output.shape.member_names)
+          data.result || Structure.new(*context.operation.output.shape.member_names)
         else
           data
         end

data/lib/aws-sdk-core/query/param.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Query
     class Param

data/lib/aws-sdk-core/query/param_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Aws
@@ -66,7 +68,7 @@ module Aws
         when ListShape      then list(ref, value, prefix)
         when MapShape       then map(ref, value, prefix)
         when BlobShape      then set(prefix, blob(value))
-        when TimestampShape then set(prefix, timestamp(value))
+        when TimestampShape then set(prefix, timestamp(ref, value))
         else set(prefix, value.to_s)
         end
       end
@@ -80,11 +82,17 @@ module Aws
       end
 
       def flat?(ref)
-        ref['flattened']
+        ref.shape.flattened
       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
+          # query defaults to iso8601
+          value.utc.iso8601
+        end
       end
 
       def blob(value)

data/lib/aws-sdk-core/query/param_list.rb

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

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative 'query/ec2_param_builder'
+require_relative 'query/handler'
+require_relative 'query/param'
+require_relative 'query/param_builder'
+require_relative 'query/param_list'

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'thread'
 
 module Aws
 
   # Base class used credential classes that can be refreshed. This
-  # provides basic refresh logic in a thread-safe manor. Classes mixing in
+  # provides basic refresh logic in a thread-safe manner. Classes mixing in
   # this module are expected to implement a #refresh method that populates
   # the following instance variables:
   #
@@ -15,45 +17,76 @@ module Aws
   # @api private
   module RefreshingCredentials
 
+    SYNC_EXPIRATION_LENGTH = 300 # 5 minutes
+    ASYNC_EXPIRATION_LENGTH = 600 # 10 minutes
+
+    CLIENT_EXCLUDE_OPTIONS = Set.new([:before_refresh]).freeze
+
     def initialize(options = {})
       @mutex = Mutex.new
+      @before_refresh = options.delete(:before_refresh) if Hash === options
+
+      @before_refresh.call(self) if @before_refresh
       refresh
     end
 
     # @return [Credentials]
     def credentials
-      refresh_if_near_expiration
+      refresh_if_near_expiration!
       @credentials
     end
 
     # @return [Time,nil]
     def expiration
-      refresh_if_near_expiration
+      refresh_if_near_expiration!
       @expiration
     end
 
     # Refresh credentials.
     # @return [void]
     def refresh!
-      @mutex.synchronize { refresh }
+      @mutex.synchronize do
+        @before_refresh.call(self) if @before_refresh
+
+        refresh
+      end
     end
 
     private
 
-    # Refreshes instance metadata credentials if they are within
-    # 5 minutes of expiration.
-    def refresh_if_near_expiration
-      if near_expiration?
+    # Refreshes credentials asynchronously and synchronously.
+    # If we are near to expiration, block while getting new credentials.
+    # Otherwise, if we're approaching expiration, use the existing credentials
+    # but attempt a refresh in the background.
+    def refresh_if_near_expiration!
+      # Note: This check is an optimization. Rather than acquire the mutex on every #refresh_if_near_expiration
+      # call, we check before doing so, and then we check within the mutex to avoid a race condition.
+      # See issue: https://github.com/aws/aws-sdk-ruby/issues/2641 for more info.
+      if near_expiration?(SYNC_EXPIRATION_LENGTH)
         @mutex.synchronize do
-          refresh if near_expiration?
+          if near_expiration?(SYNC_EXPIRATION_LENGTH)
+            @before_refresh.call(self) if @before_refresh
+            refresh
+          end
+        end
+      elsif @async_refresh && near_expiration?(ASYNC_EXPIRATION_LENGTH)
+        unless @mutex.locked?
+          Thread.new do
+            @mutex.synchronize do
+              if near_expiration?(ASYNC_EXPIRATION_LENGTH)
+                @before_refresh.call(self) if @before_refresh
+                refresh
+              end
+            end
+          end
         end
       end
     end
 
-    def near_expiration?
+    def near_expiration?(expiration_length)
       if @expiration
-        # are we within 5 minutes of expiration?
-        (Time.now.to_i + 5 * 60) > @expiration.to_i
+        # Are we within expiration?
+        (Time.now.to_i + expiration_length) > @expiration.to_i
       else
         true
       end

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

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'thread'
+
+module Aws
+
+  # Module/mixin used by token provider classes that can be refreshed. This
+  # provides basic refresh logic in a thread-safe manner. Classes mixing in
+  # this module are expected to implement a #refresh method that populates
+  # the following instance variable:
+  #
+  # * `@token` [Token] - {Aws::Token} object with the `expiration` and `token`
+  #       fields set.
+  #
+  # @api private
+  module RefreshingToken
+
+    def initialize(options = {})
+      @mutex = Mutex.new
+      @before_refresh = options.delete(:before_refresh) if Hash === options
+
+      @before_refresh.call(self) if @before_refresh
+      refresh
+    end
+
+    # @return [Token]
+    def token
+      refresh_if_near_expiration
+      @token
+    end
+
+    # @return [Time,nil]
+    def expiration
+      refresh_if_near_expiration
+      @expiration
+    end
+
+    # Refresh token.
+    # @return [void]
+    def refresh!
+      @mutex.synchronize do
+        @before_refresh.call(self) if @before_refresh
+        refresh
+      end
+    end
+
+    private
+
+    # Refreshes token if it is within
+    # 5 minutes of expiration.
+    def refresh_if_near_expiration
+      if near_expiration?
+        @mutex.synchronize do
+          if near_expiration?
+            @before_refresh.call(self) if @before_refresh
+            refresh
+          end
+        end
+      end
+    end
+
+    def near_expiration?
+      if @token && @token.expiration
+        # are we within 5 minutes of expiration?
+        (Time.now.to_i + 5 * 60) > @token.expiration.to_i
+      else
+        true
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/resources/collection.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+module Aws
+  module Resources
+    class Collection
+
+      extend Aws::Deprecations
+      include Enumerable
+
+      # @param [Enumerator<Array>] batches
+      # @option options [Integer] :limit
+      # @option options [Integer] :size
+      # @api private
+      def initialize(batches, options = {})
+        @batches = batches
+        @limit = options[:limit]
+        @size = options[:size]
+      end
+
+      # @return [Integer,nil]
+      #   Returns the size of this collection if known, returns `nil` when
+      #   an API call is necessary to enumerate items in this collection.
+      def size
+        @size
+      end
+      alias :length :size
+
+      # @deprecated
+      # @api private
+      def batches
+        ::Enumerator.new do |y|
+          batch_enum.each do |batch|
+            y << self.class.new([batch], size: batch.size)
+          end
+        end
+      end
+
+      # @deprecated
+      # @api private
+      def [](index)
+        if @size
+          @batches[0][index]
+        else
+          raise "unable to index into a lazy loaded collection"
+        end
+      end
+      deprecated :[]
+
+      # @return [Enumerator<Band>]
+      def each(&block)
+        enum = ::Enumerator.new do |y|
+          batch_enum.each do |batch|
+            batch.each do |band|
+              y.yield(band)
+            end
+          end
+        end
+        enum.each(&block) if block
+        enum
+      end
+
+      # @param [Integer] count
+      # @return [Resource, Collection]
+      def first(count = nil)
+        if count
+          items = limit(count).to_a
+          self.class.new([items], size: items.size)
+        else
+          begin
+            each.next
+          rescue StopIteration
+            nil
+          end
+        end
+      end
+
+      # Returns a new collection that will enumerate a limited number of items.
+      #
+      #     collection.limit(10).each do |band|
+      #       # yields at most 10 times
+      #     end
+      #
+      # @return [Collection]
+      # @param [Integer] limit
+      def limit(limit)
+        Collection.new(@batches, limit: limit)
+      end
+
+      private
+
+      def batch_enum
+        case @limit
+        when 0 then []
+        when nil then non_empty_batches
+        else limited_batches
+        end
+      end
+
+      def non_empty_batches
+        ::Enumerator.new do |y|
+          @batches.each do |batch|
+            y.yield(batch) if batch.size > 0
+          end
+        end
+      end
+
+      def limited_batches
+        ::Enumerator.new do |y|
+          yielded = 0
+          @batches.each do |batch|
+            batch = batch.take(@limit - yielded)
+            if batch.size > 0
+              y.yield(batch)
+              yielded += batch.size
+            end
+            break if yielded == @limit
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Aws
+  # @api private
   module Rest
     class Handler < Seahorse::Client::Handler
 
@@ -14,7 +17,7 @@ module Aws
 
       def apply_request_id(context)
         h = context.http_response.headers
-        context[:request_id] = h['x-amz-request-id'] || h['x-amzn-requestid']
+        context[:request_id] ||= h['x-amz-request-id'] || h['x-amzn-requestid']
       end
 
     end

data/lib/aws-sdk-core/rest/request/body.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Rest
     module Request
@@ -15,11 +17,29 @@ module Aws
         # @param [Seahorse::Client::Http::Request] http_req
         # @param [Hash] params
         def apply(http_req, params)
-          http_req.body = build_body(params)
+          body = build_body(params)
+          # for rest-json, ensure we send at least an empty object
+          # don't send an empty object for streaming? case.
+          if body.nil? && @serializer_class == Json::Builder &&
+             modeled_body? && !streaming?
+            body = '{}'
+          end
+          http_req.body = body
         end
 
         private
 
+        # operation is modeled for body when it is modeled for a payload
+        # either with payload trait or normal members.
+        def modeled_body?
+          return true if @rules[:payload]
+          @rules.shape.members.each do |member|
+            _name, shape = member
+            return true if shape.location.nil?
+          end
+          false
+        end
+
         def build_body(params)
           if streaming?
             params[@rules[:payload]]

data/lib/aws-sdk-core/rest/request/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Rest
     module Request
@@ -31,7 +33,7 @@ module Aws
         def populate_body(context)
           Body.new(
             serializer_class(context),
-            context.operation.input,
+            context.operation.input
           ).apply(context.http_request, context.params)
         end
 
@@ -40,6 +42,7 @@ module Aws
           case protocol
           when 'rest-xml' then Xml::Builder
           when 'rest-json' then Json::Builder
+          when 'api-gateway' then Json::Builder
           else raise "unsupported protocol #{protocol}"
           end
         end

data/lib/aws-sdk-core/rest/request/endpoint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Aws
@@ -35,10 +37,15 @@ module Aws
         end
 
         def param_value_for_placeholder(placeholder, params)
-          value = params[param_name(placeholder)].to_s
-          placeholder.include?('+') ?
-            value.gsub(/[^\/]+/) { |v| escape(v) } :
+          name = param_name(placeholder)
+          value = params[name].to_s
+          raise ArgumentError, ":#{name} must not be blank" if value.empty?
+
+          if placeholder.include?('+')
+            value.gsub(/[^\/]+/) { |v| escape(v) }
+          else
             escape(value)
+          end
         end
 
         def param_name(placeholder)
@@ -49,11 +56,11 @@ module Aws
 
         def apply_querystring_params(uri, params)
           # collect params that are supposed to be part of the query string
-          parts = @rules.shape.members.inject([]) do |parts, (member_name, member_ref)|
+          parts = @rules.shape.members.inject([]) do |prts, (member_name, member_ref)|
             if member_ref.location == 'querystring' && !params[member_name].nil?
-              parts << [member_ref, params[member_name]]
+              prts << [member_ref, params[member_name]]
             end
-            parts
+            prts
           end
           querystring = QuerystringBuilder.new.build(parts)
           querystring = [@query_prefix, querystring == '' ? nil : querystring].compact.join('&')

data/lib/aws-sdk-core/rest/request/headers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'time'
 require 'base64'
 
@@ -30,11 +32,29 @@ module Aws
 
         def apply_header_value(headers, ref, value)
           value = apply_json_trait(value) if ref['jsonvalue']
-          headers[ref.location_name] =
-            case ref.shape
-            when TimestampShape then value.utc.httpdate
-            else value.to_s
-            end
+          case ref.shape
+          when TimestampShape then headers[ref.location_name] = timestamp(ref, value)
+          when ListShape then list(headers, ref, value)
+          else headers[ref.location_name] = value.to_s
+          end
+        end
+
+        def timestamp(ref, value)
+          case ref['timestampFormat'] || ref.shape['timestampFormat']
+          when 'unixTimestamp' then value.to_i
+          when 'iso8601' then value.utc.iso8601
+          else
+            # header default to rfc822
+            value.utc.httpdate
+          end
+        end
+
+        def list(headers, ref, value)
+          return if !value || value.empty?
+          headers[ref.location_name] = value
+            .compact
+            .map { |s| Seahorse::Util.escape_header_list_string(s.to_s) }
+            .join(',')
         end
 
         def apply_header_map(headers, ref, values)
@@ -45,7 +65,7 @@ module Aws
         end
 
         # With complex headers value in json syntax,
-        # base64 encodes value to aviod weird characters
+        # base64 encodes value to avoid weird characters
         # causing potential issues in headers
         def apply_json_trait(value)
           Base64.strict_encode64(value)

data/lib/aws-sdk-core/rest/request/querystring_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Rest
     module Request
@@ -34,6 +36,9 @@ module Aws
           when StringShape, BooleanShape, FloatShape, IntegerShape, StringShape
             param_name = shape_ref.location_name
             "#{param_name}=#{escape(param_value.to_s)}"
+          when TimestampShape
+            param_name = shape_ref.location_name
+            "#{param_name}=#{escape(timestamp(shape_ref, param_value))}"
           when MapShape
             if StringShape === shape_ref.shape.value.shape
               query_map_of_string(param_value)
@@ -47,8 +52,8 @@ module Aws
             if StringShape === shape_ref.shape.member.shape
               list_of_strings(shape_ref.location_name, param_value)
             else
-              msg = "Only list of strings supported, got "
-              msg << shape_ref.shape.member.shape.class.name
+              msg = "Only list of strings supported, got "\
+                    "#{shape_ref.shape.member.shape.class.name}"
               raise NotImplementedError, msg
             end
           else
@@ -56,6 +61,16 @@ module Aws
           end
         end
 
+        def timestamp(ref, value)
+          case ref['timestampFormat'] || ref.shape['timestampFormat']
+          when 'unixTimestamp' then value.to_i
+          when 'rfc822' then value.utc.httpdate
+          else
+            # querystring defaults to iso8601
+            value.utc.iso8601
+          end
+        end
+
         def query_map_of_string(hash)
           list = []
           hash.each_pair do |key, value|