aws-sdk 1.5.4 → 1.5.5

data/lib/aws/api_config/EC2-2012-06-01.yml

@@ -271,6 +271,13 @@
     ReasonMessage:
     - :string
   :outputs: {}
+- :name: CancelExportTask
+  :method: :cancel_export_task
+  :inputs:
+    ExportTaskId:
+    - :string
+    - :required
+  :outputs: {}
 - :name: CancelSpotInstanceRequests
   :method: :cancel_spot_instance_requests
   :inputs:
@@ -372,6 +379,29 @@
     NoReboot:
     - :boolean
   :outputs: {}
+- :name: CreateInstanceExportTask
+  :method: :create_instance_export_task
+  :inputs:
+    Description:
+    - :string
+    InstanceId:
+    - :string
+    - :required
+    TargetEnvironment:
+    - :string
+    - :required
+    ExportToS3:
+    - :structure:
+        DiskImageFormat:
+        - :string
+        ContainerFormat:
+        - :string
+        S3Bucket:
+        - :string
+        - :required
+        S3Prefix:
+        - :string
+  :outputs: {}
 - :name: CreateInternetGateway
   :method: :create_internet_gateway
   :inputs: {}
@@ -1175,6 +1205,21 @@
                   item:
                     :rename: :tag_set
                     :list: true
+- :name: DescribeExportTasks
+  :method: :describe_export_tasks
+  :inputs:
+    ExportTaskId:
+    - :list:
+      - :string
+    - :rename: exportTaskIds
+  :outputs:
+    :children:
+      exportTaskSet:
+        :ignore: true
+        :children:
+          item:
+            :rename: :export_task_set
+            :list: true
 - :name: DescribeImageAttribute
   :method: :describe_image_attribute
   :inputs:
@@ -2664,7 +2709,9 @@
               - :string
         - :rename: blockDeviceMappings
         Monitoring:
-        - :boolean
+        - :structure:
+            Enabled:
+            - :boolean
         SubnetId:
         - :string
         DisableApiTermination:
@@ -2991,6 +3038,10 @@
     VolumeId:
     - :string
     - :required
+    Attribute:
+    - :string
+    OperationType:
+    - :string
     AutoEnableIO:
     - :boolean
   :outputs: {}
@@ -3259,12 +3310,6 @@
               DeleteOnTermination:
               - :boolean
         - :rename: networkInterfaces
-        IamInstanceProfile:
-        - :structure:
-            Arn:
-            - :string
-            Name:
-            - :string
   :outputs:
     :children:
       spotInstanceRequestSet:
@@ -3570,12 +3615,6 @@
           DeleteOnTermination:
           - :boolean
     - :rename: networkInterfaces
-    IamInstanceProfile:
-    - :structure:
-        Arn:
-        - :string
-        Name:
-        - :string
   :outputs:
     :children:
       groupSet:

data/lib/aws/api_config/SimpleEmailService-2010-12-01.yml

@@ -33,6 +33,31 @@
     :children:
       DeleteVerifiedEmailAddressResult:
         :ignore: true
+- :name: GetIdentityNotificationAttributes
+  :method: :get_identity_notification_attributes
+  :inputs:
+    Identities:
+    - :membered_list:
+      - :string
+    - :required
+  :outputs:
+    :children:
+      GetIdentityNotificationAttributesResult:
+        :ignore: true
+        :children:
+          NotificationAttributes:
+            :ignore: true
+            :children:
+              entry:
+                :rename: :notification_attributes
+                :map:
+                - key
+                - value
+                :children:
+                  value:
+                    :children:
+                      ForwardingEnabled:
+                        :type: :boolean
 - :name: GetIdentityVerificationAttributes
   :method: :get_identity_verification_attributes
   :inputs:
@@ -199,6 +224,34 @@
     :children:
       SendRawEmailResult:
         :ignore: true
+- :name: SetIdentityFeedbackForwardingEnabled
+  :method: :set_identity_feedback_forwarding_enabled
+  :inputs:
+    Identity:
+    - :string
+    - :required
+    ForwardingEnabled:
+    - :boolean
+    - :required
+  :outputs:
+    :children:
+      SetIdentityFeedbackForwardingEnabledResult:
+        :ignore: true
+- :name: SetIdentityNotificationTopic
+  :method: :set_identity_notification_topic
+  :inputs:
+    Identity:
+    - :string
+    - :required
+    NotificationType:
+    - :string
+    - :required
+    SnsTopic:
+    - :string
+  :outputs:
+    :children:
+      SetIdentityNotificationTopicResult:
+        :ignore: true
 - :name: VerifyDomainIdentity
   :method: :verify_domain_identity
   :inputs:

data/lib/aws/auto_scaling/request.rb

@@ -16,7 +16,13 @@ module AWS
 
     # @private
     class Request < Core::Http::Request
-      include Core::Signature::Version2
+
+      include Core::Signature::Version4
+
+      def service
+        'autoscaling'
+      end
+
     end
 
   end

data/lib/aws/cloud_formation/stack_options.rb

@@ -27,15 +27,15 @@ module AWS
       def apply_template opts
         if template = opts.delete(:template)
           case template
-          when String 
-            if template.match(/http/)
+          when String
+            if template.match(/^http/)
               opts[:template_url] = template
             else
               opts[:template_body] = template
             end
           when URI then opts[:template_url] = template.to_s
           when S3::S3Object then opts[:template_body] = template.read
-          else 
+          else
             opts[:template_body] = template.to_json
           end
         end

data/lib/aws/core.rb

@@ -56,12 +56,17 @@ require 'aws/core/autoloader'
 # If you are loading AWS inside a Rails web application, it is recomended to 
 # place your configuration inside:
 #
-#   config/initializers/aws.rb
+#   config/initializers/aws-sdk.rb
+#
+# Optionally you can create a Yaml configuration file at 
+# RAILS_ROOT/config/aws.yaml; This should be formatted in the same manor
+# as the default RAILS_ROOT/config/database.yml file (one section for
+# each Rails environment).
 #
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'
@@ -201,10 +206,27 @@ module AWS
     #   service endpoint for Amazon EC2.
     #
     # @option options [String] :elb_endpoint ('elasticloadbalancing.us-east-1.amazonaws.com')
-    #   The server endpoint for Elastic Load Balancing.
+    #   The service endpoint for Elastic Load Balancing.
+    #
+    # @option options [Object] :http_handler (AWS::Core::Http::NetHttpHandler) 
+    #   The http handler that sends requests to AWS.
+    #
+    # @option options [Integer] :http_idle_timeout (60) The number of seconds
+    #   a persistent connection is allowed to sit idle before it should no
+    #   longer be used.
     #
-    # @option options [Object] :http_handler (AWS::HTTPartyHandler) The 
-    #   http handler that sends requests to AWS.
+    # @option options [Integer] :http_open_timeout (15) The number of seconds
+    #   before the +:http_handler+ should timeout while trying to open a new
+    #   HTTP sesssion.
+    #
+    # @option options [Integer] :http_read_timeout (60) The number of seconds
+    #   before the +:http_handler+ should timeout while waiting for a HTTP 
+    #   response.
+    #
+    # @option options [Boolean] :http_wire_trace (false) When +true+, the 
+    #   http handler will log all wire traces to the +:logger+.  If a 
+    #   +:logger+ is not configured, then wire traces will be sent to 
+    #   standard out.
     #
     # @option options [String] :iam_endpoint ('iam.amazonaws.com') The 
     #   service endpoint for AWS Idenity Access Management (IAM).
@@ -285,8 +307,8 @@ module AWS
     #   * {S3::S3Object#presigned_post}
     #   * {S3::Bucket#presigned_post}
     #
-    # @option options [String] :simple_db_endpoint ('sdb.amazonaws.com') The
-    #   service endpoint for Amazon SimpleDB.
+    # @option options [String] :simple_db_endpoint ('sdb.amazonaws.com') 
+    #   The service endpoint for Amazon SimpleDB.
     #
     # @option options [Boolean] :simple_db_consistent_reads (false) Determines
     #   if all SimpleDB read requests should be done consistently.
@@ -298,7 +320,7 @@ module AWS
     # @option options [String] :simple_workflow_service ('swf.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon Simple Workflow Service.
     #
-    # @option options [Object] :credential_provider (AWS::Core::CredentialProviders::DefaultProvider.new) 
+    # @option options [CredentialProviders::Provider] :credential_provider (AWS::Core::CredentialProviders::DefaultProvider.new) 
     #   Returns the credential provider.  The default credential provider
     #   attempts to check for statically assigned credentials, ENV credentials
     #   and credentials in the metadata service of EC2.
@@ -438,7 +460,6 @@ module AWS
     # are discarded.
     def memoize
       return yield if memoizing?
-
       begin
         start_memoizing
         yield if block_given?

data/lib/aws/core/client.rb

@@ -47,14 +47,14 @@ module AWS
           end
         end
   
-        @config = options.delete(:config)
-        @config ||= AWS.config
+        @config = (options.delete(:config) || AWS.config)
         @config = @config.with(options)
 
         @credential_provider = @config.credential_provider
         @http_handler = @config.http_handler
         @endpoint = config.send(:"#{service_ruby_name}_endpoint")
         @port = config.send(:"#{service_ruby_name}_port")
+        @http_read_timeout = @config.http_read_timeout
 
       end
   
@@ -75,6 +75,10 @@ module AWS
       # @private
       attr_reader :port
 
+      # @return [Integer] The number of secords before requests made by
+      #   this client should timeout if they have not received a response.
+      attr_reader :http_read_timeout
+
       # @return [String] Returns the service endpoint (hostname) this client
       #   makes requests against.
       # @private
@@ -432,6 +436,7 @@ module AWS
   
         # configure the http request
         http_request.service_ruby_name = service_ruby_name
+        http_request.default_read_timeout = http_read_timeout
         http_request.host = endpoint
         http_request.port = port
         http_request.region = config.send(:"#{service_ruby_name}_region")

data/lib/aws/core/configuration.rb

@@ -19,7 +19,7 @@ module AWS
 
     # A configuration object for AWS interfaces and clients.
     #
-    # == Configuring Credential
+    # == Configuring Credentials
     #
     # In order to do anything with AWS you will need to assign credentials.
     # The simplest method is to assing your credentials into the default
@@ -85,6 +85,22 @@ module AWS
     # @attr_reader [Object] http_handler The http handler that sends requests
     #   to AWS.  Defaults to an HTTP handler built on net/http.
     #
+    # @attr_reader [Integer] http_idle_timeout The number of seconds a
+    #   persistent connection is allowed to sit idle before it should no
+    #   longer be used.
+    #
+    # @attr_reader [Integer] http_open_timeout The number of seconds before
+    #   the +http_handler+ should timeout while trying to open a new HTTP 
+    #   sesssion.
+    #
+    # @attr_reader [Integer] http_read_timeout The number of seconds before
+    #   the +http_handler+ should timeout while waiting for a HTTP 
+    #   response.
+    #
+    # @attr_reader [Boolean] http_wire_trace When +true+, the http handler
+    #   will log all wire traces to the +:logger+.  If a +:logger+ is not
+    #   configured, then wire traces will be sent to standard out.
+    #
     # @attr_reader [String] iam_endpoint ('iam.amazonaws.com')
     #   The service endpoint for AWS Idenity Access Management (IAM).
     #
@@ -99,11 +115,8 @@ module AWS
     #   backoff in between service request retries, so the more retries the
     #   longer it can take to fail.
     #
-    # @attr_reader [String, URI, nil] proxy_uri (nil) The URI of the proxy 
-    #    to send service requests through.  You can pass a URI object or a 
-    #    URI string.  Defautls to +nil+.
-    #
-    #      AWS.config(:proxy_uri => 'https://user:pass@my.proxy:443')
+    # @attr_reader [URI,nil] proxy_uri (nil) The URI of the proxy 
+    #    to send service requests through.
     #
     # @attr_reader [String] s3_endpoint ('s3.amazonaws.com')
     #   The service endpoint for Amazon S3.
@@ -272,18 +285,17 @@ module AWS
       # @return [Hash] Returns a hash of all configuration values.
       def to_h
         self.class.accepted_options.inject({}) do |h,k|
-          h[k] = send(k)
-          h
+          h.merge(k => send(k))
         end
       end
+      alias_method :to_hash, :to_h
   
       # @return [Boolean] Returns true if the two configuration objects have
       #   the same values.
-      def == other
+      def eql? other
         other.is_a?(self.class) and self.supplied == other.supplied
       end
-  
-      alias_method :eql, :==
+      alias_method :==, :eql?
   
       # @private
       def inspect
@@ -291,6 +303,7 @@ module AWS
       end
   
       protected
+
       def supplied
         @supplied ||= {}
       end
@@ -338,11 +351,11 @@ module AWS
   
             return supplied[name] if supplied.has_key?(name)
   
-            needed = needs.collect{|need| send(need) }
+            needed = needs.inject({}) {|h,need| h.merge(need => send(need)) }
   
             unless @created.key?(name) and @created[name][:needed] == needed
               @created[name] = {}
-              @created[name][:object] = create_block.call(self)
+              @created[name][:object] = create_block.call(self,needed)
               @created[name][:needed] = needed
             end
   
@@ -380,23 +393,26 @@ module AWS
           end
 
           needs = [
-            :credential_provider, 
-            :http_handler, 
             :"#{ruby_name}_endpoint",
             :"#{ruby_name}_port",
+            :"#{ruby_name}_region",
+            :credential_provider, 
+            :http_handler, 
+            :http_read_timeout,
+            :log_formatter,
+            :log_level,
+            :logger,
+            :proxy_uri,
             :max_retries,
             :stub_requests?,
-            :proxy_uri,
-            :use_ssl?,
             :ssl_verify_peer?,
             :ssl_ca_file,
+            :ssl_ca_path,
+            :use_ssl?,
             :user_agent_prefix,
-            :logger,
-            :log_formatter,
-            :log_level,
           ]
 
-          create_block = lambda do |config| 
+          create_block = lambda do |config,client_options| 
             AWS.const_get(name)::Client.new(:config => config)
           end
 
@@ -406,15 +422,38 @@ module AWS
   
       end
 
-      add_option :access_key_id,
-        ENV['AWS_ACCESS_KEY_ID'] || ENV['AMAZON_ACCESS_KEY_ID']
+      add_option :access_key_id
   
-      add_option :secret_access_key,
-        ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
+      add_option :secret_access_key
   
       add_option :session_token
+  
+      add_option_with_needs :credential_provider,
+        [:access_key_id, :secret_access_key, :session_token] do |cfg,static_creds|
+
+        CredentialProviders::DefaultProvider.new(static_creds)
+  
+      end
+
+      add_option :http_open_timeout, 15
+
+      add_option :http_read_timeout, 60
 
-      add_option :http_handler, Http::NetHttpHandler.new
+      add_option :http_idle_timeout, 60
+
+      add_option :http_wire_trace, false, :boolean => true
+
+      add_option_with_needs :http_handler, 
+        [
+          :http_open_timeout, 
+          :http_idle_timeout,
+          :http_wire_trace, 
+          :logger, 
+        ] do |config,handler_options|
+
+        Http::NetHttpHandler.new(handler_options)
+
+      end
   
       add_option :logger
 
@@ -426,16 +465,6 @@ module AWS
   
       add_option :proxy_uri do |config,uri| uri ? URI.parse(uri.to_s) : nil end
   
-      add_option_with_needs :credential_provider, 
-        [:access_key_id, :secret_access_key, :session_token] do |config|
-
-        CredentialProviders::DefaultProvider.new(
-          :access_key_id => config.access_key_id,
-          :secret_access_key => config.secret_access_key,
-          :session_token => config.session_token)
-  
-      end
-  
       add_option :ssl_verify_peer, true, :boolean => true
   
       add_option :ssl_ca_file,