aws-sdk-core 2.4.0 → 3.53.0

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

@@ -66,7 +66,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 +80,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/refreshing_credentials.rb

@@ -3,7 +3,7 @@ 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:
   #

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

@@ -0,0 +1,121 @@
+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.rb

@@ -0,0 +1,10 @@
+require_relative 'rest/handler'
+require_relative 'rest/request/body'
+require_relative 'rest/request/builder'
+require_relative 'rest/request/endpoint'
+require_relative 'rest/request/headers'
+require_relative 'rest/request/querystring_builder'
+require_relative 'rest/response/body'
+require_relative 'rest/response/headers'
+require_relative 'rest/response/parser'
+require_relative 'rest/response/status_code'

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

@@ -1,4 +1,5 @@
 module Aws
+  # @api private
   module Rest
     class Handler < Seahorse::Client::Handler
 

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

@@ -31,7 +31,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 +40,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

@@ -5,15 +5,13 @@ module Aws
     module Request
       class Endpoint
 
-        include Seahorse::Model::Shapes
-
         # @param [Seahorse::Model::Shapes::ShapeRef] rules
         # @param [String] request_uri_pattern
         def initialize(rules, request_uri_pattern)
           @rules = rules
           request_uri_pattern.split('?').tap do |path_part, query_part|
             @path_pattern = path_part
-            @query_pattern = query_part
+            @query_prefix = query_part
           end
         end
 
@@ -31,7 +29,7 @@ module Aws
 
         def apply_path_params(uri, params)
           path = uri.path.sub(/\/$/, '') + @path_pattern.split('?')[0]
-          uri.path = path.gsub(/{\w+\+?}/) do |placeholder|
+          uri.path = path.gsub(/{.+?}/) do |placeholder|
             param_value_for_placeholder(placeholder, params)
           end
         end
@@ -50,70 +48,17 @@ module Aws
         end
 
         def apply_querystring_params(uri, params)
-          parts = []
-          parts << @query_pattern if @query_pattern
-          @rules.shape.members.each do |member_name, member|
-            if member.location == 'querystring' && !params[member_name].nil?
-              case member.shape
-
-              # supported scalar types
-              when StringShape, BooleanShape, FloatShape, IntegerShape, StringShape
-                param_name = member.location_name
-                param_value = params[member_name]
-                parts << "#{param_name}=#{escape(param_value.to_s)}"
-
-              # map of strings or map of string-list
-              when MapShape
-                if StringShape === member.shape.value.shape
-                  parts += query_map_of_string(params[member_name])
-                elsif ListShape === member.shape.value.shape
-                  parts += query_map_of_string_list(params[member_name])
-                else
-                  msg = "only map of string and string list supported"
-                  raise NotImplementedError, msg
-                end
-
-              when ListShape
-                if StringShape === member.shape.member.shape
-                  parts += list_of_strings(member.location_name, params[member_name])
-                else
-                  msg = "Only list of strings supported, got "
-                  msg << member.shape.member.shape.class.name
-                  raise NotImplementedError, msg
-                end
-
-              # unsupported querystring shape
-              else
-                raise NotImplementedError
-              end
-
-            end
-          end
-          uri.query = parts.empty? ? nil : parts.join('&')
-        end
-
-        def query_map_of_string(hash)
-          list = []
-          hash.each_pair do |key, value|
-            list << "#{escape(key)}=#{escape(value)}"
-          end
-          list
-        end
-
-        def query_map_of_string_list(hash)
-          list = []
-          hash.each_pair do |key, values|
-            values.each do |value|
-              list << "#{escape(key)}=#{escape(value)}"
+          # collect params that are supposed to be part of the query string
+          parts = @rules.shape.members.inject([]) do |prts, (member_name, member_ref)|
+            if member_ref.location == 'querystring' && !params[member_name].nil?
+              prts << [member_ref, params[member_name]]
             end
+            prts
           end
-          list
-        end
-
-        def list_of_strings(name, values)
-          values.map do |value|
-            "#{name}=#{escape(value)}"
-          end
+          querystring = QuerystringBuilder.new.build(parts)
+          querystring = [@query_prefix, querystring == '' ? nil : querystring].compact.join('&')
+          querystring = nil if querystring == ''
+          uri.query = querystring
         end
 
         def escape(string)

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

@@ -1,4 +1,5 @@
 require 'time'
+require 'base64'
 
 module Aws
   module Rest
@@ -28,13 +29,24 @@ module Aws
         private
 
         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
+            when TimestampShape then timestamp(ref, value)
             else 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 apply_header_map(headers, ref, values)
           prefix = ref.location_name || ''
           values.each_pair do |name, value|
@@ -42,6 +54,13 @@ module Aws
           end
         end
 
+        # With complex headers value in json syntax,
+        # base64 encodes value to aviod weird characters
+        # causing potential issues in headers
+        def apply_json_trait(value)
+          Base64.strict_encode64(value)
+        end
+
       end
     end
   end

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

@@ -0,0 +1,103 @@
+module Aws
+  module Rest
+    module Request
+      class QuerystringBuilder
+
+        include Seahorse::Model::Shapes
+
+        # Provide shape references and param values:
+        #
+        #     [
+        #       [shape_ref1, 123],
+        #       [shape_ref2, "text"]
+        #     ]
+        #
+        # Returns a querystring:
+        #
+        #   "Count=123&Words=text"
+        #
+        # @param [Array<Array<Seahorse::Model::ShapeRef, Object>>] params An array of
+        #   model shape references and request parameter value pairs.
+        #
+        # @return [String] Returns a built querystring
+        def build(params)
+          params.map do |(shape_ref, param_value)|
+            build_part(shape_ref, param_value)
+          end.join('&')
+        end
+
+        private
+
+        def build_part(shape_ref, param_value)
+          case shape_ref.shape
+          # supported scalar types
+          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)
+            elsif ListShape === shape_ref.shape.value.shape
+              query_map_of_string_list(param_value)
+            else
+              msg = "only map of string and string list supported"
+              raise NotImplementedError, msg
+            end
+          when ListShape
+            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
+              raise NotImplementedError, msg
+            end
+          else
+            raise NotImplementedError
+          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|
+            list << "#{escape(key)}=#{escape(value)}"
+          end
+          list
+        end
+
+        def query_map_of_string_list(hash)
+          list = []
+          hash.each_pair do |key, values|
+            values.each do |value|
+              list << "#{escape(key)}=#{escape(value)}"
+            end
+          end
+          list
+        end
+
+        def list_of_strings(name, values)
+          values.map do |value|
+            "#{name}=#{escape(value)}"
+          end
+        end
+
+        def escape(string)
+          Seahorse::Util.uri_escape(string)
+        end
+
+      end
+    end
+  end
+end