aws-sdk 1.6.9 → 1.7.0

data/lib/aws/rds/db_snapshot_collection.rb

@@ -0,0 +1,89 @@
+# Copyright 2011-2012 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.
+
+module AWS
+  class RDS
+    class DBSnapshotCollection
+
+      include Core::Collection::WithLimitAndNextToken
+
+      # @private
+      def initialize options = {}
+        @filters = options[:filters] || {}
+        super
+      end
+
+      # @param [String] db_snapshot_id
+      # @return [DBSnapshot] Returns a {DBSnapshot} with the given ID.
+      def [] db_snapshot_id
+        DBSnapshot.new(db_snapshot_id, :config => config)
+      end
+
+      # Filters the DB snapshots to those beloning to a single db instance.
+      # You may pass the ID of a db instance or a {DBInstance} object.
+      #
+      # @param [String,DBInstance] db_instance A db instance identifier
+      #   string or a {DBInstance} object.
+      #
+      # @return [DBSnapshotCollection]
+      #
+      def db_instance db_instance
+        id = db_instance.is_a?(Core::Model) ? db_instance.id : db_instance
+        filter(:db_instance_identifier, id.to_s.downcase)
+      end
+
+      # Filters the DB snapshots to those of a given snapshot type.
+      # @param [String] snapshot_type
+      # @return [DBSnapshotCollection]
+      def with_type snapshot_type
+        filter(:snapshot_type, snapshot_type)
+      end
+      alias_method :type, :with_type
+
+      # @param [String,Symbol] name
+      # @param [Mixed] value
+      # @return [DBSnapshotCollection]
+      def filter name, value
+        options = {}
+        options[:filters] = @filters.merge(name.to_s.to_sym => value)
+        options[:config] = config
+        DBSnapshotCollection.new(options)
+      end
+
+      protected
+
+      def _each_item marker, max_records, options = {}, &block
+
+        options = @filters.merge(options)
+        options[:marker] = marker if marker
+        options[:max_records] = [[20,max_records].max,100].min if max_records
+
+        response = client.describe_db_snapshots(options)
+        response.data[:db_snapshots].each do |details|
+
+          db_snapshot = DBSnapshot.new_from(
+              :describe_db_snapshots,
+              details,
+              details[:db_snapshot_identifier],
+              :config => config)
+
+          yield(db_snapshot)
+
+        end
+
+        response.data[:marker]
+      end
+
+    end
+  end
+end

data/lib/aws/rds/errors.rb

@@ -0,0 +1,22 @@
+# Copyright 2011-2012 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.
+
+module AWS
+  class RDS
+    module Errors
+
+      extend Core::LazyErrorClasses
+
+    end
+  end
+end

data/lib/aws/rds/request.rb

@@ -0,0 +1,23 @@
+# Copyright 2011-2012 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.
+
+module AWS
+  class RDS
+
+    # @private
+    class Request < Core::Http::Request
+      include Core::Signature::Version2
+    end
+
+  end
+end

data/lib/aws/s3/bucket_tag_collection.rb

@@ -20,7 +20,7 @@ module AWS
     #
     #   bucket.tags['key'] = 'value'
     #
-    # @exapmle Getting a tag.
+    # @example Getting a tag.
     #
     #   bucket.tags['key']
     #   #=> 'value'

data/lib/aws/s3/client.rb

@@ -953,8 +953,9 @@ module AWS
       #   @option options [required,String] :bucket_name
       #   @option options [required,String] :key
       #   @option options [String] :version_id
+      #   @option options [String] :mfa
       #   @return [Core::Response]
-      object_method(:delete_object, :delete) do
+      object_method(:delete_object, :delete, :header_options => { :mfa => "x-amz-mfa" }) do
 
         configure_request do |req, options|
           super(req, options)
@@ -1077,8 +1078,9 @@ module AWS
       #   @option options [required,String] :bucket_name
       #   @option options [required,Array<String>] :keys
       #   @option options [Boolean] :quiet (true)
+      #   @option options [String] :mfa
       #   @return [Core::Response]
-      bucket_method(:delete_objects, :post, 'delete', XML::DeleteObjects) do
+      bucket_method(:delete_objects, :post, 'delete', XML::DeleteObjects, :header_options => { :mfa => "x-amz-mfa" }) do
         configure_request do |req, options|
 
           super(req, options)

data/lib/aws/s3/errors.rb

@@ -28,7 +28,6 @@ module AWS
     #
     # All errors raised as a result of error responses from the
     # service are instances of either {ClientError} or {ServerError}.
-    # @private
     module Errors
 
       # @private

data/lib/aws/s3/object_collection.rb

@@ -23,7 +23,7 @@ module AWS
     #   # this will not make any requests against S3
     #   object = bucket.objects['foo.jpg']
     #   object.key #=> 'foo.jpg'
-    # 
+    #
     # == Finding objects with a Prefix
     #
     # Given a bucket with the following keys:
@@ -38,7 +38,7 @@ module AWS
     #
     #   bucket.objects.with_prefix('videos').collect(&:key)
     #   #=> ['videos/comedy.mpg', 'videos/dancing.mpg']
-    #   
+    #
     # == Exploring Objects with a Tree Interface
     #
     # Given a bucket with the following keys:
@@ -88,7 +88,7 @@ module AWS
       # Returns an S3Object given its name.  For example:
       #
       # @example
-      #   
+      #
       #   object = bucket.objects['file.txt']
       #   object.class #=> S3Object
       #
@@ -116,28 +116,47 @@ module AWS
       #
       #   bucket.objects.delete(to_delete)
       #
-      # @param [Mixed] objects One or more objects to delete.  Each object
-      #   can be one of the following:
+      # @overload delete(objects)
+      #   @param [Mixed] objects One or more objects to delete.  Each object
+      #     can be one of the following:
       #
-      #   * An object key (string)
-      #   * A hash with :key and :version_id (for versioned objects)
-      #   * An {S3Object} instance
-      #   * An {ObjectVersion} instance
+      #     * An object key (string)
+      #     * A hash with :key and :version_id (for versioned objects)
+      #     * An {S3Object} instance
+      #     * An {ObjectVersion} instance
       #
-      # @raise [BatchDeleteError] If any of the objects failed to delete, 
+      # @overload delete(objects, options)
+      #   Deletes multiple objects, with additional options. The array can
+      #   contain any of the types of objects the first method invocation style
+      #   accepts.
+      #   @param [Array] objects One or more objects to delete.
+      #   @param [Hash] options Optional headers to pass on.
+      #
+      # @raise [BatchDeleteError] If any of the objects failed to delete,
       #   a BatchDeleteError will be raised with a summary of the errors.
       #
       # @return [nil]
       #
       def delete *objects
 
+        # Detect and retrieve options from the end of the splat.
+        if
+          objects.size == 2 and
+          objects[0].is_a?(Array) and
+          objects[1].is_a?(Hash)
+        then
+          client_opts = objects.pop
+        else
+          client_opts = {}
+        end
+
         objects = objects.flatten.collect do |obj|
           case obj
           when String        then { :key => obj }
           when Hash          then obj
           when S3Object      then { :key => obj.key }
           when ObjectVersion then { :key => obj.key, :version_id => obj.version_id }
-          else  
+          else
             msg = "objects must be keys (strings or hashes with :key and " +
                   ":version_id), S3Objects or ObjectVersions, got " +
                   object.class.name
@@ -146,7 +165,6 @@ module AWS
         end
 
         batch_helper = BatchHelper.new(1000) do |batch|
-          client_opts = {}
           client_opts[:bucket_name] = bucket.name
           client_opts[:quiet] = true
           client_opts[:objects] = batch
@@ -167,14 +185,14 @@ module AWS
 
         batch_helper.complete!
 
-        raise Errors::BatchDeleteError.new(error_counts) unless 
+        raise Errors::BatchDeleteError.new(error_counts) unless
           error_counts.empty?
 
         nil
 
       end
 
-      # Deletes each object in the collection that returns a true value 
+      # Deletes each object in the collection that returns a true value
       # from block passed to this method.  Deletes are batched for efficiency.
       #
       #   # delete text files in the 2009 "folder"
@@ -182,14 +200,14 @@ module AWS
       #
       # @yieldparam [S3Object] object
       #
-      # @raise [BatchDeleteError] If any of the objects failed to delete, 
+      # @raise [BatchDeleteError] If any of the objects failed to delete,
       #   a BatchDeleteError will be raised with a summary of the errors.
       #
       def delete_if &block
 
         error_counts = {}
 
-        batch_helper = BatchHelper.new(1000) do |objects| 
+        batch_helper = BatchHelper.new(1000) do |objects|
           begin
             delete(objects)
           rescue Errors::BatchDeleteError => error
@@ -206,7 +224,7 @@ module AWS
 
         batch_helper.complete!
 
-        raise Errors::BatchDeleteError.new(error_counts) unless 
+        raise Errors::BatchDeleteError.new(error_counts) unless
           error_counts.empty?
 
         nil
@@ -223,7 +241,7 @@ module AWS
       #
       #   bucket.objects.with_prefix('2009/').delete_all
       #
-      # @raise [BatchDeleteError] If any of the objects failed to delete, 
+      # @raise [BatchDeleteError] If any of the objects failed to delete,
       #   a BatchDeleteError will be raised with a summary of the errors.
       #
       # @return [Array] Returns an array of results
@@ -243,7 +261,7 @@ module AWS
           end
         end
 
-        raise Errors::BatchDeleteError.new(error_counts) unless 
+        raise Errors::BatchDeleteError.new(error_counts) unless
           error_counts.empty?
 
         nil
@@ -255,10 +273,10 @@ module AWS
       # Use break or raise an exception to terminate the enumeration.
       #
       # @param [Hash] options
-      # @option options [Integer] :limit (nil) The maximum number of 
+      # @option options [Integer] :limit (nil) The maximum number of
       #   objects to yield.
       # @option options [Integer] :batch_size (1000) The number of objects to
-      #   fetch each request to S3.  Maximum is 1000 keys at time. 
+      #   fetch each request to S3.  Maximum is 1000 keys at time.
       # @return [nil]
       def each options = {}, &block
         super
@@ -299,7 +317,7 @@ module AWS
       # processes items in batches of 1k items
       # @private
       class BatchHelper
-        
+
         def initialize batch_size, &block
           @batch_size = batch_size
           @block = block

data/lib/aws/s3/object_version.rb

@@ -94,9 +94,14 @@ module AWS
       end
 
       # Deletes this object version from S3.
+      # @option options [String] :mfa The serial number and current token code of
+      #   the Multi-Factor Authentication (MFA) device for the user. Format
+      #   is "SERIAL TOKEN" - with a space between the serial and token.
       # @return (see S3Object#delete)
-      def delete
-        object.delete(:version_id => @version_id)
+      def delete(options = {})
+        object.delete(:version_id => @version_id,
+                      :mfa        => options[:mfa]
+                     )
       end
 
       # @return [Boolean] Returns this if this is the latest version of

data/lib/aws/s3/request.rb

@@ -152,7 +152,7 @@ module AWS
         x_amz = headers.select{|name, value| name.to_s =~ /^x-amz-/i }
         x_amz = x_amz.collect{|name, value| [name.downcase, value] }
         x_amz = x_amz.sort_by{|name, value| name }
-        x_amz = x_amz.collect{|name, value| "#{name}:#{value}" }.join("\n")
+        x_amz = x_amz.collect{|name, value| "#{name}:#{value.to_s.strip}" }.join("\n")
         x_amz == '' ? nil : x_amz
       end
 

data/lib/aws/s3/s3_object.rb

@@ -120,7 +120,7 @@ module AWS
     # Amazon S3 provides server side encryption for an additional cost.
     # You can specify to use server side encryption when writing an object.
     #
-    #   obj.write('data', :server_size_encryption => :aes256)
+    #   obj.write('data', :server_side_encryption => :aes256)
     #
     # You can also make this the default behavior.
     #
@@ -361,9 +361,12 @@ module AWS
       #   if you use client-side encryption and the encryption materials
       #   were stored in a separate object in S3 (key.instruction).
       #
+      # @option [String] :mfa The serial number and current token code of
+      #   the Multi-Factor Authentication (MFA) device for the user. Format
+      #   is "SERIAL TOKEN" - with a space between the serial and token.
+      #
       # @return [nil]
       def delete options = {}
-
         client.delete_object(options.merge(
           :bucket_name => bucket.name,
           :key => key))
@@ -1114,6 +1117,16 @@ module AWS
       # @option options [Boolean] :secure (true) Whether to generate a
       #   secure (HTTPS) URL or a plain HTTP url.
       #
+      # @option options [String] :endpoint Sets the hostname of the
+      #   endpoint (overrides config.s3_endpoint).
+      #
+      # @option options [Integer] :port Sets the port of the
+      #   endpoint (overrides config.s3_port).
+      #
+      # @option options [Boolean] :force_path_style (false) Indicates
+      #   whether the generated URL should place the bucket name in
+      #   the path (true) or as a subdomain (false).
+      #
       # @option options [String] :response_content_type Sets the
       #   Content-Type header of the response when performing an
       #   HTTP GET on the returned URL.
@@ -1139,6 +1152,9 @@ module AWS
       #   HTTP GET on the returned URL.
       # @return [URI::HTTP, URI::HTTPS]
       def url_for(method, options = {})
+
+        options[:secure] = config.use_ssl? unless options.key?(:secure)
+
         req = request_for_signing(options)
 
         method = http_method(method)
@@ -1152,7 +1168,8 @@ module AWS
                       config.credential_provider.session_token) if
           config.credential_provider.session_token
 
-        build_uri(options[:secure] != false, req)
+        secure = options.fetch(:secure, config.use_ssl?)
+        build_uri(req, options)
       end
 
       # Generates a public (not authenticated) URL for the object.
@@ -1165,8 +1182,8 @@ module AWS
       # @return [URI::HTTP, URI::HTTPS]
       #
       def public_url(options = {})
-        req = request_for_signing(options)
-        build_uri(options[:secure] != false, req)
+        options[:secure] = config.use_ssl? unless options.key?(:secure)
+        build_uri(request_for_signing(options), options)
       end
 
       # Generates fields for a presigned POST to this object.  This
@@ -1265,9 +1282,10 @@ module AWS
         estimate
       end
 
-      def build_uri(secure, request)
-        uri_class = secure ? URI::HTTPS : URI::HTTP
+      def build_uri(request, options)
+        uri_class = options[:secure] ? URI::HTTPS : URI::HTTP
         uri_class.build(:host => request.host,
+                        :port => request.port,
                         :path => request.path,
                         :query => request.querystring)
       end
@@ -1279,9 +1297,8 @@ module AWS
         parts << ""
         parts << ""
         parts << expires
-        if config.credential_provider.session_token
-          parts << "x-amz-security-token:"
-          parts << "#{config.credential_provider.session_token}"
+        if token = config.credential_provider.session_token
+          parts << "x-amz-security-token:#{token}"
         end
         parts << request.canonicalized_resource
 
@@ -1318,11 +1335,18 @@ module AWS
       end
 
       def request_for_signing(options)
+
+        port = [443, 80].include?(config.s3_port) ? 
+          (options[:secure] ? 443 : 80) :
+          config.s3_port
+
         req = Request.new
 
         req.bucket = bucket.name
         req.key = key
-        req.host = config.s3_endpoint
+        req.host = options.fetch(:endpoint, config.s3_endpoint)
+        req.port = options.fetch(:port, port)
+        req.force_path_style = options.fetch(:force_path_style, config.s3_force_path_style)
 
         REQUEST_PARAMETERS.each do |param|
           req.add_param(param.to_s.tr("_","-"),