aws-sdk 1.8.5 → 1.9.0

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

@@ -0,0 +1,102 @@
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'net/http'
+require 'net/https'
+require 'thread'
+require 'logger'
+
+module AWS
+  module Core
+    module Http
+
+      def self.patch_net_http_100_continue!
+        if RUBY_VERSION >= '2.0'
+          Net::HTTP.send(:include, Expect100Continue20)
+        elsif RUBY_VERSION >= '1.9.3'
+          Net::HTTP.send(:include, Expect100Continue19)
+        else
+          msg = "Expect 100-continue not supported in Ruby < 1.9.3"
+          raise NotImplementedError, msg
+        end
+        Net::HTTP.send(:alias_method, :old_transport_request, :transport_request)
+        Net::HTTP.send(:alias_method, :transport_request, :new_transport_request)
+      end
+
+      # @private
+      module Expect100Continue19
+        def new_transport_request(req)
+          begin_transport req
+          res = catch(:response) {
+            req.exec @socket, @curr_http_version, edit_path(req.path)
+            begin
+              res = Net::HTTPResponse.read_new(@socket)
+            end while res.kind_of?(Net::HTTPContinue)
+            res
+          }
+          res.reading_body(@socket, req.response_body_permitted?) {
+            yield res if block_given?
+          }
+          end_transport req, res
+          res
+        rescue => exception
+          D "Conn close because of error #{exception}"
+          @socket.close if @socket and not @socket.closed?
+          raise exception
+        end
+      end
+
+      # @private
+      module Expect100Continue20
+        def new_transport_request(req)
+          count = 0
+          begin
+            begin_transport req
+            res = catch(:response) {
+              req.exec @socket, @curr_http_version, edit_path(req.path)
+              begin
+                res = Net::HTTPResponse.read_new(@socket)
+                res.decode_content = req.decode_content
+              end while res.kind_of?(Net::HTTPContinue)
+
+              res.uri = req.uri
+
+              res
+            }
+            res.reading_body(@socket, req.response_body_permitted?) {
+              yield res if block_given?
+            }
+          rescue Net::OpenTimeout
+            raise
+          rescue Net::ReadTimeout, IOError, EOFError,
+                 Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE,
+                 # avoid a dependency on OpenSSL
+                 defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : IOError,
+                 Timeout::Error => exception
+            if count == 0 && IDEMPOTENT_METHODS_.include?(req.method)
+              count += 1
+              @socket.close if @socket and not @socket.closed?
+              D "Conn close because of error #{exception}, and retry"
+              retry
+            end
+            D "Conn close because of error #{exception}"
+            @socket.close if @socket and not @socket.closed?
+            raise
+          end
+
+        end
+      end
+
+    end
+  end
+end

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

@@ -74,36 +74,30 @@ module AWS
         #   simple_email_service and ses do not match).
         attr_accessor :service_ruby_name
 
-        # @return [nil, URI] The URI to the proxy server requests are
-        #   sent through if configured.  Returns nil if there is no proxy.
-        attr_accessor :proxy_uri
-
         # @return [Integer] The number of seconds the service has to respond
         #   before a timeout error is raised on the request.  Defaults to
         #   60 seconds.
         attr_accessor :read_timeout
 
-        # @return [Boolean] Returns +true+ if this request should be made
+        # @return [Boolean] Returns `true` if this request should be made
         #   with SSL enabled.
         attr_accessor :use_ssl
 
         alias_method :use_ssl?, :use_ssl
 
-        # @return [Boolean] Returns +true+ if the client should verify
-        #   the peer certificate.
-        attr_accessor :ssl_verify_peer
-
-        alias_method :ssl_verify_peer?, :ssl_verify_peer
-
-        # @return [String] Returns the path to a bundle of CA certs in PEM
-        #   format; the HTTP handler should use this to verify all HTTPS
-        #   requests if {#ssl_verify_peer?} is true.
-        attr_accessor :ssl_ca_file
+        # @return [Float] timeout The number of seconds to wait for a
+        #   100-continue response before sending the HTTP request body.
+        # @private
+        attr_accessor :continue_timeout
 
-        # @return [String] Returns the path to a directory of CA certs.
-        #   The HTTP handler should use these to verify all HTTPS
-        #   requests if {#ssl_verify_peer?} is true.
-        attr_accessor :ssl_ca_path
+        def endpoint
+          scheme = use_ssl ? 'https' : 'http'
+          port = case scheme
+          when 'https' then self.port == 443 ? '' : ":#{self.port}"
+          when 'http' then self.port == 80 ? '' : ":#{self.port}"
+          end
+          "#{scheme}://#{host}#{port}"
+        end
 
         # @return [Integer] Returns the port the request will be made over.
         #   Defaults to 443 for SSL requests and 80 for non-SSL requests.

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

@@ -36,13 +36,13 @@ module AWS
         # @return [Exception,nil]
         attr_accessor :network_error
 
-        # @return [Boolean] Returns +true+ if the request could not be made
+        # @return [Boolean] Returns `true` if the request could not be made
         #   because of a networking issue (including timeouts).
         def network_error?
           @network_error ? true : false
         end
 
-        # The #network_error attribute was previously #timeout, aliasing 
+        # The #network_error attribute was previously #timeout, aliasing
         # for backwards compatability
         alias_method :timeout=, :network_error=
 

data/lib/aws/core/lazy_error_classes.rb

@@ -16,7 +16,7 @@ require 'thread'
 module AWS
   module Core
 
-    # Provides lazy creation of error classes via {#const_missing}.  
+    # Provides lazy creation of error classes via {#const_missing}.
     #
     # Extend this module provides 3 benefits to another module:
     #
@@ -26,24 +26,24 @@ module AWS
     #
     # Here is an example of how it works:
     #
-    #  Class Foo 
-    #    module Errors
-    #      extend AWS::Core::LazyErrorClasses
-    #    end
-    #  end
+    #     Class Foo
+    #       module Errors
+    #         extend AWS::Core::LazyErrorClasses
+    #       end
+    #     end
     #
-    #  Foo::Errors.error_class('NoSuchKey')
-    #  #=> Foo::Errors::NoSuckKey
+    #     Foo::Errors.error_class('NoSuchKey')
+    #     #=> Foo::Errors::NoSuckKey
     #
-    #  Foo::Errors.error_class('Nested.Error.Klasses')
-    #  #=> Foo::Errors::Nested::Error::Klasses
+    #     Foo::Errors.error_class('Nested.Error.Klasses')
+    #     #=> Foo::Errors::Nested::Error::Klasses
     #
     # The errors returned from {#error_class} are subclasses
     # of {AWS::Errors::Base}.
     #
     module LazyErrorClasses
 
-      # This grammar parses the defualt AWS XML error format  
+      # This grammar parses the defualt AWS XML error format
       BASE_ERROR_GRAMMAR = XML::Grammar.customize do
         element("Error") do
           ignore
@@ -56,12 +56,12 @@ module AWS
         unless base.const_defined?(:GRAMMAR)
           base.const_set(:GRAMMAR, BASE_ERROR_GRAMMAR)
         end
-      
+
         mutex = Mutex.new
         MetaUtils.extend_method(base, :const_missing_mutex) { mutex }
 
       end
-  
+
       # Defines a new error class.
       # @param [String,Symbol] constant
       # @return [nil]
@@ -73,9 +73,9 @@ module AWS
 
       # Converts the error code into an error class constant.
       #
-      #   AWS::EC2::Errors.error_class('Non.Existent.Error')
-      #   #=> AWS::EC2::Errors::Non::Existent::Error
-      # 
+      #     AWS::EC2::Errors.error_class('Non.Existent.Error')
+      #     #=> AWS::EC2::Errors::Non::Existent::Error
+      #
       # @param [String] code An AWS error code.
       #
       # @return [Class] Returns the error class defiend by the error code.
@@ -83,7 +83,7 @@ module AWS
       def error_class code
         module_eval("#{self}::#{code.gsub('.Range','Range').gsub(".","::")}")
       end
-  
+
     end
 
   end

data/lib/aws/core/log_formatter.rb

@@ -16,32 +16,32 @@ require 'pathname'
 module AWS
   module Core
 
-    # = Log Formatters
+    # # Log Formatters
     #
     # Log formatters receive a {AWS::Core::Response} object and return
     # a log message.  When you construct a {LogFormatter}, you provide
     # a pattern string with substitutions.
     #
-    #   pattern = '[REQUEST :http_status_code] :service :operation :duration'
-    #   formatter = AWS::Core::LogFormatter.new(pattern)
-    #   formatter.format(response)
-    #   #=> '[AWS 200] EC2 get_bucket 0.0352'
+    #     pattern = '[REQUEST :http_status_code] :service :operation :duration'
+    #     formatter = AWS::Core::LogFormatter.new(pattern)
+    #     formatter.format(response)
+    #     #=> '[AWS 200] EC2 get_bucket 0.0352'
     #
-    # = AWS Configuration
+    # # AWS Configuration
     #
     # AWS.config provides a {LogFormatter.default} log formatter.  You can
     # repace this formatter by building your own and then passing it
     # to {AWS.config}.
     #
-    #   pattern = '[REQUEST :http_status_code] :service :operation :duration'
-    #   AWS.config(:log_formatter => AWS::Core::LogFormatter.new(pattern)
+    #     pattern = '[REQUEST :http_status_code] :service :operation :duration'
+    #     AWS.config(:log_formatter => AWS::Core::LogFormatter.new(pattern)
     #
-    # == Canned Formatters
+    # ## Canned Formatters
     #
     # Instead of providing your own pattern, you can choose a canned log
     # formatter.
     #
-    #   AWS.config(:log_formatter => AWS::Core::LogFormatter.colored)
+    #     AWS.config(:log_formatter => AWS::Core::LogFormatter.colored)
     #
     # Here is the list of canned formatters.
     #
@@ -50,105 +50,71 @@ module AWS
     # * {LogFormatter.debug}
     # * {LogFormatter.colored}
     #
-    # = Pattern Substitutions
+    # # Pattern Substitutions
     #
     # You can put any of these placeholders into you pattern.
     #
-    # [+:service+]
-    #   The AWS service name (e.g. 'S3', 'EC2', 'SimpleDB', etc)
-    #
-    # [+:region+]
-    #   The AWS region name (e.g. 'us-east-1', 'us-west-1', etc)
-    #
-    # [+:operation+]
-    #   The name of the client request method.  This maps to the name of
-    #   the serivce API operation (e.g. :describe_instances).
-    #
-    # [+:options+]
-    #   The hash of options passed to the client request method.
-    #   Long strings are truncated/summarized if they excede the log
-    #   formatters {#max_string_size}.  Other objects are inspected.
-    #
-    # [+:retry_count+]
-    #   The number of times a client request was retried.
-    #   Throttlings and service errors trigger the automatic retry logic.
-    #   This value indicates how many extra attempts were made before
-    #   getting a successful response or giving up.
-    #
-    # [+:duration+]
-    #   The time it took to generate a response, expressed
-    #   in decimal seconds.  This time includes everything from
-    #   calling the client request method, until that method returns
-    #   a value (event retries and retry delays).
-    #
-    # [+:error_class+]
-    #   The class name of the error returned by the
-    #   service.  If no error was returned, this will be replcaed by
-    #   an empty string.
-    #
-    # [+:error_message+]
-    #   The message of the error returned.  If
-    #   no error was returned by the service, this will be an empty
-    #   string.
-    #
-    # [+:http_request_method+]
-    #   The HTTP request verb (e.g. 'POST', 'PUT', 'GET', etc).
-    #
-    # [+:http_request_protocol+]
-    #   This is replaced by 'http' or 'https'.
-    #
-    # [+:http_request_host+]
-    #   The host name of the http request endpoint (e.g. 's3.amazon.com').
-    #
-    # [+:http_request_port+]
-    #   The port number (e.g. '443' or '80').
-    #
-    # [+:http_request_uri+]
-    #   The http request uri folling the host (e.g.
-    #   '/bucket_name/objects/key?versions').
-    #
-    # [+:http_request_body+]
-    #   The http request payload.
-    #
-    # [+:http_request_headers+]
-    #   The http request headers, inspected.
-    #
-    # [+:http_request_proxy_uri+]
-    #   The proxy uri used, or an empty string.
-    #
-    # [+:http_response_status+]
-    #   The http response status code (e.g. '200', '404', '500', etc).
-    #
-    # [+:http_response_headers+]
-    #   The http response headers, inspected.
-    #
-    # [+:http_response_body+]
-    #   The http response body contents.
+    #   * `:service` - The AWS service name (e.g. 'S3', 'EC2', 'SimpleDB', etc)
+    #   * `:region` - The AWS region name (e.g. 'us-west-1', 'us-west-2', etc)
+    #   * `:operation` - The name of the client request method.  This maps to
+    #     the name of the serivce API operation (e.g. :describe_instances).
+    #   * `:options` - The hash of options passed to the client request method.
+    #     Long strings are truncated/summarized if they excede the log
+    #     formatters {#max_string_size}.  Other objects are inspected.
+    #   * `:retry_count` - The number of times a client request was retried.
+    #     Throttlings and service errors trigger the automatic retry logic.
+    #     This value indicates how many extra attempts were made before
+    #     getting a successful response or giving up.
+    #   * `:duration` - The time it took to generate a response, expressed
+    #     in decimal seconds.  This time includes everything from
+    #     calling the client request method, until that method returns
+    #     a value (event retries and retry delays).
+    #   * `:error_class` - The class name of the error returned by the
+    #     service.  If no error was returned, this will be replcaed by
+    #     an empty string.
+    #   * `:error_message` - The message of the error returned.  If
+    #     no error was returned by the service, this will be an empty
+    #     string.
+    #   * `:http_request_method` - The HTTP request verb (e.g. 'POST',
+    #     'PUT', 'GET', etc).
+    #   * `:http_request_protocol` - This is replaced by 'http' or 'https'.
+    #   * `:http_request_host` - The host name of the http request
+    #     endpoint (e.g. 's3.amazon.com').
+    #   * `:http_request_port` - The port number (e.g. '443' or '80').
+    #   * `:http_request_uri` - The http request uri folling the host (e.g.
+    #     '/bucket_name/objects/key?versions').
+    #   * `:http_request_body` - The http request payload.
+    #   * `:http_request_headers` - The http request headers, inspected.
+    #   * `:http_request_proxy_uri` - The proxy uri used, or an empty string.
+    #   * `:http_response_status` - The http response status
+    #     code (e.g. '200', '404', '500', etc).
+    #   * `:http_response_headers` - The http response headers, inspected.
+    #   * `:http_response_body` - The http response body contents.
     #
     class LogFormatter
 
       # @param [String] pattern The log format pattern should be a string
       #   and may contain any of the following placeholders:
       #
-      #   * +:service+
-      #   * +:region+
-      #   * +:operation+
-      #   * +:options+
-      #   * +:retry_count
-      #   * +:duration+
-      #   * +:error_class+
-      #   * +:error_message+
-      #   * +:http_request_method+
-      #   * +:http_request_protocol+
-      #   * +:http_request_host+
-      #   * +:http_request_port+
-      #   * +:http_request_uri+
-      #   * +:http_request_body+
-      #   * +:http_request_headers+
-      #   * +:http_request_proxy_uri+
-      #   * +:http_response_status+
-      #   * +:http_response_headers+
-      #   * +:http_response_body+
+      #     * `:service`
+      #     * `:region`
+      #     * `:operation`
+      #     * `:options`
+      #     * `:retry_count`
+      #     * `:duration`
+      #     * `:error_class`
+      #     * `:error_message`
+      #     * `:http_request_method`
+      #     * `:http_request_protocol`
+      #     * `:http_request_host`
+      #     * `:http_request_port`
+      #     * `:http_request_uri`
+      #     * `:http_request_body`
+      #     * `:http_request_headers`
+      #     * `:http_request_proxy_uri`
+      #     * `:http_response_status`
+      #     * `:http_response_headers`
+      #     * `:http_response_body`
       #
       # @param [Hash] options
       #
@@ -248,7 +214,7 @@ module AWS
       end
 
       def _http_request_proxy_uri response
-        response.http_request.proxy_uri
+        response.config.proxy_uri
       end
 
       def _http_response_status response
@@ -320,7 +286,7 @@ module AWS
         #
         # @example A sample of the default format.
         #
-        #   [AWS SimpleEmailService 200 0.580066 0 retries] list_verified_email_addresses()
+        #     [AWS SimpleEmailService 200 0.580066 0 retries] list_verified_email_addresses()
         #
         # @return [LogFormatter]
         #
@@ -345,7 +311,7 @@ module AWS
         #
         # @example A sample of the short format
         #
-        #   [AWS SimpleEmailService 200 0.494532] list_verified_email_addresses
+        #     [AWS SimpleEmailService 200 0.494532] list_verified_email_addresses
         #
         # @return [LogFormatter]
         #
@@ -431,7 +397,7 @@ module AWS
         #
         # @example A sample of the colored format (sans the ansi colors).
         #
-        #   [AWS SimpleEmailService 200 0.580066 0 retries] list_verified_email_addresses()
+        #     [AWS SimpleEmailService 200 0.580066 0 retries] list_verified_email_addresses()
         #
         # @return [LogFormatter]
         #