aws-sdk 1.6.5 → 1.6.6

data/lib/aws/core/json_client.rb

@@ -37,7 +37,7 @@ module AWS
           if code == 'RequestEntityTooLarge'
             message = 'Request body must be less than 1 MB'
           else
-            message = json['message']
+            message = json['message'] || json['Message']
           end
           [code, message]
         end

data/lib/aws/core/options/xml_serializer.rb

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'builder'
+require 'nokogiri'
 
 module AWS
   module Core

data/lib/aws/core/rest_request_builder.rb

@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'builder'
-
 module AWS
   module Core
 

data/lib/aws/dynamo_db/types.rb

@@ -68,7 +68,7 @@ module AWS
         cfg = self.respond_to?(:config) ? self.config :
           (options[:config] || AWS.config)
 
-        cfg.dynamo_db_big_decimals ? BigDecimal.new(number) : number.to_f
+        cfg.dynamo_db_big_decimals ?  BigDecimal.new(number.to_s) : number.to_f
 
       end
 

data/lib/aws/ec2/client.rb

@@ -17,6 +17,8 @@ module AWS
     # Client class for Amazon Elastic Compute Cloud (EC2).
     class Client < Core::QueryClient
 
+      define_client_methods('2012-07-20')
+
       # @private
       CACHEABLE_REQUESTS = Set[
         :describe_addresses,
@@ -340,6 +342,33 @@ module AWS
       #   * +:export_task_id+ - *required* - (String)
       # @return [Core::Response]
 
+      # Calls the CancelReservedInstancesListing API operation.
+      # @method cancel_reserved_instances_listing(options = {})
+      # @param [Hash] options
+      #   * +:reserved_instances_listing_id+ - *required* - (String)
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:reserved_instances_listings_set+ - (Array<Hash>)
+      #     * +:reserved_instances_listing_id+ - (String)
+      #     * +:reserved_instances_id+ - (String)
+      #     * +:create_date+ - (Time)
+      #     * +:update_date+ - (Time)
+      #     * +:status+ - (String)
+      #     * +:status_message+ - (String)
+      #     * +:instance_counts+ - (Array<Hash>)
+      #       * +:state+ - (String)
+      #       * +:instance_count+ - (Integer)
+      #     * +:price_schedules+ - (Array<Hash>)
+      #       * +:term+ - (Integer)
+      #       * +:price+ - (Numeric)
+      #       * +:currency_code+ - (String)
+      #       * +:active+ - (Boolean)
+      #     * +:tag_set+ - (Array<Hash>)
+      #       * +:key+ - (String)
+      #       * +:value+ - (String)
+      #     * +:client_token+ - (String)
+
       # Calls the CancelSpotInstanceRequests API operation.
       # @method cancel_spot_instance_requests(options = {})
       # @param [Hash] options
@@ -626,6 +655,39 @@ module AWS
       #   * +:strategy+ - *required* - (String) The PlacementGroup strategy.
       # @return [Core::Response]
 
+      # Calls the CreateReservedInstancesListing API operation.
+      # @method create_reserved_instances_listing(options = {})
+      # @param [Hash] options
+      #   * +:reserved_instances_id+ - *required* - (String)
+      #   * +:instance_count+ - *required* - (Integer)
+      #   * +:price_schedules+ - *required* - (Array<Hash>)
+      #     * +:term+ - (Integer)
+      #     * +:price+ - (Float)
+      #     * +:currency_code+ - (String)
+      #   * +:client_token+ - *required* - (String)
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:reserved_instances_listings_set+ - (Array<Hash>)
+      #     * +:reserved_instances_listing_id+ - (String)
+      #     * +:reserved_instances_id+ - (String)
+      #     * +:create_date+ - (Time)
+      #     * +:update_date+ - (Time)
+      #     * +:status+ - (String)
+      #     * +:status_message+ - (String)
+      #     * +:instance_counts+ - (Array<Hash>)
+      #       * +:state+ - (String)
+      #       * +:instance_count+ - (Integer)
+      #     * +:price_schedules+ - (Array<Hash>)
+      #       * +:term+ - (Integer)
+      #       * +:price+ - (Numeric)
+      #       * +:currency_code+ - (String)
+      #       * +:active+ - (Boolean)
+      #     * +:tag_set+ - (Array<Hash>)
+      #       * +:key+ - (String)
+      #       * +:value+ - (String)
+      #     * +:client_token+ - (String)
+
       # Calls the CreateRoute API operation.
       # @method create_route(options = {})
       # @param [Hash] options
@@ -668,6 +730,13 @@ module AWS
       #     * +:tag_set+ - (Array<Hash>)
       #       * +:key+ - (String)
       #       * +:value+ - (String)
+      #     * +:propagating_vgw_set+ - (Array<Hash>)
+      #       * +:gateway_id+ - (String)
+      #     * +:propagated_route_set+ - (Array<Hash>)
+      #       * +:destination_cidr_block+ - (String)
+      #       * +:gateway_id+ - (String)
+      #       * +:status+ - (String)
+      #       * +:source_id+ - (String)
 
       # Calls the CreateSecurityGroup API operation.
       # @method create_security_group(options = {})
@@ -820,6 +889,8 @@ module AWS
       #     customer gateway.
       #   * +:vpn_gateway_id+ - *required* - (String) The ID of the VPN
       #     gateway.
+      #   * +:options+ - (Hash)
+      #     * +:static_routes_only+ - (Boolean)
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:
@@ -839,6 +910,19 @@ module AWS
       #       * +:last_status_change+ - (Time)
       #       * +:status_message+ - (String)
       #       * +:accepted_route_count+ - (Integer)
+      #     * +:options+ - (Hash)
+      #       * +:static_routes_only+ - (Boolean)
+      #     * +:routes+ - (Array<Hash>)
+      #       * +:destination_cidr_block+ - (String)
+      #       * +:source+ - (String)
+      #       * +:state+ - (String)
+
+      # Calls the CreateVpnConnectionRoute API operation.
+      # @method create_vpn_connection_route(options = {})
+      # @param [Hash] options
+      #   * +:vpn_connection_id+ - *required* - (String)
+      #   * +:destination_cidr_block+ - *required* - (String)
+      # @return [Core::Response]
 
       # Calls the CreateVpnGateway API operation.
       # @method create_vpn_gateway(options = {})
@@ -1009,6 +1093,13 @@ module AWS
       #     connection to delete
       # @return [Core::Response]
 
+      # Calls the DeleteVpnConnectionRoute API operation.
+      # @method delete_vpn_connection_route(options = {})
+      # @param [Hash] options
+      #   * +:vpn_connection_id+ - *required* - (String)
+      #   * +:destination_cidr_block+ - *required* - (String)
+      # @return [Core::Response]
+
       # Calls the DeleteVpnGateway API operation.
       # @method delete_vpn_gateway(options = {})
       # @param [Hash] options
@@ -1767,6 +1858,38 @@ module AWS
       #       * +:frequency+ - (String)
       #       * +:amount+ - (Numeric)
 
+      # Calls the DescribeReservedInstancesListings API operation.
+      # @method describe_reserved_instances_listings(options = {})
+      # @param [Hash] options
+      #   * +:reserved_instances_id+ - (String)
+      #   * +:reserved_instances_listing_id+ - (String)
+      #   * +:filters+ - (Array<Hash>)
+      #     * +:name+ - (String) Specifies the name of the filter.
+      #     * +:values+ - (Array<String>) Contains one or more values for the
+      #       filter.
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:reserved_instances_listings_set+ - (Array<Hash>)
+      #     * +:reserved_instances_listing_id+ - (String)
+      #     * +:reserved_instances_id+ - (String)
+      #     * +:create_date+ - (Time)
+      #     * +:update_date+ - (Time)
+      #     * +:status+ - (String)
+      #     * +:status_message+ - (String)
+      #     * +:instance_counts+ - (Array<Hash>)
+      #       * +:state+ - (String)
+      #       * +:instance_count+ - (Integer)
+      #     * +:price_schedules+ - (Array<Hash>)
+      #       * +:term+ - (Integer)
+      #       * +:price+ - (Numeric)
+      #       * +:currency_code+ - (String)
+      #       * +:active+ - (Boolean)
+      #     * +:tag_set+ - (Array<Hash>)
+      #       * +:key+ - (String)
+      #       * +:value+ - (String)
+      #     * +:client_token+ - (String)
+
       # Calls the DescribeReservedInstancesOfferings API operation.
       # @method describe_reserved_instances_offerings(options = {})
       # @param [Hash] options
@@ -1807,6 +1930,11 @@ module AWS
       #     * +:recurring_charges+ - (Array<Hash>)
       #       * +:frequency+ - (String)
       #       * +:amount+ - (Numeric)
+      #     * +:marketplace+ - (Boolean)
+      #     * +:pricing_details_set+ - (Array<Hash>)
+      #       * +:price+ - (Numeric)
+      #       * +:count+ - (Integer)
+      #   * +:next_token+ - (String)
 
       # Calls the DescribeRouteTables API operation.
       # @method describe_route_tables(options = {})
@@ -1840,6 +1968,13 @@ module AWS
       #     * +:tag_set+ - (Array<Hash>)
       #       * +:key+ - (String)
       #       * +:value+ - (String)
+      #     * +:propagating_vgw_set+ - (Array<Hash>)
+      #       * +:gateway_id+ - (String)
+      #     * +:propagated_route_set+ - (Array<Hash>)
+      #       * +:destination_cidr_block+ - (String)
+      #       * +:gateway_id+ - (String)
+      #       * +:status+ - (String)
+      #       * +:source_id+ - (String)
 
       # Calls the DescribeSecurityGroups API operation.
       # @method describe_security_groups(options = {})
@@ -2242,6 +2377,12 @@ module AWS
       #       * +:last_status_change+ - (Time)
       #       * +:status_message+ - (String)
       #       * +:accepted_route_count+ - (Integer)
+      #     * +:options+ - (Hash)
+      #       * +:static_routes_only+ - (Boolean)
+      #     * +:routes+ - (Array<Hash>)
+      #       * +:destination_cidr_block+ - (String)
+      #       * +:source+ - (String)
+      #       * +:state+ - (String)
 
       # Calls the DescribeVpnGateways API operation.
       # @method describe_vpn_gateways(options = {})
@@ -2323,6 +2464,13 @@ module AWS
       #     VPN gateway from.
       # @return [Core::Response]
 
+      # Calls the DisableVgwRoutePropagation API operation.
+      # @method disable_vgw_route_propagation(options = {})
+      # @param [Hash] options
+      #   * +:route_table_id+ - *required* - (String)
+      #   * +:gateway_id+ - *required* - (String)
+      # @return [Core::Response]
+
       # Calls the DisassociateAddress API operation.
       # @method disassociate_address(options = {})
       # @param [Hash] options
@@ -2340,6 +2488,13 @@ module AWS
       #     subnet.
       # @return [Core::Response]
 
+      # Calls the EnableVgwRoutePropagation API operation.
+      # @method enable_vgw_route_propagation(options = {})
+      # @param [Hash] options
+      #   * +:route_table_id+ - *required* - (String)
+      #   * +:gateway_id+ - *required* - (String)
+      # @return [Core::Response]
+
       # Calls the EnableVolumeIO API operation.
       # @method enable_volume_io(options = {})
       # @param [Hash] options
@@ -2688,6 +2843,9 @@ module AWS
       #     unique ID of the Reserved Instances offering being purchased.
       #   * +:instance_count+ - *required* - (Integer) The number of Reserved
       #     Instances to purchase.
+      #   * +:limit_price+ - (Hash)
+      #     * +:amount+ - (Float)
+      #     * +:currency_code+ - (String)
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:
@@ -2864,9 +3022,6 @@ module AWS
       #     instance information.
       #     * +:image_id+ - (String) The AMI ID.
       #     * +:key_name+ - (String) The name of the key pair.
-      #     * +:security_groups+ - (Array<Hash>)
-      #       * +:group_name+ - (String)
-      #       * +:group_id+ - (String)
       #     * +:user_data+ - (String) Optional data, specific to a user's
       #       application, to provide in the launch request. All instances that
       #       collectively comprise the launch request have access to this
@@ -2923,6 +3078,9 @@ module AWS
       #       * +:arn+ - (String)
       #       * +:name+ - (String)
       #     * +:ebs_optimized+ - (Boolean)
+      #     * +:security_groups+ - (Array<Hash>)
+      #       * +:group_name+ - (String)
+      #       * +:group_id+ - (String)
       # @return [Core::Response]
       #   The #data method of the response object returns
       #   a hash with the following structure:
@@ -3359,7 +3517,6 @@ module AWS
       #   * +:private_ip_addresses+ - *required* - (Array<String>)
       # @return [Core::Response]
 
-      # Calls the UnmonitorInstances API operation.
       # @method unmonitor_instances(options = {})
       # @param [Hash] options
       #   * +:instance_ids+ - *required* - (Array<String>) The list of Amazon
@@ -3374,8 +3531,6 @@ module AWS
 
       ## end client methods ##
 
-      define_client_methods('2012-07-20')
-
     end
   end
 end

data/lib/aws/s3.rb

@@ -113,9 +113,12 @@ module AWS
       autoload :ACLOptions,                   'acl_options'
       autoload :Bucket,                       'bucket'
       autoload :BucketCollection,             'bucket_collection'
+      autoload :BucketTagCollection,          'bucket_tag_collection'
       autoload :BucketLifecycleConfiguration, 'bucket_lifecycle_configuration'
       autoload :BucketVersionCollection,      'bucket_version_collection'
       autoload :Client,                       'client'
+      autoload :CORSRule,                     'cors_rule'
+      autoload :CORSRuleCollection,           'cors_rule_collection'
       autoload :DataOptions,                  'data_options'
       autoload :EncryptionUtils,              'encryption_utils'
       autoload :CipherIO,                     'cipher_io'

data/lib/aws/s3/bucket.rb

@@ -225,13 +225,67 @@ module AWS
         versions.first ? false : true
       end
 
-      # @return [String,nil] Returns the location constraint for a bucket 
+      # @return [String,nil] Returns the location constraint for a bucket
       #   (if it has one), nil otherwise.
       def location_constraint
         client.get_bucket_location(:bucket_name => name).location_constraint
       end
 
-      # Enables versioning on this bucket. 
+      # Returns the tags for this bucket.
+      #
+      #   tags = bucket.tags
+      #   #=> <AWS::S3::BucketTagCollection>
+      #
+      #   # adds a tag to the bucket
+      #   tags['foo'] = 'abc'
+      #
+      #   # replaces all tags
+      #   tags.set('new' => 'tags')
+      #
+      #   # removes all tags from the bucket
+      #   tags.clear
+      #
+      #   # returns tags as a hash
+      #   tags.to_h
+      #
+      # @return [BucketTagCollection] Returns a collection that represents
+      #   the tags for this bucket.
+      #
+      def tags
+        BucketTagCollection.new(self)
+      end
+
+      # Sets the tags for this bucket.
+      #
+      #   bucket.tags = { 'contents' => 'photots' }
+      #
+      # You can remove all tags for the bucket by passing an empty
+      # hash or +nil+.
+      #
+      #   bucket.tags = nil # {} also deletes all tags
+      #   bucket.tags
+      #   #=> {}
+      #
+      # @param [Hash,nil] tags The tags to set on this bucket.
+      #
+      def tags= tags
+        self.tags.set(tags)
+      end
+
+      # @return [CORSRuleCollection] Returns a collection that can be
+      #   used to manage (add, edit and delete) CORS rules for this bucket.
+      def cors
+        CORSRuleCollection.new(self)
+      end
+
+      # Sets the bucket CORS rules.
+      # @param (see CORSRuleCollection#set)
+      # @see CORSRuleCollection#set
+      def cors= *rules
+        self.cors.set(*rules)
+      end
+
+      # Enables versioning on this bucket.
       # @return [nil]
       def enable_versioning
         client.set_bucket_versioning(
@@ -240,7 +294,7 @@ module AWS
         nil
       end
 
-      # Suspends versioning on this bucket. 
+      # Suspends versioning on this bucket.
       # @return [nil]
       def suspend_versioning
         client.set_bucket_versioning(
@@ -316,7 +370,7 @@ module AWS
         begin
           versioned? # makes a get bucket request without listing contents
                      # raises a client error if the bucket doesn't exist or
-                     # if you don't have permission to get the bucket 
+                     # if you don't have permission to get the bucket
                      # versioning status.
           true
         rescue Errors::NoSuchBucket => e
@@ -326,7 +380,7 @@ module AWS
         end
       end
 
-      # @return [ObjectCollection] Represents all objects(keys) in 
+      # @return [ObjectCollection] Represents all objects(keys) in
       #   this bucket.
       def objects
         ObjectCollection.new(self)
@@ -482,11 +536,11 @@ module AWS
       #
       #   bucket.lifecycle_configuration = other_bucket.lifecycle_configuration
       #
-      # If you call this method, passing nil, the lifecycle configuration 
+      # If you call this method, passing nil, the lifecycle configuration
       # for this bucket will be deleted.
       #
-      # @param [String,Object] config You can pass an xml string or any 
-      #   other object that responds to #to_xml (e.g. 
+      # @param [String,Object] config You can pass an xml string or any
+      #   other object that responds to #to_xml (e.g.
       #   BucketLifecycleConfiguration).
       #
       # @return [nil]
@@ -502,7 +556,7 @@ module AWS
           @lifecycle_cfg = BucketLifecycleConfiguration.new(self, :empty => true)
 
         else
-        
+
           xml = config.is_a?(String) ? config : config.to_xml
 
           client_opts = {}