aws-sdk-core 2.6.23 → 2.6.24

data/apis/sqs/2012-11-05/resources-1.json

@@ -0,0 +1,232 @@
+{
+  "service": {
+    "actions": {
+      "CreateQueue": {
+        "request": { "operation": "CreateQueue" },
+        "resource": {
+          "type": "Queue",
+          "identifiers": [
+            { "target": "Url", "source": "response", "path": "QueueUrl" }
+          ]
+        }
+      },
+      "GetQueueByName": {
+        "request": { "operation": "GetQueueUrl" },
+        "resource": {
+          "type": "Queue",
+          "identifiers": [
+            { "target": "Url", "source": "response", "path": "QueueUrl" }
+          ]
+        }
+      }
+    },
+    "has": {
+      "Queue": {
+        "resource": {
+          "type": "Queue",
+          "identifiers": [
+            { "target": "Url", "source": "input" }
+          ]
+        }
+      }
+    },
+    "hasMany": {
+      "Queues": {
+        "request": { "operation": "ListQueues" },
+        "resource": {
+          "type": "Queue",
+          "identifiers": [
+            { "target": "Url", "source": "response", "path": "QueueUrls[]" }
+          ]
+        }
+      }
+    }
+  },
+  "resources": {
+    "Message": {
+      "identifiers": [
+        { "name": "QueueUrl" },
+        {
+          "name": "ReceiptHandle",
+          "memberName": "ReceiptHandle"
+        }
+      ],
+      "shape": "Message",
+      "actions": {
+        "ChangeVisibility": {
+          "request": {
+            "operation": "ChangeMessageVisibility",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "QueueUrl" },
+              { "target": "ReceiptHandle", "source": "identifier", "name": "ReceiptHandle" }
+            ]
+          }
+        },
+        "Delete": {
+          "request": {
+            "operation": "DeleteMessage",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "QueueUrl" },
+              { "target": "ReceiptHandle", "source": "identifier", "name": "ReceiptHandle" }
+            ]
+          }
+        }
+      },
+      "batchActions": {
+        "Delete": {
+          "request": {
+            "operation": "DeleteMessageBatch",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "QueueUrl" },
+              { "target": "Entries[*].Id", "source": "data", "path": "MessageId" },
+              { "target": "Entries[*].ReceiptHandle", "source": "identifier", "name": "ReceiptHandle" }
+            ]
+          }
+        }
+      },
+      "has": {
+        "Queue": {
+          "resource": {
+            "type": "Queue",
+            "identifiers": [
+              { "target": "Url", "source": "identifier", "name": "QueueUrl" }
+            ]
+          }
+        }
+      }
+    },
+    "Queue": {
+      "identifiers": [
+        { "name": "Url" }
+      ],
+      "shape": "GetQueueAttributesResult",
+      "load": {
+        "request": {
+          "operation": "GetQueueAttributes",
+          "params": [
+            { "target": "QueueUrl", "source": "identifier", "name": "Url" },
+            { "target": "AttributeNames[]", "source": "string", "value": "All" }
+          ]
+        },
+        "path": "@"
+      },
+      "actions": {
+        "AddPermission": {
+          "request": {
+            "operation": "AddPermission",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "ChangeMessageVisibilityBatch": {
+          "request": {
+            "operation": "ChangeMessageVisibilityBatch",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "Delete": {
+          "request": {
+            "operation": "DeleteQueue",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "DeleteMessages": {
+          "request": {
+            "operation": "DeleteMessageBatch",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "Purge": {
+          "request": {
+            "operation": "PurgeQueue",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "ReceiveMessages": {
+          "request": {
+            "operation": "ReceiveMessage",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          },
+          "resource": {
+            "type": "Message",
+            "identifiers": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" },
+              { "target": "ReceiptHandle", "source": "response", "path": "Messages[].ReceiptHandle" }
+            ],
+            "path": "Messages[]"
+          }
+        },
+        "RemovePermission": {
+          "request": {
+            "operation": "RemovePermission",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "SendMessage": {
+          "request": {
+            "operation": "SendMessage",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "SendMessages": {
+          "request": {
+            "operation": "SendMessageBatch",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        },
+        "SetAttributes": {
+          "request": {
+            "operation": "SetQueueAttributes",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          }
+        }
+      },
+      "has": {
+        "Message": {
+          "resource": {
+            "type": "Message",
+            "identifiers": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" },
+              { "target": "ReceiptHandle", "source": "input" }
+            ]
+          }
+        }
+      },
+      "hasMany": {
+        "DeadLetterSourceQueues": {
+          "request": {
+            "operation": "ListDeadLetterSourceQueues",
+            "params": [
+              { "target": "QueueUrl", "source": "identifier", "name": "Url" }
+            ]
+          },
+          "resource": {
+            "type": "Queue",
+            "identifiers": [
+              { "target": "Url", "source": "response", "path": "QueueUrls[]" }
+            ]
+          }
+        }
+      }
+    }
+  }
+}

data/lib/aws-sdk-core.rb

@@ -230,6 +230,7 @@ module Aws
       autoload :Builder, 'aws-sdk-core/rest/request/builder'
       autoload :Endpoint, 'aws-sdk-core/rest/request/endpoint'
       autoload :Headers, 'aws-sdk-core/rest/request/headers'
+      autoload :QuerystringBuilder, 'aws-sdk-core/rest/request/querystring_builder'
     end
     module Response
       autoload :Body, 'aws-sdk-core/rest/response/body'

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

@@ -24,9 +24,9 @@ module Aws
         [:assume_role_credentials, {}],
         [:shared_credentials, {}],
         [:instance_profile_credentials, {
-          retries: 0,
-          http_open_timeout: 1,
-          http_read_timeout: 1,
+          retries: @config ? @config.instance_profile_credentials_retries : 0,
+          http_open_timeout: @config ? @config.instance_profile_credentials_timeout : 1,
+          http_read_timeout: @config ? @config.instance_profile_credentials_timeout : 1,
         }],
       ]
     end

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

@@ -37,6 +37,10 @@ module Aws
         CredentialProviderChain.new(config).resolve
       end
 
+      option(:instance_profile_credentials_retries, 0)
+
+      option(:instance_profile_credentials_timeout, 1)
+
       # Intentionally not documented - this should go away when all
       # services support signature version 4 in every region.
       option(:signature_version) do |cfg|

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
 
@@ -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 |parts, (member_name, member_ref)|
+            if member_ref.location == 'querystring' && !params[member_name].nil?
+              parts << [member_ref, params[member_name]]
             end
+            parts
           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/querystring_builder.rb

@@ -0,0 +1,90 @@
+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 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 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