aws-sdk 1.5.2 → 1.5.3

data/lib/aws/api_config/AutoScaling-2011-01-01.yml

@@ -106,6 +106,10 @@
     - :structure:
         Enabled:
         - :boolean
+    SpotPrice:
+    - :string
+    IamInstanceProfile:
+    - :string
   :outputs:
     :children:
       CreateLaunchConfigurationResult:
@@ -455,7 +459,7 @@
                       member:
                         :rename: :alarms
                         :list: true
-                  MinAdjustmentMagnitude:
+                  MinAdjustmentStep:
                     :type: :integer
 - :name: DescribeScalingActivities
   :method: :describe_scaling_activities
@@ -647,7 +651,7 @@
     - :required
     Cooldown:
     - :integer
-    MinAdjustmentMagnitude:
+    MinAdjustmentStep:
     - :integer
   :outputs:
     :children:

data/lib/aws/api_config/{EC2-2012-04-01.yml → EC2-2012-06-01.yml}

@@ -3260,6 +3260,12 @@
               DeleteOnTermination:
               - :boolean
         - :rename: networkInterfaces
+        IamInstanceProfile:
+        - :structure:
+            Arn:
+            - :string
+            Name:
+            - :string
   :outputs:
     :children:
       spotInstanceRequestSet:
@@ -3565,6 +3571,12 @@
           DeleteOnTermination:
           - :boolean
     - :rename: networkInterfaces
+    IamInstanceProfile:
+    - :structure:
+        Arn:
+        - :string
+        Name:
+        - :string
   :outputs:
     :children:
       groupSet:

data/lib/aws/api_config/STS-2011-06-15.yml

@@ -39,10 +39,6 @@
   :inputs:
     DurationSeconds:
     - :integer
-    SerialNumber:
-    - :string
-    TokenCode:
-    - :string
   :outputs:
     :children:
       GetSessionTokenResult:

data/lib/aws/auto_scaling/client.rb

@@ -92,6 +92,8 @@ module AWS
       #     * +:volume_size+ - (Integer)
       # * +:instance_monitoring+ - (Hash)
       #   * +:enabled+ - (Boolean)
+      # * +:spot_price+ - (String)
+      # * +:iam_instance_profile+ - (String)
       #
       # === Response Structure:
       #
@@ -355,6 +357,8 @@ module AWS
       #       * +:volume_size+ - (Integer)
       #   * +:instance_monitoring+ - (Hash)
       #     * +:enabled+ - (Boolean)
+      #   * +:spot_price+ - (String)
+      #   * +:iam_instance_profile+ - (String)
       #   * +:created_time+ - (Time)
       # * +:next_token+ - (String)
       #
@@ -423,7 +427,7 @@ module AWS
       #   * +:alarms+ - (Array<Hash>)
       #     * +:alarm_name+ - (String)
       #     * +:alarm_arn+ - (String)
-      #   * +:min_adjustment_magnitude+ - (Integer)
+      #   * +:min_adjustment_step+ - (Integer)
       # * +:next_token+ - (String)
       #
       # @return [Core::Response]
@@ -608,7 +612,7 @@ module AWS
       # * +:scaling_adjustment+ - *required* - (Integer)
       # * +:adjustment_type+ - *required* - (String)
       # * +:cooldown+ - (Integer)
-      # * +:min_adjustment_magnitude+ - (Integer)
+      # * +:min_adjustment_step+ - (Integer)
       #
       # === Response Structure:
       #

data/lib/aws/auto_scaling/launch_configuration.rb

@@ -37,6 +37,10 @@ module AWS
     # @attr_reader [String,nil] user_data
     #
     # @attr_reader [Array<Hash>] block_device_mappings
+    # 
+    # @attr_reader [String] iam_instance_profile
+    #
+    # @attr_reader [String] spot_price
     #
     class LaunchConfiguration < Core::Resource
 
@@ -71,6 +75,10 @@ module AWS
 
       attribute :ramdisk_id, :static => true
 
+      attribute :iam_instance_profile, :static => true
+
+      attribute :spot_price, :static => true
+
       attribute :user_data, :static => true do
         translates_output{|v| Base64.decode64(v) }
       end

data/lib/aws/auto_scaling/launch_configuration_collection.rb

@@ -57,6 +57,10 @@ module AWS
       #
       # @option options [String] :user_data The user data available to 
       #   the launched Amazon EC2 instances.
+      #
+      # @option options [String] :iam_instance_profile
+      #
+      # @option options [String] :spot_price
       # 
       # @return [LaunchConfiguration]
       #
@@ -66,17 +70,23 @@ module AWS
         client_opts[:launch_configuration_name] = name
         client_opts[:image_id] = image_id_opt(image)
         client_opts[:instance_type] = instance_type
-        client_opts[:block_device_mappings] = options[:block_device_mappings] if
-          options.key?(:block_device_mappings)
         client_opts[:instance_monitoring] = instance_monitoring_opt(options) if
           options.key?(:detailed_instance_monitoring)
-        client_opts[:kernel_id] = options[:kernel_id] if options[:kernel_id]
         client_opts[:key_name] = key_name_opt(options) if options[:key_pair]
-        client_opts[:ramdisk_id] = options[:ramdisk_id] if options[:ramdisk_id]
         client_opts[:security_groups] = security_groups_opt(options) if
           options.key?(:security_groups)
         client_opts[:user_data] = user_data_opt(options) if options[:user_data]
 
+        [
+          :iam_instance_profile,
+          :spot_price,
+          :kernel_id,
+          :ramdisk_id,
+          :block_device_mappings,
+        ].each do |opt|
+          client_opts[opt] = options[opt] if options.key?(opt)
+        end
+
         client.create_launch_configuration(client_opts)
 
         LaunchConfiguration.new(name,

data/lib/aws/auto_scaling/scaling_policy.rb

@@ -13,6 +13,21 @@
 
 module AWS
   class AutoScaling
+
+    # 
+    # @attr_reader [String] arn
+    #
+    # @attr_reader [String] adjustment_type
+    #
+    # @attr_reader [Integer] scaling_adjustment
+    #
+    # @attr_reader [Hash] alarms Returns a hash of alarms names (keys)
+    #   to alarm ARNs (values).
+    #
+    # @attr_reader [Integer] cooldown
+    #
+    # @attr_reader [Integer] min_adjustment_magnitude
+    #
     class ScalingPolicy < Core::Resource
 
       include ScalingPolicyOptions
@@ -48,6 +63,8 @@ module AWS
 
       attribute :cooldown
 
+      attribute :min_adjustment_magintude
+
       populates_from(:describe_policies) do |resp|
         resp.scaling_policies.find do |p| 
           p.policy_name == name and

data/lib/aws/auto_scaling/scaling_policy_options.rb

@@ -40,6 +40,8 @@ module AWS
       #   after a scaling activity completes before any further 
       #   trigger-related scaling activities can start.
       #
+      # @option options [Integer] :min_adjustment_magnitude
+      #
       # @return [Hash]
       #
       def scaling_policy_options auto_scaling_group, policy_name, options

data/lib/aws/core.rb

@@ -61,7 +61,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'
@@ -75,8 +75,8 @@ module AWS
       autoload :Client,                    'client'
       autoload :Collection,                'collection'
       autoload :Configuration,             'configuration'
+      autoload :CredentialProviders,       'credential_providers'
       autoload :Data,                      'data'
-      autoload :DefaultSigner,             'default_signer'
       autoload :IndifferentHash,           'indifferent_hash'
       autoload :Inflection,                'inflection'
       autoload :LazyErrorClasses,          'lazy_error_classes'
@@ -92,7 +92,7 @@ module AWS
       autoload :Response,                  'response'
       autoload :ResponseCache,             'response_cache'
       autoload :ServiceInterface,          'service_interface'
-      autoload :SessionSigner,             'session_signer'
+      autoload :Signer,                    'signer'
       autoload :UriEscape,                 'uri_escape'
     end
 
@@ -175,13 +175,13 @@ module AWS
     #
     # @param [Hash] options
     #
-    # @option options [String] :access_key_id (nil) AWS access key id 
+    # @option options [String] :access_key_id AWS access key id 
     #   credential.
     #
-    # @option options [String] :secret_access_key (nil) AWS secret access 
+    # @option options [String] :secret_access_key AWS secret access 
     #   key credential.
     #
-    # @option options [String,nil] :session_token (nil) AWS secret token 
+    # @option options [String,nil] :session_token AWS secret token 
     #   credential.
     #
     # @option options [String] :auto_scaling_endpoint ('autoscaling.us-east-1.amazonaws.com')
@@ -221,11 +221,11 @@ module AWS
     #
     # @option options [Object] :log_formatter The log formatter is responsible
     #   for building log messages from responses. You can quickly change 
-    #   log formats by providing a canned log formatter.
+    #   log formats by providing a pre-configured log formatter.
     #
     #     AWS.config(:log_formatter => AWS::Core::LogFormatter.colored)
     # 
-    #   Here is the complete list of canned log formatters:
+    #   Here is a list of pre-configured log formatters:
     #
     #   * +AWS::Core::LogFormatter.default+
     #   * +AWS::Core::LogFormatter.short+
@@ -298,8 +298,10 @@ 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] :signer (AWS::DefaultSigner) The request signer.  Defaults to
-    #   a default request signer implementation.
+    # @option options [Object] :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.
     #
     # @option options [String] :ssl_ca_file The path to a CA cert bundle in 
     #   PEM format.
@@ -320,7 +322,7 @@ module AWS
     #   man-in-the-middle attacks and can pose a serious security
     #   risk.
     #
-    # @option options[Boolean] :stub_requests (false) When +true+ requests 
+    # @option options [Boolean] :stub_requests (false) When +true+ requests 
     #   are not sent to AWS, instead empty reponses are generated and 
     #   returned to each service request.
     #

data/lib/aws/core/cacheable.rb

@@ -35,7 +35,7 @@ module AWS
       def cache_key
         @cache_key ||= begin
           endpoint_method = self.class.service_ruby_name + "_endpoint"
-          config.signer.access_key_id + ":" +
+          config.credential_provider.access_key_id + ":" +
             config.send(endpoint_method) + ":" +
             self.class.name + ":" +
             local_cache_key

data/lib/aws/core/client.rb

@@ -27,33 +27,12 @@ module AWS
       # @private
       CACHEABLE_REQUESTS = Set[]
   
-      # Creates a new low-level client.
-      #
-      # == Required Options
-      #
-      # To create a client you must provide access to AWS credentials.
-      # There are two options:
-      #
-      # * +:signer+ -- An object that responds to +access_key_id+
-      #   (to return the AWS Access Key ID) and to
-      #   <code>sign(string_to_sign)</code> (to return a signature
-      #   for a given string).  An example implementation is
-      #   AWS::Core::DefaultSigner.  This option is useful if you want to
-      #   more tightly control access to your secret access key (for
-      #   example by moving the signature computation into a
-      #   different process).
-      #
-      # * +:access_key_id+ and +:secret_access_key+ -- You can use
-      #   these options to provide the AWS Access Key ID and AWS
-      #   Secret Access Key directly to the client.
-      #
-      # == Optional
-      #
-      # * +:http_handler+ -- Any object that implements a
-      #   <code>handle(request, response)</code> method; an example
-      #   is BuiltinHttpHandler.  This method is used to perform the
-      #   HTTP requests that this client constructs.
-      #
+      # Creates a new low-level client.  
+      # @param [Hash] options
+      # @option options [Core::Configuration] :config (AWS.config) 
+      #   The base configuration object to use.  All other options
+      #   are merged with this.  Defaults to the AWS.config.
+      # @option (see AWS.config)
       def initialize options = {}
 
         options = options.dup # so we don't modify the options passed in
@@ -72,7 +51,7 @@ module AWS
         @config ||= AWS.config
         @config = @config.with(options)
 
-        @signer = @config.signer
+        @credential_provider = @config.credential_provider
         @http_handler = @config.http_handler
         @endpoint = config.send(:"#{service_ruby_name}_endpoint")
         @port = config.send(:"#{service_ruby_name}_port")
@@ -82,11 +61,10 @@ module AWS
       # @return [Configuration] This clients configuration.
       attr_reader :config
   
-      # @return [DefaultSigner,Object] Returns the signer for this client.
-      #   This is normally a DefaultSigner, but it can be configured to
-      #   an other object.
+      # @return [CredentialProviders::Provider] Returns the credentail
+      #   provider for this client.
       # @private
-      attr_reader :signer
+      attr_reader :credential_provider
 
       # @return [String] The snake-cased ruby name for the service
       #   (e.g. 's3', 'iam', 'dynamo_db', etc).
@@ -113,7 +91,8 @@ module AWS
       #
       #   s3_with_logging = s3.with_http_handler do |request, response|
       #     $stderr.puts request.inspect
-      #     super
+      #     super(request, response)
+      #     $stderr.puts response.inspect
       #   end
       #
       # The block executes in the context of an HttpHandler
@@ -132,8 +111,14 @@ module AWS
         with_options(:http_handler => handler)
       end
   
+      # Returns a new client with the passed configuration options
+      # merged with the current configuration options.
+      #
+      #   no_retry_client = client.with_options(:max_retries => 0)
+      #
       # @param [Hash] options
-      # @see AWS.config detailed list of accepted options.
+      # @option (see AWS.config)
+      # @return [Client]
       def with_options options
         with_config(config.with(options))
       end
@@ -141,6 +126,7 @@ module AWS
       # @param [Configuration] config The configuration object to use.
       # @return [Core::Client] Returns a new client object with the given
       #   configuration.
+      # @private
       def with_config config
         self.class.new(:config => config)
       end
@@ -248,13 +234,18 @@ module AWS
       end
 
       def rebuild_http_request response
+        credential_provider.refresh if expired_credentials?(response)
         response.rebuild_request
         response.retry_count += 1
       end
   
       def sleep_durations response
-        factor = scaling_factor(response)
-        Array.new(config.max_retries) {|n| (2 ** n) * factor }
+        if expired_credentials?(response)
+          [0]
+        else
+          factor = scaling_factor(response)
+          Array.new(config.max_retries) {|n| (2 ** n) * factor }
+        end
       end
   
       def scaling_factor response
@@ -262,9 +253,18 @@ module AWS
       end
   
       def should_retry? response
+        expired_credentials?(response) or
         response.timeout? or
-          response.throttled? or
-          response.error.kind_of?(Errors::ServerError)
+        response.throttled? or
+        response.error.kind_of?(Errors::ServerError)
+      end
+
+      # @return [Boolean] Returns +true+ if the response contains an
+      #   error message that indicates credentials have expired.
+      def expired_credentials? response
+        response.error and 
+        response.error.respond_to?(:code) and
+        response.error.code == 'ExpiredTokenException'
       end
   
       def return_or_raise options, &block
@@ -428,6 +428,7 @@ module AWS
         opts.delete(:async)
   
         http_request = new_request
+        http_request.access_key_id = credential_provider.access_key_id
   
         # configure the http request
         http_request.service_ruby_name = service_ruby_name
@@ -443,7 +444,7 @@ module AWS
         send("configure_#{name}_request", http_request, opts, &block)
 
         http_request.headers["user-agent"] = user_agent_string
-        http_request.add_authorization!(signer)
+        http_request.add_authorization!(credential_provider)
 
         http_request
 

data/lib/aws/core/configuration.rb

@@ -156,8 +156,8 @@ module AWS
     # @attr_reader [String] simple_workflow_endpoint ('swf.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon Simple Workflow Service.
     #
-    # @attr_reader [Object] signer 
-    #   The request signer. Defaults to a default request signer implementation.
+    # @attr_reader [CredentialProvider::Provider] credential_provider 
+    #   Returns the object that is responsible for loading credentials.
     #
     # @attr_reader [String] ssl_ca_file The path to a CA cert bundle in 
     #   PEM format.
@@ -206,7 +206,14 @@ module AWS
       def initialize options = {}
   
         @created = options.delete(:__created__) || {}
-  
+
+        # :signer is now a deprecated option, this ensures it will still
+        # work, but its now prefered to set :credential_provider instead.
+        # Credentail providers don't have to provide a #sign method.
+        if signer = options.delete(:signer)
+          options[:credential_provider] = signer
+        end
+
         options.each_pair do |opt_name, value|
           opt_name = opt_name.to_sym
           if self.class.accepted_options.include?(opt_name)
@@ -219,9 +226,11 @@ module AWS
       # @return [Hash] Returns a hash with your configured credentials.
       def credentials
         credentials = {}
-        credentials[:access_key_id] = access_key_id
-        credentials[:secret_access_key] = secret_access_key
-        credentials[:session_token] = session_token if session_token
+        [:access_key_id, :secret_access_key, :session_token].each do |opt|
+          if value = credential_provider.send(opt)
+            credentials[opt] = value
+          end
+        end
         credentials
       end
   
@@ -371,7 +380,7 @@ module AWS
           end
 
           needs = [
-            :signer, 
+            :credential_provider, 
             :http_handler, 
             :"#{ruby_name}_endpoint",
             :"#{ruby_name}_port",
@@ -397,10 +406,10 @@ module AWS
   
       end
 
-      add_option :access_key_id, 
+      add_option :access_key_id,
         ENV['AWS_ACCESS_KEY_ID'] || ENV['AMAZON_ACCESS_KEY_ID']
   
-      add_option :secret_access_key, 
+      add_option :secret_access_key,
         ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
   
       add_option :session_token
@@ -417,13 +426,13 @@ module AWS
   
       add_option :proxy_uri do |config,uri| uri ? URI.parse(uri.to_s) : nil end
   
-      add_option_with_needs :signer, 
+      add_option_with_needs :credential_provider, 
         [:access_key_id, :secret_access_key, :session_token] do |config|
-  
-        DefaultSigner.new(
-          config.access_key_id, 
-          config.secret_access_key, 
-          config.session_token)
+
+        CredentialProviders::DefaultProvider.new(
+          :access_key_id => config.access_key_id,
+          :secret_access_key => config.secret_access_key,
+          :session_token => config.session_token)
   
       end