aws-sdk 1.6.6 → 1.6.7

data/lib/aws/route_53/client.rb

@@ -13,15 +13,19 @@
 
 module AWS
   class Route53
+
+    # Client class for Route53.
     class Client < Core::RESTClient
 
+      define_client_methods('2012-02-29')
+
       # @private
       CACHEABLE_REQUESTS = Set[]
 
       ## client methods ##
 
+      # @!method change_resource_record_sets(options = {})
       # Calls the POST ChangeResourceRecordSets API operation.
-      # @method change_resource_record_sets(options = {})
       # @param [Hash] options
       # * +:hosted_zone_id+ - *required* - (String) Alias resource record sets
       #   only: The value of the hosted zone ID, CanonicalHostedZoneNameId, for
@@ -93,8 +97,8 @@ module AWS
       #     * +:submitted_at+ - (Time)
       #     * +:comment+ - (String)
 
+      # @!method create_hosted_zone(options = {})
       # Calls the POST CreateHostedZone API operation.
-      # @method create_hosted_zone(options = {})
       # @param [Hash] options
       # * +:name+ - *required* - (String) The name of the domain. This must be
       #   a fully-specified domain, for example, www.example.com. The trailing
@@ -137,8 +141,8 @@ module AWS
       #   * +:delegation_set+ - (Hash)
       #     * +:name_servers+ - (Array<String>)
 
+      # @!method delete_hosted_zone(options = {})
       # Calls the DELETE DeleteHostedZone API operation.
-      # @method delete_hosted_zone(options = {})
       # @param [Hash] options
       # * +:id+ - *required* - (String) The ID of the request. Include this ID
       #   in a call to GetChange to track when the change has propagated to all
@@ -152,8 +156,8 @@ module AWS
       #     * +:submitted_at+ - (Time)
       #     * +:comment+ - (String)
 
+      # @!method get_change(options = {})
       # Calls the GET GetChange API operation.
-      # @method get_change(options = {})
       # @param [Hash] options
       # * +:id+ - *required* - (String) The ID of the change batch request. The
       #   value that you specify here is the value that
@@ -168,8 +172,8 @@ module AWS
       #     * +:submitted_at+ - (Time)
       #     * +:comment+ - (String)
 
+      # @!method get_hosted_zone(options = {})
       # Calls the GET GetHostedZone API operation.
-      # @method get_hosted_zone(options = {})
       # @param [Hash] options
       # * +:id+ - *required* - (String) The ID of the hosted zone for which you
       #   want to get a list of the name servers in the delegation set.
@@ -186,8 +190,8 @@ module AWS
       #   * +:delegation_set+ - (Hash)
       #     * +:name_servers+ - (Array<String>)
 
+      # @!method list_hosted_zones(options = {})
       # Calls the GET ListHostedZones API operation.
-      # @method list_hosted_zones(options = {})
       # @param [Hash] options
       # * +:marker+ - (String) If the request returned more than one page of
       #   results, submit another request and specify the value of NextMarker
@@ -210,8 +214,8 @@ module AWS
       #   * +:next_marker+ - (String)
       #   * +:max_items+ - (Integer)
 
+      # @!method list_resource_record_sets(options = {})
       # Calls the GET ListResourceRecordSets API operation.
-      # @method list_resource_record_sets(options = {})
       # @param [Hash] options
       # * +:hosted_zone_id+ - *required* - (String) The ID of the hosted zone
       #   that contains the resource record sets that you want to get.
@@ -255,8 +259,6 @@ module AWS
 
       ## end client methods ##
 
-      define_client_methods('2012-02-29')
-
     end
   end
 end

data/lib/aws/s3/bucket.rb

@@ -286,20 +286,42 @@ module AWS
       end
 
       # Enables versioning on this bucket.
+      #
+      # @option opts [String] :mfa_delete Set to 'Enabled' or 'Disabled'
+      #   to control the state of MFA delete on the bucket versioning.
+      #   Setting this option requires the :mfa option to also be set.
+      #
+      # @option opts [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 enable_versioning
+      def enable_versioning(opts = {})
         client.set_bucket_versioning(
           :bucket_name => @name,
-          :state => :enabled)
+          :state       => :enabled,
+          :mfa_delete  => opts[:mfa_delete],
+          :mfa         => opts[:mfa])
         nil
       end
 
       # Suspends versioning on this bucket.
+      #
+      # @option opts [String] :mfa_delete Set to 'Enabled' or 'Disabled'
+      #   to control the state of MFA delete on the bucket versioning.
+      #   Setting this option requires the :mfa option to also be set.
+      #
+      # @option opts [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 suspend_versioning
+      def suspend_versioning(opts = {})
         client.set_bucket_versioning(
           :bucket_name => @name,
-          :state => :suspended)
+          :state       => :suspended,
+          :mfa_delete  => opts[:mfa_delete],
+          :mfa         => opts[:mfa])
         nil
       end
 

data/lib/aws/s3/client.rb

@@ -428,20 +428,29 @@ module AWS
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
       #   @option options [required,String] :state
+      #   @option options [String] :mfa_delete
+      #   @option options [String] :mfa
       #   @return [Core::Response]
-      bucket_method(:set_bucket_versioning, :put, 'versioning') do
+      bucket_method(:set_bucket_versioning, :put, 'versioning', :header_options => { :mfa => "x-amz-mfa" }) do
 
         configure_request do |req, options|
           state = options[:state].to_s.downcase.capitalize
           unless state =~ /^(Enabled|Suspended)$/
             raise ArgumentError, "invalid versioning state `#{state}`"
           end
+
+          # Leave validation of MFA options to S3
+          mfa_delete = options[:mfa_delete].to_s.downcase.capitalize if options[:mfa_delete]
+
+          # Generate XML request for versioning
+          req.body = Nokogiri::XML::Builder.new do |xml|
+            xml.VersioningConfiguration('xmlns' => XMLNS) do
+              xml.Status(state)
+              xml.MfaDelete(mfa_delete) if mfa_delete
+            end
+          end.doc.root.to_xml
+
           super(req, options)
-          req.body = <<-XML.strip
-            <VersioningConfiguration xmlns="#{XMLNS}">
-              <Status>#{state}</Status>
-            </VersioningConfiguration>
-          XML
         end
 
       end

data/lib/aws/s3/s3_object.rb

@@ -1201,7 +1201,7 @@ module AWS
 
       # @return [Boolean]
       def should_decrypt? options
-        options[:encryption_key]
+        options[:encryption_key] or config.s3_encryption_key
       end
 
       # A small wrapper around client#get_object
@@ -1453,7 +1453,7 @@ module AWS
           cipher =
           decryption_materials(location) do |envelope_key, envelope_iv|
             envelope_key, envelope_iv =
-              decode_envelope_key(envelope_key, envelope_iv, options)
+              decode_envelope_key(envelope_key, envelope_iv, encryption_key)
             get_aes_cipher(:decrypt, :CBC, envelope_key, envelope_iv)
           end
 
@@ -1465,10 +1465,10 @@ module AWS
       end
 
       # Decodes the envelope key for decryption
-      def decode_envelope_key envelope_key, envelope_iv, options
+      def decode_envelope_key envelope_key, envelope_iv, encryption_key
         decrypted_key =
         begin
-          decrypt(decode64(envelope_key), options[:encryption_key])
+          decrypt(decode64(envelope_key), encryption_key)
         rescue RuntimeError
           msg = "Master key used to decrypt data key is not correct."
           raise AWS::S3::Errors::IncorrectClientSideEncryptionKey, msg

data/lib/aws/simple_db/client.rb

@@ -17,6 +17,8 @@ module AWS
     # Client class for Amazon SimpleDB.
     class Client < Core::QueryClient
 
+      define_client_methods('2009-04-15')
+
       # @private
       REGION_US_E1 = 'sdb.amazonaws.com'
 
@@ -54,8 +56,8 @@ module AWS
 
       ## client methods ##
 
+      # @!method batch_delete_attributes(options = {})
       # Calls the BatchDeleteAttributes API operation.
-      # @method batch_delete_attributes(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain in
       #     which the attributes are being deleted.
@@ -72,8 +74,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method batch_put_attributes(options = {})
       # Calls the BatchPutAttributes API operation.
-      # @method batch_put_attributes(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain in
       #     which the attributes are being stored.
@@ -96,8 +98,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method create_domain(options = {})
       # Calls the CreateDomain API operation.
-      # @method create_domain(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain to
       #     create. The name can range between 3 and 255 characters and can
@@ -109,8 +111,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method delete_attributes(options = {})
       # Calls the DeleteAttributes API operation.
-      # @method delete_attributes(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain in
       #     which to perform the operation.
@@ -143,8 +145,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method delete_domain(options = {})
       # Calls the DeleteDomain API operation.
-      # @method delete_domain(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain to
       #     delete.
@@ -155,8 +157,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method domain_metadata(options = {})
       # Calls the DomainMetadata API operation.
-      # @method domain_metadata(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain for
       #     which to display the metadata of.
@@ -174,8 +176,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method get_attributes(options = {})
       # Calls the GetAttributes API operation.
-      # @method get_attributes(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain in
       #     which to perform the operation.
@@ -198,8 +200,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method list_domains(options = {})
       # Calls the ListDomains API operation.
-      # @method list_domains(options = {})
       # @param [Hash] options
       #   * +:max_number_of_domains+ - (Integer) The maximum number of domain
       #     names you want returned. The range is 1 to 100. The default setting
@@ -215,8 +217,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method put_attributes(options = {})
       # Calls the PutAttributes API operation.
-      # @method put_attributes(options = {})
       # @param [Hash] options
       #   * +:domain_name+ - *required* - (String) The name of the domain in
       #     which to perform the operation.
@@ -250,8 +252,8 @@ module AWS
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
 
+      # @!method select(options = {})
       # Calls the Select API operation.
-      # @method select(options = {})
       # @param [Hash] options
       #   * +:select_expression+ - *required* - (String) The expression used to
       #     query the domain.
@@ -280,8 +282,6 @@ module AWS
 
       ## end client methods ##
 
-      define_client_methods('2009-04-15')
-
     end
   end
 end

data/lib/aws/simple_email_service/client.rb

@@ -17,6 +17,8 @@ module AWS
     # Client class for Amazon Simple E-mail Service (SES).
     class Client < Core::QueryClient
 
+      define_client_methods('2010-12-01')
+
       REGION_US_E1 = 'email.us-east-1.amazonaws.com'
 
       # @private
@@ -24,22 +26,22 @@ module AWS
 
       ## client methods ##
 
+      # @!method delete_identity(options = {})
       # Calls the DeleteIdentity API operation.
-      # @method delete_identity(options = {})
       # @param [Hash] options
       #   * +:identity+ - *required* - (String) The identity to be removed from
       #     the list of identities for the AWS Account.
       # @return [Core::Response]
 
+      # @!method delete_verified_email_address(options = {})
       # Calls the DeleteVerifiedEmailAddress API operation.
-      # @method delete_verified_email_address(options = {})
       # @param [Hash] options
       #   * +:email_address+ - *required* - (String) An email address to be
       #     removed from the list of verified addresses.
       # @return [Core::Response]
 
+      # @!method get_identity_dkim_attributes(options = {})
       # Calls the GetIdentityDkimAttributes API operation.
-      # @method get_identity_dkim_attributes(options = {})
       # @param [Hash] options
       #   * +:identities+ - *required* - (Array<String>) A list of one or more
       #     verified identities - email addresses, domains, or both.
@@ -51,8 +53,8 @@ module AWS
       #     * +:dkim_verification_status+ - (String)
       #     * +:dkim_tokens+ - (Array<String>)
 
+      # @!method get_identity_notification_attributes(options = {})
       # Calls the GetIdentityNotificationAttributes API operation.
-      # @method get_identity_notification_attributes(options = {})
       # @param [Hash] options
       #   * +:identities+ - *required* - (Array<String>) A list of one or more
       #     identities.
@@ -64,8 +66,8 @@ module AWS
       #     * +:complaint_topic+ - (String)
       #     * +:forwarding_enabled+ - (Boolean)
 
+      # @!method get_identity_verification_attributes(options = {})
       # Calls the GetIdentityVerificationAttributes API operation.
-      # @method get_identity_verification_attributes(options = {})
       # @param [Hash] options
       #   * +:identities+ - *required* - (Array<String>) A list of identities.
       # @return [Core::Response]
@@ -75,8 +77,8 @@ module AWS
       #     * +:verification_status+ - (String)
       #     * +:verification_token+ - (String)
 
+      # @!method get_send_quota(options = {})
       # Calls the GetSendQuota API operation.
-      # @method get_send_quota(options = {})
       # @param [Hash] options
       # @return [Core::Response]
       #   The #data method of the response object returns
@@ -85,8 +87,8 @@ module AWS
       #   * +:max_send_rate+ - (Numeric)
       #   * +:sent_last_24_hours+ - (Numeric)
 
+      # @!method get_send_statistics(options = {})
       # Calls the GetSendStatistics API operation.
-      # @method get_send_statistics(options = {})
       # @param [Hash] options
       # @return [Core::Response]
       #   The #data method of the response object returns
@@ -98,8 +100,8 @@ module AWS
       #     * +:complaints+ - (Integer)
       #     * +:rejects+ - (Integer)
 
+      # @!method list_identities(options = {})
       # Calls the ListIdentities API operation.
-      # @method list_identities(options = {})
       # @param [Hash] options
       #   * +:identity_type+ - (String) The type of the identities to list.
       #     Possible values are "EmailAddress" and "Domain". If this parameter
@@ -113,16 +115,16 @@ module AWS
       #   * +:identities+ - (Array<String>)
       #   * +:next_token+ - (String)
 
+      # @!method list_verified_email_addresses(options = {})
       # Calls the ListVerifiedEmailAddresses API operation.
-      # @method list_verified_email_addresses(options = {})
       # @param [Hash] options
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:verified_email_addresses+ - (Array<String>)
 
+      # @!method send_email(options = {})
       # Calls the SendEmail API operation.
-      # @method send_email(options = {})
       # @param [Hash] options
       #   * +:source+ - *required* - (String) The identity's email address.
       #   * +:destination+ - *required* - (Hash) The destination for this
@@ -167,8 +169,8 @@ module AWS
       #   a hash with the following structure:
       #   * +:message_id+ - (String)
 
+      # @!method send_raw_email(options = {})
       # Calls the SendRawEmail API operation.
-      # @method send_raw_email(options = {})
       # @param [Hash] options
       #   * +:source+ - (String) The identity's email address. If you specify
       #     the Source parameter, then bounce notifications and complaints will
@@ -195,8 +197,8 @@ module AWS
       #   a hash with the following structure:
       #   * +:message_id+ - (String)
 
+      # @!method set_identity_dkim_enabled(options = {})
       # Calls the SetIdentityDkimEnabled API operation.
-      # @method set_identity_dkim_enabled(options = {})
       # @param [Hash] options
       #   * +:identity+ - *required* - (String) The identity for which DKIM
       #     signing should be enabled or disabled.
@@ -205,8 +207,8 @@ module AWS
       #     for this identity; +false+ to disable it.
       # @return [Core::Response]
 
+      # @!method set_identity_feedback_forwarding_enabled(options = {})
       # Calls the SetIdentityFeedbackForwardingEnabled API operation.
-      # @method set_identity_feedback_forwarding_enabled(options = {})
       # @param [Hash] options
       #   * +:identity+ - *required* - (String) The identity for which to set
       #     feedback notification forwarding. Examples: user@example.com,
@@ -221,8 +223,8 @@ module AWS
       #     topic types.
       # @return [Core::Response]
 
+      # @!method set_identity_notification_topic(options = {})
       # Calls the SetIdentityNotificationTopic API operation.
-      # @method set_identity_notification_topic(options = {})
       # @param [Hash] options
       #   * +:identity+ - *required* - (String) The identity for which the
       #     topic will be set. Examples: user@example.com, example.com.
@@ -234,8 +236,8 @@ module AWS
       #     the topic is cleared and publishing is disabled.
       # @return [Core::Response]
 
+      # @!method verify_domain_dkim(options = {})
       # Calls the VerifyDomainDkim API operation.
-      # @method verify_domain_dkim(options = {})
       # @param [Hash] options
       #   * +:domain+ - *required* - (String) The name of the domain to be
       #     verified for Easy DKIM signing.
@@ -244,8 +246,8 @@ module AWS
       #   a hash with the following structure:
       #   * +:dkim_tokens+ - (Array<String>)
 
+      # @!method verify_domain_identity(options = {})
       # Calls the VerifyDomainIdentity API operation.
-      # @method verify_domain_identity(options = {})
       # @param [Hash] options
       #   * +:domain+ - *required* - (String) The domain to be verified.
       # @return [Core::Response]
@@ -253,15 +255,15 @@ module AWS
       #   a hash with the following structure:
       #   * +:verification_token+ - (String)
 
+      # @!method verify_email_address(options = {})
       # Calls the VerifyEmailAddress API operation.
-      # @method verify_email_address(options = {})
       # @param [Hash] options
       #   * +:email_address+ - *required* - (String) The email address to be
       #     verified.
       # @return [Core::Response]
 
+      # @!method verify_email_identity(options = {})
       # Calls the VerifyEmailIdentity API operation.
-      # @method verify_email_identity(options = {})
       # @param [Hash] options
       #   * +:email_address+ - *required* - (String) The email address to be
       #     verified.
@@ -269,8 +271,6 @@ module AWS
 
       ## end client methods ##
 
-      define_client_methods('2010-12-01')
-
     end
   end
 end