aws-sdk 1.5.6 → 1.5.7

data/lib/aws/core/credential_providers.rb

@@ -390,6 +390,42 @@ module AWS
     
       end
 
+      # Returns a set of fake credentials, should only be used for testing.
+      class FakeProvider < StaticProvider
+
+        # @param [Hash] options
+        # @option options [Boolean] :with_session_token (false) When +true+ a 
+        #   fake session token will also be provided.
+        def initialize options = {}
+          options[:access_key_id] ||= fake_access_key_id
+          options[:secret_access_key] ||= fake_secret_access_key
+          if options.delete(:with_session_token)
+            options[:session_token] ||= fake_session_token
+          end
+          super
+        end
+
+        protected
+
+        def fake_access_key_id
+          "AKIA" + random_chars(16).upcase
+        end
+
+        def fake_secret_access_key
+          random_chars(40)
+        end
+
+        def fake_session_token
+          random_chars(260)
+        end
+
+        def random_chars count
+          chars = ('0'..'9').to_a + ('a'..'z').to_a + ('A'..'Z').to_a
+          (1..count).map{ chars[rand(chars.size)] }.join
+        end
+
+      end
+
     end
   end
 end

data/lib/aws/core/option_grammar.rb

@@ -157,6 +157,25 @@ module AWS
           def required?; true; end
         end
   
+        # @private
+        module Float
+  
+          extend NoArgs
+  
+          def validate(value, context = nil)
+            raise format_error("float value", context) unless
+              value.kind_of?(Numeric) or
+              value.respond_to? :to_f
+          end
+  
+          def encode_value(value)
+            value.to_f.to_s
+          end
+  
+        end
+
+        Double = Float
+ 
         # @private
         module Rename
           def self.apply(option, new_name)

data/lib/aws/core/page_result.rb

@@ -13,7 +13,6 @@
 
 module AWS
   module Core
-
     class PageResult < Array
 
       # @return [Collection] Returns the collection that was used to
@@ -51,6 +50,9 @@ module AWS
         super(items)
       end
 
+      # @return [PageResult]
+      # @raise [RuntimeError] Raises a runtime error when called against
+      #   a collection that has no more results (i.e. #last_page? == true).
       def next_page
         if last_page?
           raise 'unable to get the next page, already at the last page'
@@ -58,12 +60,12 @@ module AWS
         collection.page(:per_page => per_page, :next_token => next_token)
       end
 
-      # @return [Boolean] Returns true if this is the last page of results.
+      # @return [Boolean] Returns +true+ if this is the last page of results.
       def last_page?
         next_token.nil?
       end
 
-      # @return [Boolean] Returns true if there are more pages of results.
+      # @return [Boolean] Returns +true+ if there are more pages of results.
       def more?
         !!next_token
       end

data/lib/aws/dynamo_db/client.rb

@@ -30,22 +30,6 @@ module AWS
       # @private
       CACHEABLE_REQUESTS = Set[:list_tables, :describe_table]
 
-      # @private
-      def initialize *args
-
-        super
-
-        # Replaces the current credential provider with a SessionProvider
-        # that provides refreshable STS session credentials.  DynamoDB
-        # requires session credentials.
-        if credential_provider.session_token.nil?
-          long_term_credentials = credential_provider.credentials
-          @credential_provider = Core::CredentialProviders::SessionProvider.for(
-            long_term_credentials)
-        end
-
-      end
-
       ## client methods ##
 
       # Calls the BatchGetItem API operation.

data/lib/aws/dynamo_db/item_collection.rb

@@ -88,7 +88,7 @@ module AWS
     # 
     class ItemCollection
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
       include Types
       include Expectations
 

data/lib/aws/dynamo_db/request.rb

@@ -17,7 +17,11 @@ module AWS
     # @private
     class Request < Core::Http::Request
 
-      include Core::Signature::Version3
+      include Core::Signature::Version4
+
+      def service
+        'dynamodb'
+      end
 
       # @return [String,nil]
       attr_accessor :body

data/lib/aws/dynamo_db/table_collection.rb

@@ -37,7 +37,7 @@ module AWS
     #
     class TableCollection
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
 
       # Creates a new table.
       #

data/lib/aws/iam/collection.rb

@@ -14,7 +14,7 @@ module AWS
   class IAM
     module Collection
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
 
       # Common methods for collection classes that can be filtered by
       # a path prefix.

data/lib/aws/s3/client.rb

@@ -1169,7 +1169,7 @@ module AWS
       end
 
       # @param [String] possible_xml
-      # @reutrn [Boolean] Returns +true+ if the given string is a valid xml 
+      # @return [Boolean] Returns +true+ if the given string is a valid xml 
       #   document.
       def is_xml? possible_xml
         begin

data/lib/aws/s3/paginated_collection.rb

@@ -17,7 +17,7 @@ module AWS
     # @private
     module PaginatedCollection
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
 
       protected
       def _each_item markers, limit, options = {}, &block

data/lib/aws/simple_db/domain_collection.rb

@@ -34,10 +34,11 @@ module AWS
     #     puts domain.name
     #   end
     #
+    # @see Core::Collection
+    #
     class DomainCollection
 
-      include Core::Model
-      include Enumerable
+      include Core::Collection::WithLimitAndNextToken
 
       # Creates a domain in SimpleDB and returns a domain object.
       #
@@ -50,7 +51,7 @@ module AWS
       # @return [Domain] Returns a new domain with the given name.
       def create(domain_name)
         client.create_domain(:domain_name => domain_name)
-        domain_named(domain_name)
+        self[domain_name]
       end
 
       # Returns a domain object with the given name.
@@ -61,51 +62,23 @@ module AWS
       # @param [String] domain_name The name of the domain to return.
       # @return [Domain] Returns the domain with the given name.
       def [] domain_name
-        domain_named(domain_name)
+        Domain.new(domain_name.to_s, :config => config)
       end
 
-      # @note Normally your account has a limit of 100 SimpleDB domains.  You can {request more here}[http://aws.amazon.com/contact-us/simpledb-limit-request/]
-      # @yield [domain] Yields once for every domain in your account. 
-      # @yieldparam [Domain] domain
-      # @param [Hash] options
-      # @option options [Integer] :limit (nil) The maximum number of 
-      #   domains to yield.
-      # @option options [Integer] :batch_size (100) The number of domains to
-      #   fetch each request to SimpleDB.  Maximum is 100.
-      # @return [nil]
-      def each options = {}, &block
-
-        total_limit = options[:limit]
-        batch_size = options[:batch_size] || 100
-        received = 0
-        next_token = nil
-
-        begin
+      protected
 
-          limit = total_limit ? 
-            [total_limit - received, batch_size].min : 
-            batch_size
+      def _each_item next_token, limit, options = {}
 
-          list_options = { :max_number_of_domains => limit }
-          list_options[:next_token] = next_token if next_token
-          list = client.list_domains(list_options)
+        options[:next_token] = next_token if next_token
+        options[:max_number_of_domains] = limit if limit
 
-          next_token = list[:next_token]
-          received += list[:domain_names].size
+        resp = client.list_domains(options)
+        resp.data[:domain_names].each do |name|
+          yield(self[name])
+        end
 
-          list[:domain_names].each do |name|
-            yield(domain_named(name))
-          end
-        
-        end while next_token and (total_limit.nil? or received < total_limit)
-        nil
-      end
+        resp.data[:next_token]
 
-      # @return [Domain] Returns a domain with the given name.
-      # @private
-      protected
-      def domain_named name
-        Domain.new(name.to_s, :config => config)
       end
 
     end

data/lib/aws/simple_db/item_collection.rb

@@ -30,7 +30,7 @@ module AWS
 
       include ConsistentReadOption
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
 
       # @return [Domain] The domain the items belong to.
       attr_reader :domain
@@ -447,7 +447,7 @@ module AWS
         return @limit if args.empty?
         collection_with(:limit => Integer(args.first))
       end
-      alias_method :_limit, :limit # for Collection::Limitable
+      alias_method :_limit, :limit # for Collection::WithLimitAndNextToken
 
       # Applies standard scope options (e.g. :where => 'foo') and removes them from
       # the options hash by calling their method (e.g. by calling #where('foo')).

data/lib/aws/simple_email_service/identity_collection.rb

@@ -15,7 +15,7 @@ module AWS
   class SimpleEmailService
     class IdentityCollection
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
 
       # @private
       def initialize options = {}

data/lib/aws/simple_workflow/domain_collection.rb

@@ -50,7 +50,7 @@ module AWS
     class DomainCollection
 
       include OptionFormatters
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
 
       def initialize options = {}
         

data/lib/aws/simple_workflow/history_event_collection.rb

@@ -22,7 +22,7 @@ module AWS
     #
     class HistoryEventCollection
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
 
       # @param [WorkflowExecution] workflow_execution The execution this 
       #   history event belongs to.

data/lib/aws/simple_workflow/type_collection.rb

@@ -19,7 +19,7 @@ module AWS
     class TypeCollection
 
       include OptionFormatters
-      include Core::Collection::Limitable 
+      include Core::Collection::WithLimitAndNextToken 
 
       # @param [Domain] domain The domain the (workflow or activity types 
       #   belong to.

data/lib/aws/simple_workflow/workflow_execution_collection.rb

@@ -40,7 +40,7 @@ module AWS
         :closed_after,
       ]
 
-      include Core::Collection::Limitable
+      include Core::Collection::WithLimitAndNextToken
       include OptionFormatters
 
       # @private

data/lib/aws/sns/topic.rb

@@ -126,7 +126,7 @@ module AWS
       # @param [Hash] options Additional options for confirming the
       #   subscription.
       #
-      # @option :options [Boolean] :authenticate_on_unsubscribe
+      # @option options [Boolean] :authenticate_on_unsubscribe
       #   Indicates that you want to disable unauthenticated
       #   unsubsciption of the subscription.
       #

data/lib/aws/sts.rb

@@ -67,6 +67,14 @@ module AWS
     #   account owners are restricted to a maximum of 3600s (one
     #   hour).
     #
+    # @option opts [String] :serial_nubmer The identification number of the
+    #   Multi-Factor Authentication (MFA) device for the user.
+    #
+    # @option opts [String] :token_code The value provided by the MFA device.
+    #   If the user has an access policy requiring an MFA code, provide the
+    #   value here to get permission to resources as specified in the access
+    #   policy.
+    #
     # @return [Session]
     def new_session(opts = {})
       get_session(:get_session_token, opts) do |resp, session_opts|
@@ -129,8 +137,8 @@ module AWS
       end
     end
 
-    # @private
     protected
+
     def get_session(method, opts = {})
       opts[:duration_seconds] = opts.delete(:duration) if
         opts[:duration]

data/lib/aws/sts/client.rb

@@ -43,18 +43,19 @@ module AWS
       # === Options:
       #
       # * +:name+ - *required* - (String) The name of the federated user
-      #   associated with the session.
-      # * +:policy+ - (String) A policy specifying the permissions associated
-      #   with the session. The caller can delegate their own permissions by
-      #   specifying a policy for the session, and both policies will be
-      #   checked when a service call is made. In other words, permissions of
-      #   the session credentials are the intersection of the policy specified
-      #   in the API and the policies associated with the user who issued the
-      #   session.
+      #   associated with the credentials. For information about limitations on
+      #   user names, go to Limitations on IAM Entities in Using AWS Identity
+      #   and Access Management.
+      # * +:policy+ - (String) A policy specifying the permissions to associate
+      #   with the credentials. The caller can delegate their own permissions
+      #   by specifying a policy, and both policies will be checked when a
+      #   service call is made. For more information about how permissions work
+      #   in the context of temporary credentials, see Controlling Permissions
+      #   in Temporary Credentials in Using AWS Identity and Access Management.
       # * +:duration_seconds+ - (Integer) The duration, in seconds, that the
       #   session should last. Acceptable durations for federation sessions
-      #   range from 3600s (1 hour) to 129600s (36 hours), with 43200 as the
-      #   default.
+      #   range from 3600s (one hour) to 129600s (36 hours), with 43200s (12
+      #   hours) as the default.
       #
       # === Response Structure:
       #
@@ -78,10 +79,26 @@ module AWS
       # === Options:
       #
       # * +:duration_seconds+ - (Integer) The duration, in seconds, that the
-      #   session should last. Acceptable durations for IAM user sessions range
-      #   from 3600s (1 hour) to 129600s (36 hours), with 43200 as the default.
-      #   Sessions started for AWS Account owners are restricted to a maximum
-      #   3600s.
+      #   credentials should remain valid. Acceptable durations for IAM user
+      #   sessions range from 3600s (one hour) to 129600s (36 hours), with
+      #   43200s (12 hours) as the default. Sessions for AWS account owners are
+      #   restricted to a maximum of 3600s (one hour).
+      # * +:serial_number+ - (String) The identification number of the
+      #   Multi-Factor Authentication (MFA) device for the user. If the user
+      #   has an access policy requiring MFA to access resources, provide the
+      #   value here. The number is in the Security Credentials tab of the
+      #   user's details pane in the IAM console. If the user has an active MFA
+      #   device, the details pane displays a Multi-Factor Authentication
+      #   Device value such as arn:aws:iam::123456789012:mfa/user for a virtual
+      #   device or the device serial number for a hardware device.
+      # * +:token_code+ - (String) The value provided by the MFA device. If the
+      #   user has an access policy requiring an MFA code, provide the value
+      #   here to get permission to resources as specified in the access
+      #   policy. If MFA is required, and a code not provided while requesting
+      #   a set of temporary security credentials, the user will receive an
+      #   "access denied" response when requesting resources that require MFA.
+      #   For more information, see Using Multi-Factor Authentication (MFA)
+      #   Devices with AWS in Using IAM.
       #
       # === Response Structure:
       #

data/lib/net/http/connection_pool.rb

@@ -48,8 +48,12 @@ class Net::HTTP::ConnectionPool
     @pool_mutex = Mutex.new
     @open_timeout = options[:http_open_timeout] || 15
     @idle_timeout = options[:http_idle_timeout] || 60
-    @log_wire_trace = !!options[:http_wire_trace]
-    @logger = options[:logger] || Logger.new($stdout)
+    @http_wire_trace = !!options[:http_wire_trace]
+    if logger = options[:logger]
+      @logger = logger
+    elsif http_wire_trace?
+      @logger = Logger.new($stdout)
+    end
   end
 
   # @return [Integer] 
@@ -60,9 +64,11 @@ class Net::HTTP::ConnectionPool
 
   # @return [Boolean] Returns +true+ when HTTP debug output (wire traces)
   #   will be logged.
-  attr_reader :log_wire_trace
+  attr_reader :http_wire_trace
 
-  alias_method :log_wire_trace?, :log_wire_trace
+  alias_method :http_wire_trace?, :http_wire_trace
+  alias_method :log_wire_trace?, :http_wire_trace
+  alias_method :log_wire_trace, :http_wire_trace
 
   # @return [Logger] Where debug output is sent.
   attr_reader :logger
@@ -208,7 +214,7 @@ class Net::HTTP::ConnectionPool
     end
 
     if session.nil?
-      logger = log_wire_trace? ? self.logger : nil 
+      logger = http_wire_trace? ? self.logger : nil 
       session = Session.for(connection, open_timeout, logger)
     end