aws-sdk 1.8.1.2 → 1.8.1.3

data/lib/aws/api_config/CloudFront-2012-05-05.yml

@@ -13,9 +13,8 @@
 
 ---
 :api_version: '2012-05-05'
-:namespace: http://cloudfront.amazonaws.com/doc/2012-07-01/
 :operations:
-- :name: CreateCloudFrontOriginAccessIdentity2012_05_05
+- :name: CreateCloudFrontOriginAccessIdentity
   :method: :create_cloud_front_origin_access_identity
   :http:
     :verb: POST
@@ -51,7 +50,7 @@
             :type: :string
           Comment:
             :type: :string
-- :name: CreateDistribution2012_05_05
+- :name: CreateDistribution
   :method: :create_distribution
   :http:
     :verb: POST
@@ -423,7 +422,7 @@
                 :type: :string
           Enabled:
             :type: :boolean
-- :name: CreateInvalidation2012_05_05
+- :name: CreateInvalidation
   :method: :create_invalidation
   :http:
     :verb: POST
@@ -483,7 +482,7 @@
                     :type: :string
           CallerReference:
             :type: :string
-- :name: CreateStreamingDistribution2012_05_05
+- :name: CreateStreamingDistribution
   :method: :create_streaming_distribution
   :http:
     :verb: POST
@@ -657,7 +656,7 @@
                     :type: :string
           Enabled:
             :type: :boolean
-- :name: DeleteCloudFrontOriginAccessIdentity2012_05_05
+- :name: DeleteCloudFrontOriginAccessIdentity
   :method: :delete_cloud_front_origin_access_identity
   :http:
     :verb: DELETE
@@ -672,7 +671,7 @@
     :if_match:
       :type: :string
   :outputs: {}
-- :name: DeleteDistribution2012_05_05
+- :name: DeleteDistribution
   :method: :delete_distribution
   :http:
     :verb: DELETE
@@ -687,7 +686,7 @@
     :if_match:
       :type: :string
   :outputs: {}
-- :name: DeleteStreamingDistribution2012_05_05
+- :name: DeleteStreamingDistribution
   :method: :delete_streaming_distribution
   :http:
     :verb: DELETE
@@ -702,7 +701,7 @@
     :if_match:
       :type: :string
   :outputs: {}
-- :name: GetCloudFrontOriginAccessIdentity2012_05_05
+- :name: GetCloudFrontOriginAccessIdentity
   :method: :get_cloud_front_origin_access_identity
   :http:
     :verb: GET
@@ -725,7 +724,7 @@
             :type: :string
           Comment:
             :type: :string
-- :name: GetCloudFrontOriginAccessIdentityConfig2012_05_05
+- :name: GetCloudFrontOriginAccessIdentityConfig
   :method: :get_cloud_front_origin_access_identity_config
   :http:
     :verb: GET
@@ -742,7 +741,7 @@
         :type: :string
       Comment:
         :type: :string
-- :name: GetDistribution2012_05_05
+- :name: GetDistribution
   :method: :get_distribution
   :http:
     :verb: GET
@@ -908,7 +907,7 @@
                 :type: :string
           Enabled:
             :type: :boolean
-- :name: GetDistributionConfig2012_05_05
+- :name: GetDistributionConfig
   :method: :get_distribution_config
   :http:
     :verb: GET
@@ -1036,7 +1035,7 @@
             :type: :string
       Enabled:
         :type: :boolean
-- :name: GetInvalidation2012_05_05
+- :name: GetInvalidation
   :method: :get_invalidation
   :http:
     :verb: GET
@@ -1071,7 +1070,7 @@
                     :type: :string
           CallerReference:
             :type: :string
-- :name: GetStreamingDistribution2012_05_05
+- :name: GetStreamingDistribution
   :method: :get_streaming_distribution
   :http:
     :verb: GET
@@ -1164,7 +1163,7 @@
                     :type: :string
           Enabled:
             :type: :boolean
-- :name: GetStreamingDistributionConfig2012_05_05
+- :name: GetStreamingDistributionConfig
   :method: :get_streaming_distribution_config
   :http:
     :verb: GET
@@ -1221,7 +1220,7 @@
                 :type: :string
       Enabled:
         :type: :boolean
-- :name: ListCloudFrontOriginAccessIdentities2012_05_05
+- :name: ListCloudFrontOriginAccessIdentities
   :method: :list_cloud_front_origin_access_identities
   :http:
     :verb: GET
@@ -1256,7 +1255,7 @@
                 :type: :string
               Comment:
                 :type: :string
-- :name: ListDistributions2012_05_05
+- :name: ListDistributions
   :method: :list_distributions
   :http:
     :verb: GET
@@ -1396,7 +1395,7 @@
                 :type: :string
               Enabled:
                 :type: :boolean
-- :name: ListInvalidations2012_05_05
+- :name: ListInvalidations
   :method: :list_invalidations
   :http:
     :verb: GET
@@ -1432,7 +1431,7 @@
                 :type: :string
               Status:
                 :type: :string
-- :name: ListStreamingDistributions2012_05_05
+- :name: ListStreamingDistributions
   :method: :list_streaming_distributions
   :http:
     :verb: GET
@@ -1503,7 +1502,7 @@
                 :type: :string
               Enabled:
                 :type: :boolean
-- :name: UpdateCloudFrontOriginAccessIdentity2012_05_05
+- :name: UpdateCloudFrontOriginAccessIdentity
   :method: :update_cloud_front_origin_access_identity
   :http:
     :verb: PUT
@@ -1544,7 +1543,7 @@
             :type: :string
           Comment:
             :type: :string
-- :name: UpdateDistribution2012_05_05
+- :name: UpdateDistribution
   :method: :update_distribution
   :http:
     :verb: PUT
@@ -1921,7 +1920,7 @@
                 :type: :string
           Enabled:
             :type: :boolean
-- :name: UpdateStreamingDistribution2012_05_05
+- :name: UpdateStreamingDistribution
   :method: :update_streaming_distribution
   :http:
     :verb: PUT
@@ -2100,3 +2099,4 @@
                     :type: :string
           Enabled:
             :type: :boolean
+:namespace: http://cloudfront.amazonaws.com/doc/2012-07-01/

data/lib/aws/api_config/EMR-2009-03-31.yml

@@ -323,6 +323,8 @@
       - :string
     VisibleToAllUsers:
     - :boolean
+    JobFlowRole:
+    - :string
   :outputs:
     :children:
       RunJobFlowResult:

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

@@ -14,6 +14,32 @@
 ---
 :api_version: '2011-06-15'
 :operations:
+- :name: AssumeRole
+  :method: :assume_role
+  :inputs:
+    RoleArn:
+    - :string
+    - :required
+    RoleSessionName:
+    - :string
+    - :required
+    Policy:
+    - :string
+    DurationSeconds:
+    - :integer
+    ExternalId:
+    - :string
+  :outputs:
+    :children:
+      AssumeRoleResult:
+        :ignore: true
+        :children:
+          Credentials:
+            :children:
+              Expiration:
+                :type: :time
+          PackedPolicySize:
+            :type: :integer
 - :name: GetFederationToken
   :method: :get_federation_token
   :inputs:

data/lib/aws/cloud_formation/stack.rb

@@ -25,7 +25,7 @@ module AWS
     #
     # @attr_reader [String] stack_id Unique stack identifier.
     #
-    # @attr_reader [Symbol] status The status of the stack.
+    # @attr_reader [String] status The status of the stack.
     #
     # @attr_reader [String] status_reason Success/Failure message 
     #   associated with the +status+.

data/lib/aws/cloud_front/client.rb

@@ -21,7 +21,7 @@ module AWS
       # client methods #
 
       # @!method create_cloud_front_origin_access_identity(options = {})
-      # Calls the POST CreateCloudFrontOriginAccessIdentity2012_05_05 API operation.
+      # Calls the POST CreateCloudFrontOriginAccessIdentity API operation.
       # @param [Hash] options
       # * +:cloud_front_origin_access_identity_config+ - *required* - (Hash)
       #   The origin access identity's configuration information.
@@ -51,7 +51,7 @@ module AWS
       #     * +:comment+ - (String)
 
       # @!method create_distribution(options = {})
-      # Calls the POST CreateDistribution2012_05_05 API operation.
+      # Calls the POST CreateDistribution API operation.
       # @param [Hash] options
       # * +:distribution_config+ - *required* - (Hash) The distribution's
       #   configuration information.
@@ -325,7 +325,7 @@ module AWS
       #     * +:enabled+ - (Boolean)
 
       # @!method create_invalidation(options = {})
-      # Calls the POST CreateInvalidation2012_05_05 API operation.
+      # Calls the POST CreateInvalidation API operation.
       # @param [Hash] options
       # * +:distribution_id+ - *required* - (String) The distribution's id.
       # * +:invalidation_batch+ - *required* - (Hash) The batch information for
@@ -366,7 +366,7 @@ module AWS
       #     * +:caller_reference+ - (String)
 
       # @!method create_streaming_distribution(options = {})
-      # Calls the POST CreateStreamingDistribution2012_05_05 API operation.
+      # Calls the POST CreateStreamingDistribution API operation.
       # @param [Hash] options
       # * +:streaming_distribution_config+ - *required* - (Hash) The streaming
       #   distribution's configuration information.
@@ -476,7 +476,7 @@ module AWS
       #     * +:enabled+ - (Boolean)
 
       # @!method delete_cloud_front_origin_access_identity(options = {})
-      # Calls the DELETE DeleteCloudFrontOriginAccessIdentity2012_05_05 API operation.
+      # Calls the DELETE DeleteCloudFrontOriginAccessIdentity API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The origin access identity's id.
       # * +:if_match+ - (String) The value of the ETag header you received from
@@ -484,7 +484,7 @@ module AWS
       # @return [Core::Response]
 
       # @!method delete_distribution(options = {})
-      # Calls the DELETE DeleteDistribution2012_05_05 API operation.
+      # Calls the DELETE DeleteDistribution API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The distribution id.
       # * +:if_match+ - (String) The value of the ETag header you received when
@@ -492,7 +492,7 @@ module AWS
       # @return [Core::Response]
 
       # @!method delete_streaming_distribution(options = {})
-      # Calls the DELETE DeleteStreamingDistribution2012_05_05 API operation.
+      # Calls the DELETE DeleteStreamingDistribution API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The distribution id.
       # * +:if_match+ - (String) The value of the ETag header you received when
@@ -500,7 +500,7 @@ module AWS
       # @return [Core::Response]
 
       # @!method get_cloud_front_origin_access_identity(options = {})
-      # Calls the GET GetCloudFrontOriginAccessIdentity2012_05_05 API operation.
+      # Calls the GET GetCloudFrontOriginAccessIdentity API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The identity's id.
       # @return [Core::Response]
@@ -513,7 +513,7 @@ module AWS
       #     * +:comment+ - (String)
 
       # @!method get_cloud_front_origin_access_identity_config(options = {})
-      # Calls the GET GetCloudFrontOriginAccessIdentityConfig2012_05_05 API operation.
+      # Calls the GET GetCloudFrontOriginAccessIdentityConfig API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The identity's id.
       # @return [Core::Response]
@@ -523,7 +523,7 @@ module AWS
       #   * +:comment+ - (String)
 
       # @!method get_distribution(options = {})
-      # Calls the GET GetDistribution2012_05_05 API operation.
+      # Calls the GET GetDistribution API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The distribution's id.
       # @return [Core::Response]
@@ -590,7 +590,7 @@ module AWS
       #     * +:enabled+ - (Boolean)
 
       # @!method get_distribution_config(options = {})
-      # Calls the GET GetDistributionConfig2012_05_05 API operation.
+      # Calls the GET GetDistributionConfig API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The distribution's id.
       # @return [Core::Response]
@@ -643,7 +643,7 @@ module AWS
       #   * +:enabled+ - (Boolean)
 
       # @!method get_invalidation(options = {})
-      # Calls the GET GetInvalidation2012_05_05 API operation.
+      # Calls the GET GetInvalidation API operation.
       # @param [Hash] options
       # * +:distribution_id+ - *required* - (String) The distribution's id.
       # * +:id+ - *required* - (String) The invalidation's id.
@@ -660,7 +660,7 @@ module AWS
       #     * +:caller_reference+ - (String)
 
       # @!method get_streaming_distribution(options = {})
-      # Calls the GET GetStreamingDistribution2012_05_05 API operation.
+      # Calls the GET GetStreamingDistribution API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The streaming distribution's id.
       # @return [Core::Response]
@@ -698,7 +698,7 @@ module AWS
       #     * +:enabled+ - (Boolean)
 
       # @!method get_streaming_distribution_config(options = {})
-      # Calls the GET GetStreamingDistributionConfig2012_05_05 API operation.
+      # Calls the GET GetStreamingDistributionConfig API operation.
       # @param [Hash] options
       # * +:id+ - *required* - (String) The streaming distribution's id.
       # @return [Core::Response]
@@ -723,7 +723,7 @@ module AWS
       #   * +:enabled+ - (Boolean)
 
       # @!method list_cloud_front_origin_access_identities(options = {})
-      # Calls the GET ListCloudFrontOriginAccessIdentities2012_05_05 API operation.
+      # Calls the GET ListCloudFrontOriginAccessIdentities API operation.
       # @param [Hash] options
       # * +:marker+ - (String) Use this when paginating results to indicate
       #   where to begin in your list of origin access identities. The results
@@ -747,7 +747,7 @@ module AWS
       #     * +:comment+ - (String)
 
       # @!method list_distributions(options = {})
-      # Calls the GET ListDistributions2012_05_05 API operation.
+      # Calls the GET ListDistributions API operation.
       # @param [Hash] options
       # * +:marker+ - (String) Use this when paginating results to indicate
       #   where to begin in your list of distributions. The results include
@@ -811,7 +811,7 @@ module AWS
       #     * +:enabled+ - (Boolean)
 
       # @!method list_invalidations(options = {})
-      # Calls the GET ListInvalidations2012_05_05 API operation.
+      # Calls the GET ListInvalidations API operation.
       # @param [Hash] options
       # * +:distribution_id+ - *required* - (String) The distribution's id.
       # * +:marker+ - (String) Use this parameter when paginating results to
@@ -837,7 +837,7 @@ module AWS
       #     * +:status+ - (String)
 
       # @!method list_streaming_distributions(options = {})
-      # Calls the GET ListStreamingDistributions2012_05_05 API operation.
+      # Calls the GET ListStreamingDistributions API operation.
       # @param [Hash] options
       # * +:marker+ - (String) Use this when paginating results to indicate
       #   where to begin in your list of streaming distributions. The results
@@ -874,7 +874,7 @@ module AWS
       #     * +:enabled+ - (Boolean)
 
       # @!method update_cloud_front_origin_access_identity(options = {})
-      # Calls the PUT UpdateCloudFrontOriginAccessIdentity2012_05_05 API operation.
+      # Calls the PUT UpdateCloudFrontOriginAccessIdentity API operation.
       # @param [Hash] options
       # * +:cloud_front_origin_access_identity_config+ - *required* - (Hash)
       #   The identity's configuration information.
@@ -907,7 +907,7 @@ module AWS
       #     * +:comment+ - (String)
 
       # @!method update_distribution(options = {})
-      # Calls the PUT UpdateDistribution2012_05_05 API operation.
+      # Calls the PUT UpdateDistribution API operation.
       # @param [Hash] options
       # * +:distribution_config+ - *required* - (Hash) The distribution's
       #   configuration information.
@@ -1185,7 +1185,7 @@ module AWS
       #     * +:enabled+ - (Boolean)
 
       # @!method update_streaming_distribution(options = {})
-      # Calls the PUT UpdateStreamingDistribution2012_05_05 API operation.
+      # Calls the PUT UpdateStreamingDistribution API operation.
       # @param [Hash] options
       # * +:streaming_distribution_config+ - *required* - (Hash) The streaming
       #   distribution's configuration information.

data/lib/aws/cloud_front/request.rb

@@ -35,7 +35,7 @@ module AWS
       end
 
       def string_to_sign
-        headers['date'] ||= Time.now.rfc822
+        headers['date'] ||= Time.now.httpdate
       end
 
     end

data/lib/aws/core/http/curb_handler.rb

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 
 require 'thread'
+require 'stringio'
 
 module AWS
   module Core
@@ -28,11 +29,12 @@ module AWS
           start_processor
         end
 
-        def handle request, response
+        def handle request, response, &read_block
+
           raise "unsupport http reqest method: #{request.http_method}" unless
             ['GET', 'HEAD', 'PUT', 'POST', 'DELETE'].include? request.http_method
           @sem.synchronize do
-            @q << [request, response, Thread.current]
+            @q << [request, response, read_block, Thread.current]
             begin
              @processor.wakeup
             rescue ThreadError
@@ -85,7 +87,7 @@ module AWS
         end
 
         private
-        def make_easy_handle request, response, thread = nil
+        def make_easy_handle request, response, read_block, thread = nil
 
           protocol = request.use_ssl? ? 'https' : 'http'
           url = "#{protocol}://#{request.host}:#{request.port}#{request.uri}"
@@ -121,9 +123,26 @@ module AWS
             curl.delete = true
           end
 
+          buffer = StringIO.new
+
+          if read_block
+            curl.on_body do |chunk|
+              read_block.call(chunk)
+              chunk.size
+            end
+          else
+            curl.on_body do |chunk|
+              buffer << chunk
+              chunk.size
+            end
+          end
+
           curl.on_complete do
-            response.body = curl.body_str
             response.status = curl.response_code
+            unless read_block
+              buffer.rewind
+              response.body = buffer.read
+            end
             thread.run if thread
           end
 

data/lib/aws/core/signature/version_3.rb

@@ -25,7 +25,7 @@ module AWS
 
         def add_authorization! credentials
 
-          headers["x-amz-date"] ||= (headers["date"] ||= Time.now.rfc822)
+          headers["x-amz-date"] ||= (headers["date"] ||= Time.now.httpdate)
           headers["host"] ||= host
 
           headers["x-amz-security-token"] = credentials.session_token if 

data/lib/aws/core/signature/version_3_https.rb

@@ -44,7 +44,7 @@ module AWS
         end
 
         def string_to_sign
-          headers['date'] ||= Time.now.rfc822
+          headers['date'] ||= Time.now.httpdate
         end
 
       end

data/lib/aws/ec2/security_group.rb

@@ -66,6 +66,17 @@ module AWS
         resp[:security_group_index][id]
       end
 
+      # @return [InstanceCollection] Returns an instance collection that will
+      #   only enumerate instances in this security group.
+      def instances
+        instances = InstanceCollection.new(:config => config)
+        if vpc?
+          instances.filter('instance.group-id', [group_id])
+        else
+          instances.filter('group-id', [group_id])
+        end
+      end
+
       # @return [Boolean] True if the security group exists.
       def exists?
         client.describe_security_groups(:filters => [

data/lib/aws/elastic_beanstalk/request.rb

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

data/lib/aws/emr/client.rb

@@ -154,6 +154,7 @@ module AWS
       #           * +:args+ - (Array<String>)
       #     * +:supported_products+ - (Array<String>)
       #     * +:visible_to_all_users+ - (Boolean)
+      #     * +:job_flow_role+ - (String)
 
       # @!method modify_instance_groups(options = {})
       # Calls the ModifyInstanceGroups API operation.
@@ -176,13 +177,12 @@ module AWS
       #     additional features.
       #   * +:ami_version+ - (String) The version of the Amazon Machine Image
       #     (AMI) to use when launching Amazon EC2 instances in the job flow.
-      #     The following values are valid: "latest" (latest AMI version;
-      #     currently AMI 2.0, Hadoop 0.20.205) "2.0" (AMI 2.0, Hadoop
-      #     0.20.205) "1.0" (AMI 1.0, Hadoop 0.18) If this value is not
-      #     specified, the job flow uses the default of (AMI 1.0, Hadoop 0.18).
-      #     If the AMI supports multiple versions of Hadoop (for example, AMI
-      #     1.0 supports both Hadoop 0.18 and 0.20) you can use the
-      #     JobFlowInstancesConfig HadoopVersion parameter to modify the
+      #     The following values are valid: "latest" (uses the latest AMI) The
+      #     version number of the AMI to use, for example, "2.0" If this value
+      #     is not specified, the job flow uses the default of (AMI 1.0, Hadoop
+      #     0.18). If the AMI supports multiple versions of Hadoop (for
+      #     example, AMI 1.0 supports both Hadoop 0.18 and 0.20) you can use
+      #     the JobFlowInstancesConfig HadoopVersion parameter to modify the
       #     version of Hadoop from the defaults shown above. For details about
       #     the AMI versions currently supported by Amazon ElasticMapReduce, go
       #     to AMI Versions Supported in Elastic MapReduce in the Amazon
@@ -278,6 +278,10 @@ module AWS
       #     can view and (if they have the proper policy permissions set)
       #     manage the job flow. If it is set to +false+ , only the IAM user
       #     that created the job flow can view and manage it.
+      #   * +:job_flow_role+ - (String) An IAM role for the job flow. The EC2
+      #     instances of the job flow assume this role. The default role is
+      #     EMRJobflowDefault. In order to use the default role, you must have
+      #     already created it using the CLI.
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:

data/lib/aws/s3/client.rb

@@ -156,7 +156,16 @@ module AWS
       # @overload put_bucket_website(options = {})
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
-      #   @option options [required,Hash] :index_document
+      #   @option options [Hash] :redirect_all_requests_to
+      #     Describes the redirect behavior for every request to this
+      #     bucket's website endpoint. If this element is present, no
+      #     other options are are allowed.
+      #     * +:host_name+ - (*required*, String) 
+      #       Name of the host where requests will be redirected.
+      #     * +:protocol+ - (String)
+      #       Protocol to use (http, https) when redirecting requests. The
+      #       default is the protocol that is used in the original request.
+      #   @option options [Hash] :index_document
       #     * +:suffix+ - (*required*, String) - A suffix that is appended to
       #       a request that is for a directory on the website endpoint
       #       (e.g. if the suffix is index.html and you make a request to
@@ -167,6 +176,16 @@ module AWS
       #   @option options [Hash] :error_document
       #     * +:key+ - (*required*, String) - The object key name to use
       #       when a 4XX class error occurs.
+      #   @option options [Array<Hash>] :routing_rules
+      #     * +:redirect+ - (*required*, Hash)
+      #       * +:host_name+ - (String)
+      #       * +:protocol+ - (String)
+      #       * +:replace_key_prefix_with+ - (String)
+      #       * +:replace_key_with+ - (String)
+      #       * +:http_redirect_code+ - (String)
+      #     * +:condition+ - (Hash)
+      #       * +:key_prefix_equals+ - (String)
+      #       * +:http_error_code_returned_equals+ - (String)
       #   @return [Core::Response]
       bucket_method(:put_bucket_website, :put, 'website') do
 
@@ -174,14 +193,52 @@ module AWS
           validate_bucket_name!(options[:bucket_name])
           req.body = Nokogiri::XML::Builder.new do |xml|
             xml.WebsiteConfiguration(:xmlns => XMLNS) do
-              xml.IndexDocument do
-                xml.Suffix(options[:index_document][:suffix])
+
+              if redirect = options[:redirect_all_requests_to]
+                xml.RedirectAllRequestsTo do
+                  xml.HostName(redirect[:host_name])
+                  xml.Protocol(redirect[:protocol]) if redirect[:protocol]
+                end
+              end
+
+              if indx = options[:index_document]
+                xml.IndexDocument do
+                  xml.Suffix(indx[:suffix])
+                end
               end
-              if options[:error_document]
+
+              if err = options[:error_document]
                 xml.ErrorDocument do
-                  xml.Key(options[:error_document][:key])
+                  xml.Key(err[:key])
                 end
               end
+
+              if rules = options[:routing_rules]
+                xml.RoutingRules do
+                  rules.each do |rule|
+                    xml.RoutingRule do
+
+                      redirect = rule[:redirect]
+                      xml.Redirect do
+                        xml.Protocol(redirect[:protocol]) if redirect[:protocol]
+                        xml.HostName(redirect[:host_name]) if redirect[:host_name]
+                        xml.ReplaceKeyPrefixWith(redirect[:replace_key_prefix_with]) if redirect[:replace_key_prefix_with]
+                        xml.ReplaceKeyWith(redirect[:replace_key_with]) if redirect[:replace_key_with]
+                        xml.HttpRedirectCode(redirect[:http_redirect_code]) if redirect[:http_redirect_code]
+                      end
+
+                      if condition = rule[:condition]
+                        xml.Condition do
+                          xml.KeyPrefixEquals(condition[:key_prefix_equals]) if condition[:key_prefix_equals]
+                          xml.HttpErrorCodeReturnedEquals(condition[:http_error_code_returned_equals]) if condition[:http_error_code_returned_equals]
+                        end
+                      end
+
+                    end
+                  end
+                end
+              end
+
             end
           end.doc.root.to_xml
           super(req, options)

data/lib/aws/s3/client/xml.rb

@@ -220,6 +220,9 @@ module AWS
           element "ErrorDocument" do
             element "Key"
           end
+          element "RoutingRules" do
+            list("RoutingRule")
+          end
         end
 
       end

data/lib/aws/s3/request.rb

@@ -106,7 +106,7 @@ module AWS
         if headers.detect{|k,v| k.to_s =~ /^x-amz-date$/i }
           ''
         else
-          headers['date'] ||= Time.now.rfc822
+          headers['date'] ||= Time.now.httpdate
         end
       end
 

data/lib/aws/s3/s3_object.rb

@@ -560,6 +560,9 @@ module AWS
       #     See
       #     http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
       #
+      #   @option options [String] :content_md5
+      #     The base64 encoded content md5 of the data.
+      #
       #   @option options :content_type A standard MIME type
       #     describing the format of the object data.
       #
@@ -1049,7 +1052,8 @@ module AWS
         if should_decrypt?(options)
           get_encrypted_object(options, &read_block)
         else
-          get_object(options, &read_block)
+          resp_data = get_object(options, &read_block)
+          block_given? ? resp_data : resp_data[:data]
         end
 
       end
@@ -1262,19 +1266,20 @@ module AWS
 
       # A small wrapper around client#get_object
       def get_object options, &read_block
-        client.get_object(options, &read_block).data[:data]
+        client.get_object(options, &read_block).data
       end
 
       # A wrapper around get_object that decrypts
       def get_encrypted_object options, &read_block
         decryption_cipher(options) do |cipher|
           if block_given?
-            get_object(options) do |chunk|
+            resp = get_object(options) do |chunk|
               yield(cipher.update(chunk))
             end
             yield(cipher.final)
+            resp
           else
-            cipher.update(get_object(options)) + cipher.final
+            cipher.update(get_object(options)[:data]) + cipher.final
           end
         end
       end
@@ -1510,7 +1515,7 @@ module AWS
             config.s3_encryption_materials_location
 
           cipher =
-          decryption_materials(location) do |envelope_key, envelope_iv|
+          decryption_materials(location, options) do |envelope_key, envelope_iv|
             envelope_key, envelope_iv =
               decode_envelope_key(envelope_key, envelope_iv, encryption_key)
             get_aes_cipher(:decrypt, :CBC, envelope_key, envelope_iv)
@@ -1539,10 +1544,10 @@ module AWS
 
       # @yield [String, String, String] Yields encryption materials for
       #   decryption
-      def decryption_materials location, &block
+      def decryption_materials location, options = {}, &block
 
         materials = case location
-          when :metadata then get_metadata_materials
+          when :metadata then get_metadata_materials(options)
           when :instruction_file then get_inst_file_materials
           else
             msg = "invalid :encryption_materials_location option, expected "
@@ -1562,8 +1567,10 @@ module AWS
 
       # @return [String, String, String] Returns the data key, envelope_iv, and the
       #   material description for decryption from the metadata.
-      def get_metadata_materials
-        metadata.to_h.values_at(*%w(x-amz-key x-amz-iv))
+      def get_metadata_materials(options)
+        opts = {}
+        opts[:version_id] = options[:version_id] if options[:version_id]
+        metadata(opts).to_h.values_at(*%w(x-amz-key x-amz-iv))
       end
 
       # @return [String, String, String] Returns the data key, envelope_iv, and the

data/lib/aws/s3/website_configuration.rb

@@ -18,41 +18,54 @@ module AWS
   class S3
     class WebsiteConfiguration
 
-      # @private
+      # @option (see S3::Client#put_bucket_website)
       def initialize options = {}
-        @index_document_suffix = index_suffix(options)
-        @error_document_key = error_key(options)
+        @options = deep_copy(options)
+        if @options.empty?
+          @options[:index_document] = { :suffix => 'index.html' }
+          @options[:error_document] = { :key => 'error.html' }
+        end
       end
 
-      # @return [String]
-      attr_accessor :index_document_suffix
+      # @return [Hash]
+      attr_reader :options
 
-      # @return [String]
-      attr_accessor :error_document_key
+      alias_method :to_hash, :options
 
-      # @return [Hash]
-      def to_hash
-        {
-          :index_document => { :suffix => index_document_suffix },
-          :error_document => { :key => error_document_key },
-        }
+      # This method exists for backwards compatability.
+      # @return [String,nil]
+      # @private
+      def index_document_suffix
+        (@options[:index_document] || {})[:suffix]
       end
 
-      # @return [Boolean] Returns +true+ if the other configuration is
-      #   the same.
-      def eql? other
-        other.is_a?(WebsiteConfiguration) and other.to_hash == self.to_hash
+      # This method exists for backwards compatability.
+      # @private
+      def index_document_suffix= suffix
+        @options.delete(:redirect_all_requests_to)
+        @options[:index_document] ||= {}
+        @options[:index_document][:suffix] = suffix
       end
-      alias_method :==, :eql?
 
-      private
+      # This method exists for backwards compatability.
+      # @return [String,nil]
+      # @private
+      def error_document_key
+        (@options[:error_document] || {})[:key]
+      end
 
-      def index_suffix options
-        (options[:index_document] || {})[:suffix] || 'index.html'
+      # This method exists for backwards compatability.
+      # @private
+      def error_document_key= key
+        @options.delete(:redirect_all_requests_to)
+        @options[:error_document] ||= {}
+        @options[:error_document][:key] = key
       end
 
-      def error_key options
-        (options[:error_document] || {})[:key] || 'error.html'
+      private
+
+      def deep_copy hash
+        Marshal.load(Marshal.dump(hash))
       end
 
     end

data/lib/aws/simple_db/domain_collection.rb

@@ -46,7 +46,7 @@ module AWS
       # @note Creating a domain in SimpleDB is an idempotent operation; 
       #   running it multiple times using the same domain name will not 
       #   result in an error.
-      # @note You can create up to 100 domains per account.
+      # @note You can create up to 250 domains per account.
       # @param [String] domain_name 
       # @return [Domain] Returns a new domain with the given name.
       def create(domain_name)

data/lib/aws/sqs/request.rb

@@ -17,7 +17,11 @@ module AWS
     # @private
     class Request < Core::Http::Request
 
-      include Core::Signature::Version2
+      include Core::Signature::Version4
+
+      def service
+        'sqs'
+      end
 
       def path
         full_url.path

data/lib/aws/sts.rb

@@ -50,6 +50,11 @@ module AWS
 
     include Core::ServiceInterface
 
+    # (see Client#assume_role)
+    def assume_role options = {}
+      client.assume_role(options).data
+    end
+
     # Returns a set of temporary credentials for an AWS account or IAM
     # User. The credentials consist of an Access Key ID, a Secret
     # Access Key, and a security token. These credentials are valid

data/lib/aws/sts/client.rb

@@ -33,24 +33,68 @@ module AWS
 
       # client methods #
 
+      # @!method assume_role(options = {})
+      # Calls the AssumeRole API operation.
+      # @param [Hash] options
+      #   * +:role_arn+ - *required* - (String) The Amazon Resource Name (ARN)
+      #     of the role that the caller is assuming.
+      #   * +:role_session_name+ - *required* - (String) An identifier for the
+      #     assumed role session. The session name is included as part of the
+      #     AssumedRoleUser.
+      #   * +:policy+ - (String) A supplemental policy that can be associated
+      #     with the temporary security credentials. The caller can restrict
+      #     the permissions that are available on the role's temporary security
+      #     credentials to maintain the least amount of privileges. When a
+      #     service call is made with the temporary security credentials, both
+      #     the role's permission policy and supplemental policy are checked.
+      #     For more information about how permissions work in the context of
+      #     temporary credentials, see Controlling Permissions in Temporary
+      #     Credentials.
+      #   * +:duration_seconds+ - (Integer) The duration, in seconds, of the
+      #     role session. The value can range from 900 seconds (15 minutes) to
+      #     3600 seconds (1 hour). By default, the value is set to 3600 seconds
+      #     (1 hour).
+      #   * +:external_id+ - (String) A unique identifier that is generated by
+      #     a third party for each of their customers. For each role that the
+      #     third party can assume, they should instruct their customers to
+      #     create a role with the external ID that was generated by the third
+      #     party. Each time the third party assumes the role, they must pass
+      #     the customer's correct external ID. The external ID is useful in
+      #     order to help third parties bind a role to the customer who created
+      #     it. For more information about the external ID, see About the
+      #     External ID in Using Temporary Security Credentials.
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:credentials+ - (Hash)
+      #     * +:access_key_id+ - (String)
+      #     * +:secret_access_key+ - (String)
+      #     * +:session_token+ - (String)
+      #     * +:expiration+ - (Time)
+      #   * +:assumed_role_user+ - (Hash)
+      #     * +:assumed_role_id+ - (String)
+      #     * +:arn+ - (String)
+      #   * +:packed_policy_size+ - (Integer)
+
       # @!method get_federation_token(options = {})
       # Calls the GetFederationToken API operation.
       # @param [Hash] options
       #   * +:name+ - *required* - (String) The name of the federated user
       #     associated with the credentials. For information about limitations
-      #     on user names, go to Limitations on IAM Entities in Using AWS
-      #     Identity and Access Management.
+      #     on user names, go to Limitations on IAM Entities in Using IAM.
       #   * +: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.
+      #     Controlling Permissions in Temporary Credentials in Using IAM.
       #   * +:duration_seconds+ - (Integer) The duration, in seconds, that the
       #     session should last. Acceptable durations for federation sessions
-      #     range from 3600s (one hour) to 129600s (36 hours), with 43200s (12
-      #     hours) as the default.
+      #     range from 900s (15 minutes) 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). If the duration is
+      #     longer than one hour, the session for AWS account owners defaults
+      #     to one hour.
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:
@@ -69,25 +113,32 @@ module AWS
       # @param [Hash] options
       #   * +:duration_seconds+ - (Integer) The duration, in seconds, that the
       #     credentials should remain valid. Acceptable durations for IAM user
-      #     sessions range from 3600s (one hour) to 129600s (36 hours), with
+      #     sessions range from 900s (15 minutes) 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.
+      #     are restricted to a maximum of 3600s (one hour). If the duration is
+      #     longer than one hour, the session for AWS account owners defaults
+      #     to one hour.
+      #   * +:serial_number+ - (String) The identification number of the MFA
+      #     device for the user. If the IAM user has a policy requiring MFA
+      #     authentication (or is in a group requiring MFA authentication) to
+      #     access resources, provide the device value here.The value is in the
+      #     Security Credentials tab of the user's details pane in the IAM
+      #     console. If the IAM user has an active MFA device, the details pane
+      #     displays a Multi-Factor Authentication Device value. The value is
+      #     either for a virtual device, such as
+      #     arn:aws:iam::123456789012:mfa/user, or it is the device serial
+      #     number for a hardware device (usually the number from the back of
+      #     the device), such as GAHT12345678. For more information, see Using
+      #     Multi-Factor Authentication (MFA) Devices with AWS in Using IAM.
       #   * +: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.
+      #     the user has an access policy requiring an MFA code (or is in a
+      #     group requiring an MFA code), provide the value here to get
+      #     permission to resources as specified in the access policy. If MFA
+      #     authentication is required, and the user does not provide a code
+      #     when requesting a set of temporary security credentials, the user
+      #     will receive an "access denied" response when requesting resources
+      #     that require MFA authentication. For more information, see Using
+      #     Multi-Factor Authentication (MFA) Devices with AWS in Using IAM.
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:

data/lib/aws/version.rb

@@ -14,5 +14,5 @@
 
 module AWS
   # Current version of the AWS SDK for Ruby
-  VERSION = '1.8.1.2'
+  VERSION = '1.8.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.8.1.2
+  version: 1.8.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools