aws-sdk 1.15.0 → 1.16.0

data/lib/aws/core.rb

@@ -466,7 +466,11 @@ module AWS
     #   that response bodies match the content-length specified in the
     #   response header, if present. Note that some HTTP handlers will
     #   always do this whether or not this value is true.
-    # 
+    #
+    # @option options [Boolean] :sqs_verify_checksums (true)
+    #   When `true` all SQS operations will check body content against
+    #   MD5 checksums, raising an exception if there is a mismatch.
+    #
     # @return [Core::Configuration] Returns the new configuration.
     #
     def config options = {}

data/lib/aws/core/configuration.rb

@@ -182,6 +182,10 @@ module AWS
     #   if all SimpleDB read requests should be done consistently.
     #   Consistent reads are slower, but reflect all changes to SDB.
     #
+    # @attr_reader [Boolean] sqs_verify_checksums (true)
+    #   When `true` all SQS operations will check body content against
+    #   MD5 checksums, raising an exception if there is a mismatch.
+    #
     # @attr_reader [CredentialProvider::Provider] credential_provider
     #   Returns the object that is responsible for loading credentials.
     #
@@ -317,6 +321,13 @@ module AWS
         "<#{self.class.name}>"
       end
 
+      # @api private
+      def endpoint_region(svc)
+        (supplied[svc.method_name] || {})[:region] or
+        supplied[:"#{svc.old_name}_region"] or
+        region
+      end
+
       protected
 
       def supplied
@@ -395,9 +406,9 @@ module AWS
             elsif endpoint = config.send(svc_opt)[:endpoint]
               endpoint
             elsif endpoint_pattern
-              endpoint_pattern % config.region
+              endpoint_pattern % config.endpoint_region(svc)
             else
-              endpoint_builder.call(config.region)
+              endpoint_builder.call(config.endpoint_region(svc))
             end
           end
 
@@ -426,7 +437,7 @@ module AWS
                 else
                   'us-gov-west-1' # e.g. iam.us-gov.amazonaws.com
                 end
-              elsif matches = endpoint.match(/^.+\.(.+)\.amazonaws.com$/)
+              elsif matches = endpoint.match(/^.+?[.-](.+)\.amazonaws.com$/)
                 matches[1]
               else
                 AWS.const_get(name).global_endpoint? ? 'us-east-1' : config.region
@@ -435,6 +446,7 @@ module AWS
           end
 
           needs = [
+            :"#{svc_opt}",
             :"#{ruby_name}_endpoint",
             :"#{ruby_name}_port",
             :"#{ruby_name}_region",
@@ -457,7 +469,8 @@ module AWS
           ]
 
           create_block = lambda do |config,client_options|
-            AWS.const_get(name)::Client.new(:config => config)
+            options = client_options[:"#{svc_opt}"]
+            AWS.const_get(name)::Client.new(options.merge(:config => config))
           end
 
           add_option_with_needs :"#{ruby_name}_client", needs, &create_block

data/lib/aws/core/xml/sax_handlers/nokogiri.rb

@@ -29,6 +29,7 @@ module AWS
           def start_document; end
           def end_document; end
           def error(*args); end
+          def comment(*args); end
 
           def start_element_namespace element_name, attributes = [], *ignore
 

data/lib/aws/dynamo_db.rb

@@ -125,6 +125,14 @@ module AWS
 
     endpoint_prefix 'dynamodb'
 
+
+    def initialize options = {}
+      options = options.dup
+      options[:dynamo_db] ||= {}
+      options[:dynamo_db][:api_version] = '2011-12-05'
+      super(options)
+    end
+
     # Returns a collection representing all the tables in your account.
     #
     # @return [TableCollection]

data/lib/aws/dynamo_db/table.rb

@@ -81,6 +81,10 @@ module AWS
     #
     # @attr [Time] throughput_last_decreased_at
     #
+    # @attr [Integer] size_bytes
+    #
+    # @attr [Integer] item_count
+    #
     # @attr [PrimaryKeyElement] hash_key Returns the hash key element
     #   for this table.
     #
@@ -113,6 +117,10 @@ module AWS
 
       attribute :write_capacity_units
 
+      attribute :item_count
+
+      attribute :size_bytes, :from => 'TableSizeBytes'
+
       attribute :hash_key, :from => "HashKeyElement", :static => true do
         translates_output {|v| PrimaryKeyElement.new(v) }
       end

data/lib/aws/s3/client.rb

@@ -550,6 +550,90 @@ module AWS
 
       end
 
+      # @overload put_bucket_logging(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [Boolean] :logging_enabled Set to true if turning on
+      #     bucket logging. If not set or false, all of the following options
+      #     will be ignored.
+      #   @option options [String] :target_bucket The name of the bucket in
+      #     which you want Amazon S3 to store server access logs. You can push
+      #     logs to any bucket you own, including the bucket being logged.
+      #   @option options [String] :target_prefix Allows you to specify a prefix
+      #     for the keys that the log files will be stored under. Recommended
+      #     if you will be writing logs from multiple buckets to the same target
+      #     bucket.
+      #   @option options [Array<Hash>] :grants An array of hashes specifying
+      #     permission grantees. For each hash, specify ONLY ONE of :id, :uri,
+      #     or :email_address.
+      #     * `:email_address` - (String) E-mail address of the person being
+      #       granted logging permissions.
+      #     * `:id` - (String) The canonical user ID of the grantee.
+      #     * `:uri` - (String) URI of the grantee group.
+      #     * `:permission` - (String) Logging permissions given to the Grantee
+      #          for the bucket. The bucket owner is automatically granted FULL_CONTROL
+      #          to all logs delivered to the bucket. This optional element enables
+      #          you grant access to others. Valid Values: FULL_CONTROL | READ | WRITE 
+      #   @return [Core::Response]
+      bucket_method(:put_bucket_logging, :put) do
+        configure_request do |req, options|
+
+          req.add_param('logging')
+
+          xml = Nokogiri::XML::Builder.new
+          xml.BucketLoggingStatus('xmlns' => XMLNS) do |xml|
+            if options[:logging_enabled] == true
+              xml.LoggingEnabled do
+                xml.TargetBucket(options[:target_bucket])
+                xml.TargetPrefix(options[:target_prefix])
+                unless options[:grants].nil?
+
+                  xml.TargetGrants do
+                    options[:grants].each do |grant|
+                      xml.Grant do
+                        if !grant[:email_address].nil?
+                          xml.Grantee('xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                  'xsi:type' => 'AmazonCustomerByEmail') do
+                            xml.EmailAddress(grant[:email_address])
+                          end
+                        elsif !grant[:uri].nil?
+                          xml.Grantee('xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                  'xsi:type' => 'Group') do
+                            xml.URI(grant[:uri])
+                          end
+                        elsif !grant[:id].nil?
+                          xml.Grantee('xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                  'xsi:type' => 'CanonicalUser') do
+                            xml.ID(grant[:id])
+                          end
+                        end
+
+                        xml.Permission(grant[:permission])
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+
+          xml = xml.doc.root.to_xml
+          req.body = xml
+          req.headers['content-md5'] = md5(xml)
+          
+          super(req, options)
+
+        end
+      end
+
+      # Gets the bucket's logging status.
+      # @overload get_bucket_logging(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      bucket_method(:get_bucket_logging, :get, 'logging',
+        XML::GetBucketLogging)
+
       # @overload get_bucket_versioning(options = {})
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name

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

@@ -71,6 +71,24 @@ module AWS
 
         end
 
+        GetBucketLogging = BaseGrammar.customize do
+          element("LoggingEnabled") do
+            element("TargetBucket") { }
+            element("TargetPrefix") { }
+            element("TargetGrants") do
+              list "Grant"
+              element("Grant") do
+                element("Grantee") do
+                  element("EmailAddress") { }
+                  element("ID") { }
+                  element("URI") { }
+                end
+                element("Permission") { }
+              end
+            end
+          end
+        end
+
         GetBucketVersioning = BaseGrammar.customize do
           default_value :status, :unversioned
           element("Status") do

data/lib/aws/s3/object_metadata.rb

@@ -53,6 +53,13 @@ module AWS
       #     object.metadata['purpose'] = 'research'
       #     object.metadata['purpose']               # => 'research'
       #
+      # @deprecated In order to safely update an S3 object's metadata, you
+      #   should use {S3Object#copy_from}. This operation does not preserve
+      #   the ACL, storage class (standard vs. reduced redundancy) or server
+      #   side encryption settings. Using this method on anything other than
+      #   vanilla S3 objects risks clobbering other metadata values set on the
+      #   object.
+      #
       # @note The name and value of each metadata field must conform
       #   to US-ASCII.
       #

data/lib/aws/s3/s3_object.rb

@@ -803,6 +803,8 @@ module AWS
       # @option options [Hash] :metadata A hash of metadata to save
       #   with the copied object.  Each name, value pair must conform
       #   to US-ASCII.  When blank, the sources metadata is copied.
+      #   If you set this value, you must set ALL metadata values for
+      #   the object as we do not preserve existing values.
       #
       # @option options [String] :content_type The content type of
       #   the copied object.  Defaults to the source object's content

data/lib/aws/simple_workflow/request.rb

@@ -17,7 +17,11 @@ module AWS
     # @api private
     class Request < Core::Http::Request
 
-      include Core::Signature::Version3
+      include Core::Signature::Version4
+
+      def service
+        'swf'
+      end
 
     end
   end

data/lib/aws/sqs/config.rb

@@ -15,4 +15,6 @@ AWS::Core::Configuration.module_eval do
 
   add_service 'SQS', 'sqs', 'sqs.%s.amazonaws.com'
 
+  add_option :sqs_verify_checksums, true, :boolean => true
+
 end

data/lib/aws/sqs/errors.rb

@@ -96,6 +96,29 @@ module AWS
         attr_reader :failures
 
       end
+
+      class ChecksumError < StandardError
+
+        def initialize failures
+          # failures can also be a single failure, always generate an array
+          @failures = failures.is_a?(Array) ? failures : [failures]
+          super("#{@failures.size} messages failed checksum verification")
+        end
+
+        attr_reader :failures
+      end
+
+      class BatchSendMultiError < StandardError
+        def initialize *error_set
+          @errors = []
+          error_set.each do |error|
+            @errors << error
+          end
+        end
+
+        attr_reader :errors
+      end
+
     end
   end
 end

data/lib/aws/sqs/queue.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 'digest'
+
 module AWS
   class SQS
 
@@ -118,10 +120,13 @@ module AWS
         client_opts[:message_body] = body
 
         response = client.send_message(client_opts)
-
+        
         msg = SentMessage.new
         msg.message_id = response[:message_id]
         msg.md5 = response[:md5_of_message_body]
+
+        verify_send_message_checksum body, msg.md5
+        
         msg
 
       end
@@ -187,6 +192,10 @@ module AWS
       def receive_message(opts = {}, &block)
         resp = client.receive_message(receive_opts(opts))
 
+        failed = verify_receive_message_checksum resp
+
+        raise Errors::ChecksumError.new(failed) unless failed.empty?
+
         messages = resp[:messages].map do |m|
           ReceivedMessage.new(self, m[:message_id], m[:receipt_handle],
             :body => m[:body],
@@ -530,9 +539,11 @@ module AWS
         client_opts[:entries] = entries
 
         response = client.send_message_batch(client_opts)
-
+        
         failed = batch_failures(entries, response)
 
+        checksum_failed = verify_send_message_batch_checksum entries, response
+        
         sent = response[:successful].collect do |sent|
           msg = SentMessage.new
           msg.message_id = sent[:message_id]
@@ -540,7 +551,15 @@ module AWS
           msg
         end
 
-        raise Errors::BatchSendError.new(sent, failed) unless failed.empty?
+        if !failed.empty? && !checksum_failed.empty?
+          send_error = Errors::BatchSendError.new(sent, failed)
+          checksum_error = Errors::ChecksumError.new(checksum_failed)
+          raise Errors::BatchSendMultiError.new send_error, checksum_error
+        elsif !failed.empty?
+          raise Errors::BatchSendError.new(sent, failed) unless failed.empty?
+        elsif !checksum_failed.empty?
+          raise Errors::ChecksumError.new(checksum_failed)
+        end
 
         sent
 
@@ -757,6 +776,59 @@ module AWS
         })
       end
 
+      # @api private
+      protected
+      def is_checksum_valid checksum, data
+        if config.sqs_verify_checksums?
+          calculate_checksum(data) == checksum
+        else
+          true
+        end
+      end
+
+      # @api private
+      protected
+      def calculate_checksum data
+        Digest::MD5.hexdigest data
+      end
+
+      # @api private
+      protected
+      def verify_send_message_checksum body, md5
+        unless is_checksum_valid md5, body
+          raise Errors::ChecksumError.new "Invalid MD5 #{md5} for message body #{body}"
+        end
+      end
+
+      # @api private
+      protected
+      def verify_send_message_batch_checksum entries, response
+        failed = []
+
+        response[:successful].each do |msg|
+          entry = entries.find{ |e| e[:id] == msg[:id] }
+          failed << msg unless is_checksum_valid msg[:md5_of_message_body], entry[:message_body]
+        end
+
+        failed
+      end
+
+      # @api private
+      protected
+      def verify_receive_message_checksum response
+        return [] if response[:messages].nil?
+
+        invalid_msgs = []
+
+        response[:messages].each do |msg|
+          md5 = msg[:md5_of_body]
+          body = msg[:body]
+          invalid_msgs << msg unless is_checksum_valid md5, body
+        end
+
+        invalid_msgs
+      end
+
     end
 
   end

data/lib/aws/version.rb

@@ -13,5 +13,5 @@
 
 module AWS
   # Current version of the AWS SDK for Ruby
-  VERSION = '1.15.0'
+  VERSION = '1.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools