aws-sdk 1.6.9 → 1.7.0

data/lib/aws/cloud_search/config.rb

@@ -0,0 +1,18 @@
+# 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.
+
+AWS::Core::Configuration.module_eval do
+
+  add_service 'CloudSearch', 'cloud_search', 'cloudsearch.us-east-1.amazonaws.com'
+
+end

data/lib/aws/cloud_search/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 CloudSearch
+    module Errors
+
+      extend Core::LazyErrorClasses
+
+    end
+  end
+end

data/lib/aws/cloud_search/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 CloudSearch
+
+    # @private
+    class Request < Core::Http::Request
+      include Core::Signature::Version2
+    end
+
+  end
+end

data/lib/aws/cloud_watch/alarm.rb

@@ -23,7 +23,7 @@ module AWS
     # @attr_reader [Boolean] enabled Indicates whether actions 
     #   should be executed during any changes to the alarm's state.
     #
-    # @attr_reader [Array<String>] actions The list of actions to execute 
+    # @attr_reader [Array<String>] alarm_actions The list of actions to execute 
     #   when this alarm transitions into an ALARM state from any other 
     #   state.
     #

data/lib/aws/cloud_watch/metric.rb

@@ -106,7 +106,7 @@ module AWS
         options[:period] ||= 60
 
         resp = client.get_metric_statistics(options)
-        
+
         MetricStatistics.new(self, resp[:label], resp[:datapoints])
 
       end
@@ -120,8 +120,8 @@ module AWS
 
       def resource_identifiers
         [
-          [:namespace, namespace], 
-          [:metric_item, metric_name], 
+          [:namespace, namespace],
+          [:metric_name, metric_name],
           [:dimensions, dimensions],
         ]
       end

data/lib/aws/core.rb

@@ -23,12 +23,16 @@ require 'aws/core/autoloader'
 #
 # * {AWS::AutoScaling}
 # * {AWS::CloudFormation}
+# * {AWS::CloudSearch}
 # * {AWS::CloudWatch}
 # * {AWS::DynamoDB}
 # * {AWS::EC2}
+# * {AWS::ElastiCache}
+# * {AWS::ElasticBeanstalk}
 # * {AWS::ELB}
 # * {AWS::EMR}
 # * {AWS::IAM}
+# * {AWS::RDS}
 # * {AWS::Route53}
 # * {AWS::S3}
 # * {AWS::SNS}
@@ -221,6 +225,9 @@ module AWS
     # @option options [String] :cloud_formation_endpoint ('cloudformation.us-east-1.amazonaws.com')
     #   The service endpoint for AWS CloudFormation.
     #
+    # @option options [String] :cloud_search ('cloudsearch.us-east-1.amazonaws.com')
+    #   The service endpoint for Amazon CloudSearch.
+    #
     # @option options [String] :cloud_watch_endpoint ('monitoring.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon CloudWatch.
     #
@@ -228,7 +235,7 @@ module AWS
     #   {DynamoDB} will convert number values returned by {DynamoDB::Client}
     #   from strings to BigDecimal objects.  If you set this to +false+,
     #   they will be convereted from strings into floats (with a potential
-    #              # backwards to test xml ordering   loss of precision).
+    #   loss of precision).
     #
     # @option options [String] :dynamo_db_endpoint ('dynamodb.amazonaws.com')
     #   The service endpoint for Amazon DynamoDB.
@@ -240,6 +247,11 @@ module AWS
     # @option options [String] :ec2_endpoint ('ec2.amazonaws.com') The
     #   service endpoint for Amazon EC2.
     #
+    # @option options [String] :elasticache_endpoint ('elasticache.us-east-1.amazonaws.com')
+    #
+    # @option options [String] :elastic_beanstalk_endpoint ('elasticbeanstalk.us-east-1.amazonaws.com') 
+    #   The service endpoint for AWS Elastic Beanstalk.
+    #
     # @option options [String] :elb_endpoint ('elasticloadbalancing.us-east-1.amazonaws.com')
     #   The service endpoint for Elastic Load Balancing.
     #
@@ -310,12 +322,15 @@ module AWS
     #
     #       AWS.config(:proxy_uri => 'https://user:password@my.proxy:443/path?query')
     #
-    # @option options [String] :s3_endpoint ('s3.amazonaws.com') The
-    #   service endpoint for Amazon S3.
+    # @option options [String] :rds_endpoint ('rds.us-east-1.amazonaws.com')
+    #   The service endpoint for Amazon Relational Database Service (RDS).
     #
     # @option options [String] :route_53_endpoint ('route53.amazonaws.com')
     #   The service endpoint for Amazon Route 53.
     #
+    # @option options [String] :s3_endpoint ('s3.amazonaws.com') The
+    #   service endpoint for Amazon S3.
+    #
     # @option options [Boolean] :s3_force_path_style (false) When
     #   +true+, requests will always use path style.  This can be useful
     #   for testing environments.

data/lib/aws/core/configuration.rb

@@ -69,6 +69,9 @@ module AWS
     # @attr_reader [String] cloud_formation_endpoint ('cloudformation.us-east-1.amazonaws.com')
     #   The service endpoint for AWS CloudFormation.
     #
+    # @attr_reader [String] cloud_search ('cloudsearch.us-east-1.amazonaws.com')
+    #   The service endpoint for Amazon CloudSearch.
+    #
     # @attr_reader [String] cloud_watch_endpoint ('monitoring.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon CloudWatch.
     #
@@ -88,6 +91,11 @@ module AWS
     # @attr_reader [String] ec2_endpoint ('ec2.amazonaws.com')
     #   The service endpoint for Amazon EC2.
     #
+    # @attr_reader [String] elasticache_endpoint ('elasticache.us-east-1.amazonaws.com')
+    #
+    # @attr_reader [String] elastic_beanstalk_endpoint ('elasticbeanstalk.us-east-1.amazonaws.com') 
+    #   The service endpoint for AWS Elastic Beanstalk.
+    #
     # @attr_reader [String] elb_endpoint ('elasticloadbalancing.us-east-1.amazonaws.com')
     #   The service endpoint for Elastic Load Balancing.
     #
@@ -130,6 +138,9 @@ module AWS
     # @attr_reader [URI,nil] route_53_endpoint ('route53.amazonaws.com')
     #   The service endpoint for Amazon Route 53.
     #
+    # @attr_reader [URI,nil] rds_endpoint ('rds.us-east-1.amazonaws.com')
+    #   The service endpoint for Amazon Relational Database Service (RDS).
+    #
     # @attr_reader [String] s3_endpoint ('s3.amazonaws.com')
     #   The service endpoint for Amazon S3.
     #

data/lib/aws/core/inflection.rb

@@ -35,6 +35,7 @@ module AWS
         inflector['s3Key'] = 's3_key'
         inflector['Ec2KeyName'] = 'ec2_key_name'
         inflector['Ec2SubnetId'] = 'ec2_subnet_id'
+        inflector['ElastiCache'] = 'elasticache'
         inflector['NotificationARNs'] = 'notification_arns'
 
         inflector[aws_name]

data/lib/aws/core/service_interface.rb

@@ -48,7 +48,7 @@ module AWS
         options = options.dup
         @config = (options.delete(:config) || AWS.config)
         @config = @config.with(options)
-        @client = @config.send(Inflection.ruby_name(self.class.to_s) + '_client')
+        @client = @config.send(Inflection.ruby_name(self.class.name.split('::').last) + '_client')
       end
 
       # @return [String]

data/lib/aws/dynamo_db/batch_get.rb

@@ -13,7 +13,7 @@
 
 module AWS
   class DynamoDB
-    
+
     # A utility class for configuring a list of tables, attributes and
     # items to request information for.
     #
@@ -31,7 +31,7 @@ module AWS
         @request_items = {}
       end
 
-      # Add a list of items to fetch in this batch.  
+      # Add a list of items to fetch in this batch.
       #
       # @param [Table,String] table The name of the table to fetch attributes
       #   from.
@@ -61,9 +61,15 @@ module AWS
       #
       #     batch_get.table('mytable', :all, [%w(hk1 rk1), %w(hk1 rk2), ...])
       #
+      # @param [Hash] options
+      #
+      # @option options [Boolean] :consistent_read (false) When +true+, items
+      #   are read from this table with consistent reads.  When +false+, reads
+      #   are eventually consistent.
+      #
       # @return [nil]
       #
-      def table table, attributes, items
+      def table table, attributes, items, options = {}
 
         table = table.is_a?(Table) ? table.name : table.to_s
 
@@ -72,7 +78,7 @@ module AWS
         keys = items.collect do |item|
           case item
           when Item then item_key_hash(item)
-          when Array 
+          when Array
             {
               :hash_key_element => format_attribute_value(item[0]),
               :range_key_element => format_attribute_value(item[1]),
@@ -85,8 +91,8 @@ module AWS
         ## ensure we don't receive 2 different lists of attributes for
         ## the same table
 
-        if 
-          @request_items.has_key?(table) and 
+        if
+          @request_items.has_key?(table) and
           @request_items[table][:attributes_to_get] != attributes
         then
           msg = "When batch getting attributes, you may only provide " +
@@ -97,9 +103,10 @@ module AWS
 
         ## merge attributes and items with the request items
 
-        @request_items[table] ||= { :keys => [] } 
+        @request_items[table] ||= { :keys => [] }
         @request_items[table][:attributes_to_get] = attributes if attributes
         @request_items[table][:keys] += keys
+        @request_items[table].merge!(options)
 
         nil
 
@@ -123,7 +130,7 @@ module AWS
       #     batch_get.table('mytable', ['name', 'size'], items)
       #
       # @param [Item] items One or more {Item} objects to fetch attributes
-      #   for.  These items may come from any number of different tables.  
+      #   for.  These items may come from any number of different tables.
       #
       def items attributes, *items
         [items].flatten.each do |item|
@@ -156,7 +163,7 @@ module AWS
       end
 
       # Yields only attribute hashes.  This removes the outer hash that
-      # normally provides the :table_name and :attributes keys. This is 
+      # normally provides the :table_name and :attributes keys. This is
       # useful when your batch get requested items from a single table.
       def each_attributes
         each do |table_name, attributes|
@@ -166,16 +173,16 @@ module AWS
 
       protected
       def convert_unprocessed_keys response
-        
+
         return nil if response.data['UnprocessedKeys'].empty?
-        
+
         # convert the json response keys into symbolized keys
         str2sym = lambda do |key_desc|
           type, value = key_desc.to_a.flatten
           case type
           when "S" then { :s => value }
           when "N" then { :n => value }
-          else 
+          else
             raise "unhandled key type: #{type}"
           end
         end

data/lib/aws/dynamo_db/client.rb

@@ -11,6 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+require 'zlib'
+
 module AWS
   class DynamoDB
 
@@ -66,6 +68,7 @@ module AWS
       #         * +:ns+ - (Array<String>) A set of numbers.
       #         * +:bs+ - (Array<String>) A set of binary attributes.
       #     * +:attributes_to_get+ - (Array<String>)
+      #     * +:consistent_read+ - (Boolean)
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:
@@ -95,6 +98,7 @@ module AWS
       #         * +NS+ - (Array<String>)
       #         * +BS+ - (Array<Blob>)
       #     * +AttributesToGet+ - (Array<String>)
+      #     * +ConsistentRead+ - (Boolean)
 
       # @!method batch_write_item(options = {})
       # Calls the BatchWriteItem API operation.
@@ -839,14 +843,19 @@ module AWS
       def extract_error_details response
         if response.http_response.status == 413
           ['RequestEntityTooLarge', 'Request entity too large']
+        elsif crc32_is_valid?(response) == false
+          ['CRC32CheckFailed', 'CRC32 integrity check failed']
         else
           super
         end
       end
 
       def retryable_error? response
-        if response.error.is_a?(Errors::ProvisionedThroughputExceededException)
+        case response.error
+        when Errors::ProvisionedThroughputExceededException
           config.dynamo_db_retry_throughput_errors?
+        when Errors::CRC32CheckFailed
+          true
         else
           super
         end
@@ -873,6 +882,23 @@ module AWS
 
       end
 
+      private
+
+      # @return [Boolean] whether the CRC32 response header matches the body.
+      # @return [nil] if no CRC32 header is present or we are not verifying CRC32
+      def crc32_is_valid? response
+        return nil unless config.dynamo_db_crc32
+        if crcs = response.http_response.headers['x-amz-crc32']
+          crcs[0].to_i == calculate_crc32(response)
+        else
+          nil
+        end
+      end
+
+      def calculate_crc32 response
+        Zlib.crc32(response.http_response.body)
+      end
+
     end
   end
 end

data/lib/aws/dynamo_db/config.rb

@@ -19,4 +19,6 @@ AWS::Core::Configuration.module_eval do
 
   add_option :dynamo_db_big_decimals, true, :boolean => true
 
+  add_option :dynamo_db_crc32, true, :boolean => true
+
 end

data/lib/aws/dynamo_db/item_collection.rb

@@ -75,10 +75,10 @@ module AWS
     #   end
     #
     # If you want item data objects with all attributes just call select
-    # without any arguments:
+    # without a list of attributes (#select still accepts options).
     #
     #   # request a maximum of 10 items from Amazon DynamoDB
-    #   table.items.select.limit(10).each do |item_data|
+    #   table.items.select(:limit => 10).each do |item_data|
     #     item_data.attributes #=> { 'id' => 'abc', 'category' => 'foo', ... }
     #   end
     #

data/lib/aws/dynamo_db/table.rb

@@ -390,14 +390,20 @@ module AWS
       #   * an array of hash and range key value pairs (nested arrays)
       #   * an array of {Item} objects
       #
+      # @param [Hash] options
+      #
+      # @option options [Boolean] :consistent_read (false) When +true+, items
+      #   are read from this table with consistent reads.  When +false+, reads
+      #   are eventually consistent.
+      #
       # @yield [Hash] Yields a hash of attributes for each item.
       #
       # @return [Enumerable] Returns an enumerable object that yields
       #   hashes of attributes.
       #
-      def batch_get attributes, items, &block
+      def batch_get attributes, items, options = {}, &block
         batch = BatchGet.new(:config => config)
-        batch.table(name, attributes, items)
+        batch.table(name, attributes, items, options)
         enum = batch.to_enum(:each_attributes)
         block_given? ? enum.each(&block) : enum
       end

data/lib/aws/ec2/reserved_instances.rb

@@ -26,6 +26,9 @@ module AWS
         :product_description,
         :instance_tenancy,
         :currency_code,
+        :recurring_charges,
+        :offering_type,
+        :state,
       ]
 
       include TaggedItem

data/lib/aws/ec2/reserved_instances_offering.rb

@@ -24,6 +24,8 @@ module AWS
         :product_description,
         :instance_tenancy,
         :currency_code,
+        :recurring_charges,
+        :offering_type,
       ]
 
       include TaggedItem
@@ -48,7 +50,7 @@ module AWS
 
       def purchase options = {}
         options[:instance_count] = 1 unless options[:instance_count]
-        options[:reserved_instances_offering_id] = id 
+        options[:reserved_instances_offering_id] = id
         response = client.purchase_reserved_instances_offering(options)
         ReservedInstances.new(response.reserved_instances_id, :config => config)
       end