aws-sdk 1.6.2 → 1.6.3

data/lib/aws/core/http/response.rb

@@ -14,7 +14,7 @@
 module AWS
   module Core
     module Http
-  
+
       # Represents the http response from a service request.
       #
       # Responses have:
@@ -23,22 +23,26 @@ module AWS
       # * headers (hash of response headers)
       # * body (the response body)
       class Response
-  
-        # @return [Integer] (200) response http status code 
+
+        # @return [Integer] Returns the http response status code.
         attr_accessor :status
-  
-        # @return [Hash] ({}) response http headers
+
+        # @return [Hash] ({}) Returns the HTTP response headers.
         attr_accessor :headers
-  
-        # @return [String] ('') response http body
+
+        # @return [String,nil] Returns the HTTP response body.
         attr_accessor :body
-  
-        # @return [Boolean] (false) set to true if the client gives up
-        #   before getting a response from the service.
-        attr_accessor :timeout
 
-        alias_method :timeout?, :timeout
-  
+        # @return [Boolean] Returns +true+ if the request could not be made
+        #   because of a networking issue (including timeouts).
+        attr_accessor :network_error
+
+        alias_method :network_error?, :network_error
+
+        # The #network_error attribute was previously #timeout, aliasing 
+        # for backwards compatability
+        alias_method :timeout=, :network_error=
+
         # @param [Hash] options
         # @option options [Integer] :status (200) HTTP status code
         # @option options [Hash] :headers ({}) HTTP response headers
@@ -46,11 +50,11 @@ module AWS
         def initialize options = {}, &block
           @status = options[:status] || 200
           @headers = options[:headers] || {}
-          @body = options[:body] || ''
+          @body = options[:body]
           yield(self) if block_given?
           self
         end
-  
+
         # Returns the header value with the given name.
         #
         # The value is matched case-insensitively so if the headers hash
@@ -67,7 +71,7 @@ module AWS
           end
           nil
         end
-  
+
       end
     end
   end

data/lib/aws/core/indifferent_hash.rb

@@ -14,7 +14,7 @@
 module AWS
   module Core
 
-    # A utility class to provide indifferent access to hash data.  
+    # A utility class to provide indifferent access to hash data.
     #
     # Inspired by ActiveSupport's HashWithIndifferentAccess, this class
     # has a few notable differences:
@@ -26,10 +26,10 @@ module AWS
     # These features were omitted because our primary use for this class is to
     # wrap a 1-level hash as a return value, but we want the user to access
     # the values with string or symbol keys.
-    # 
+    #
     # @private
     class IndifferentHash < Hash
-  
+
       def initialize *args
         if args.first.is_a?(Hash)
           super()
@@ -38,51 +38,51 @@ module AWS
           super(*args)
         end
       end
-  
+
       alias_method :_getter, :[]
       alias_method :_setter, :[]=
-  
+
       def []=(key, value)
         _setter(_convert_key(key), value)
       end
       alias_method :store, :[]=
-  
+
       def [] key
         _getter(_convert_key(key))
       end
-  
+
       def merge! hash
         hash.each_pair do |key,value|
-          self[key] = value 
+          self[key] = value
         end
         self
       end
       alias_method :update, :merge!
-  
+
       def merge hash
         self.dup.merge!(hash)
       end
-  
+
       def has_key? key
         super(_convert_key(key))
       end
       alias_method :key?, :has_key?
       alias_method :member?, :has_key?
       alias_method :include?, :has_key?
-  
+
       def fetch key, *extras, &block
         super(_convert_key(key), *extras, &block)
       end
-  
+
       def delete key
         super(_convert_key(key))
       end
-  
+
       private
       def _convert_key key
         key.is_a?(String) ? key : key.to_s
       end
-  
+
     end
   end
 end

data/lib/aws/core/query_client.rb

@@ -93,6 +93,7 @@ module AWS
             parser.request_params(options).each do |param|
               request.add_param(param)
             end
+            request.body = request.url_encoded_params
 
           end
 

data/lib/aws/core/response.rb

@@ -16,14 +16,18 @@ module AWS
 
     # = Response
     #
-    # Each service request returns a response object.  Responses provide
-    # access to response data and request/response metadata.
+    # Each Service has a Client class.  There is one method per service
+    # operation defined on the client.  These methods all return a {Response}
+    # object.
+    #
+    # In addition to the response data, these responses provide metadata
+    # about the HTTP request made and the HTTP response received.
     #
     # == Response Data
     #
-    # Each response has a hash of data that represents the data
-    # returned by the service.  You can get at this data by
-    # calling {#data} (you can also use the {#[]} method as a shortcut)
+    # You can access the response data for a client request using the {#data}
+    # method or the {#[]} method.  Response data is a hash and {#[]} is
+    # a shortcut for accessing this hash.
     #
     #   # make a request to describe one instance
     #   ec2 = AWS::EC2.new
@@ -40,10 +44,10 @@ module AWS
     # In addition to the response data, there is additional information
     # available with the response, including:
     #
-    # * the name of the client request method called
-    # * the hash of options passed to the client request
-    # * the HTTP request object (useful for debugging)
-    # * the HTTP response object (useful for debugging)
+    # * {#request_type} - the name of the client request method
+    # * {#request_options} - the hash of options passed to the client method
+    # * {#http_request} - The HTTP request made
+    # * {#http_response} - the HTTP response received
     #
     # Given the example and response object from above:
     #
@@ -101,7 +105,7 @@ module AWS
         @data = {}
         @retry_count = 0
         @duration = 0
-        rebuild_request if @request_builder && !http_request
+        build_request if @request_builder && !http_request
       end
 
       # Provides access to the response data.  This is a short-cut
@@ -130,9 +134,10 @@ module AWS
         end
       end
 
-      # @return [Boolean] Returns true if the http request timed out.
-      def timeout?
-        http_response.timeout?
+      # @return [Boolean] Returns +true+ if the http request failed due to
+      #   a networking issue.
+      def network_error?
+        http_response.network_error?
       end
 
       # @return [String]
@@ -157,11 +162,24 @@ module AWS
       # (throttling, server errors, socket errors, etc).
       # @private
       def rebuild_request
-        @http_request = @request_builder.call
+        build_request
+        @http_request.body_stream.rewind if @http_request.body_stream
+      end
+
+      # @return [Boolean] Returns +false+ if it is not safe to retry a
+      #   request.  This happens when the http request body is an IO
+      #   object that can not be rewound and re-streamed.
+      def safe_to_retry?
+        @http_request.body_stream.nil? or
+        @http_request.body_stream.respond_to?(:rewind)
       end
 
       protected
 
+      def build_request
+        @http_request = @request_builder.call
+      end
+
       # @note The prefered method to get as response data is to use {#[]}.
       #
       # This provides a backwards-compat layer to the old response objects

data/lib/aws/core/signature/version_2.rb

@@ -24,6 +24,7 @@ module AWS
           add_param('SignatureVersion', '2')
           add_param('SignatureMethod', 'HmacSHA256')
           add_param('Signature', signature(credentials))
+          self.body = url_encoded_params
         end
 
         protected

data/lib/aws/core/signature/version_4.rb

@@ -19,7 +19,7 @@ module AWS
   module Core
     module Signature
       module Version4
-  
+
         def self.included base
           base.send(:include, Signer)
         end
@@ -29,13 +29,13 @@ module AWS
           headers['content-type'] ||= 'application/x-www-form-urlencoded'
           headers['host'] = host
           headers['x-amz-date'] = datetime
-          headers['x-amz-security-token'] = credentials.session_token if 
+          headers['x-amz-security-token'] = credentials.session_token if
             credentials.session_token
           headers['authorization'] = authorization(credentials, datetime)
         end
-        
+
         protected
-  
+
         def authorization credentials, datetime
           parts = []
           parts << "AWS4-HMAC-SHA256 Credential=#{credentials.access_key_id}/#{credential_string(datetime)}"
@@ -43,7 +43,7 @@ module AWS
           parts << "Signature=#{hex16(signature(credentials, datetime))}"
           parts.join(', ')
         end
-  
+
         def signature credentials, datetime
           k_secret = credentials.secret_access_key
           k_date = hmac("AWS4" + k_secret, datetime[0,8])
@@ -52,7 +52,7 @@ module AWS
           k_credentials = hmac(k_service, 'aws4_request')
           hmac(k_credentials, string_to_sign(datetime))
         end
-  
+
         def string_to_sign datetime
           parts = []
           parts << 'AWS4-HMAC-SHA256'
@@ -61,8 +61,8 @@ module AWS
           parts << hex16(hash(canonical_request))
           parts.join("\n")
         end
-  
-        def credential_string datetime 
+
+        def credential_string datetime
           parts = []
           parts << datetime[0,8]
           parts << region
@@ -70,7 +70,7 @@ module AWS
           parts << 'aws4_request'
           parts.join("/")
         end
-  
+
         def canonical_request
           parts = []
           parts << http_method
@@ -81,18 +81,18 @@ module AWS
           parts << hex16(hash(body || ''))
           parts.join("\n")
         end
-  
+
         def service
           # this method is implemented in the request class for each service
           raise NotImplementedError
         end
-  
+
         def signed_headers
           to_sign = headers.keys.map{|k| k.to_s.downcase }
           to_sign.delete('authorization')
           to_sign.sort.join(";")
         end
-  
+
         def canonical_headers
           headers = []
           self.headers.each_pair do |k,v|
@@ -101,20 +101,20 @@ module AWS
           headers = headers.sort_by(&:first)
           headers.map{|k,v| "#{k}:#{canonical_header_values(v)}" }.join("\n")
         end
-  
+
         def canonical_header_values values
           values = [values] unless values.is_a?(Array)
           values.map(&:to_s).map(&:strip).join(',')
         end
-  
+
         def hex16 string
           string.unpack('H*').first
         end
-  
+
         def hash string
           Digest::SHA256.digest(string)
         end
-  
+
       end
     end
   end

data/lib/aws/dynamo_db/client.rb

@@ -761,7 +761,7 @@ module AWS
         end
       end
 
-      def should_retry? response 
+      def retryable_error? response
         if response.error.is_a?(Errors::ProvisionedThroughputExceededException)
           config.dynamo_db_retry_throughput_errors?
         else
@@ -771,7 +771,7 @@ module AWS
 
       def sleep_durations response
 
-        retry_count = 
+        retry_count =
           if expired_credentials?(response)
             config.max_retries == 0 ? 0 : 1
           else

data/lib/aws/dynamo_db/request.rb

@@ -13,20 +13,14 @@
 
 module AWS
   class DynamoDB
-
     # @private
     class Request < Core::Http::Request
-
       include Core::Signature::Version4
 
       def service
         'dynamodb'
       end
 
-      # @return [String,nil]
-      attr_accessor :body
-
     end
-
   end
 end

data/lib/aws/ec2/security_group/ip_permission.rb

@@ -43,7 +43,7 @@ module AWS
 
           @groups = Array(options[:groups])
 
-          @egress = options[:egress]
+          @egress = options[:egress] || false
 
           # not all egress permissions require port ranges, depends on the
           # protocol
@@ -72,6 +72,9 @@ module AWS
         # granted access with this permission.
         attr_reader :groups
 
+        # @return [Boolean] True if this is an egress permission
+        attr_reader :egress
+
         # @return [Boolean] Returns true if this is an egress permission.
         def egress?
           @egress ? true : false

data/lib/aws/rails.rb

@@ -35,7 +35,7 @@ module AWS
   # for rails 2 and bundler for rails 3) then {setup} is called
   # automatically.
   module Rails
-    
+
     # Adds extra functionality to Rails.
     #
     # Normailly this method is invoked automatically when you require this
@@ -56,13 +56,13 @@ module AWS
       log_to_rails_logger
       nil
     end
-  
+
     # Loads AWS configuration options from +RAILS_ROOT/config/aws.yml+.
     #
     # This configuration file is optional.  You can omit this file and instead
     # use ruby to configure AWS inside a configuration initialization script
     # (e.g. RAILS_ROOT/config/intializers/aws.rb).
-    # 
+    #
     # If you have a yaml configuration file it should be formatted like the
     # standard +database.yml+ file in a Rails application.  This means there
     # should be one section for Rails environment:
@@ -76,8 +76,8 @@ module AWS
     #     access_key_id: YOUR_ACCESS_KEY_ID
     #     secret_access_key: YOUR_SECRET_ACCESS_KEY
     #     simple_db_consistent_reads: true
-    #     
-    # You should also consider DRYing up your configuration file using 
+    #
+    # You should also consider DRYing up your configuration file using
     # YAML references:
     #
     #   development:
@@ -90,7 +90,7 @@ module AWS
     #     simple_db_consistent_reads: true
     #
     # The yaml file will also be ERB parsed so you can use ruby inside of it:
-    # 
+    #
     #   development:
     #     access_key_id: YOUR_ACCESS_KEY_ID
     #     secret_access_key: <%= read_secret_from_a_secure_location %>
@@ -101,9 +101,9 @@ module AWS
     #     simple_db_consistent_reads: true
     #
     def self.load_yaml_config
-  
+
       path = Pathname.new("#{rails_root}/config/aws.yml")
-  
+
       if File.exists?(path)
         cfg = YAML::load(ERB.new(File.read(path)).result)
         unless cfg[rails_env]
@@ -111,9 +111,9 @@ module AWS
         end
         AWS.config(cfg[rails_env])
       end
-  
+
     end
-  
+
     # Adds a delivery method to ActionMailer that uses
     # {AWS::SimpleEmailService}.
     #