aws-sdk 1.32.0 → 1.50.0

data/lib/aws/core/log_formatter.rb

@@ -154,7 +154,7 @@ module AWS
       end
 
       def _service response
-        response.http_request.class.name.split('::')[1]
+        response.http_request.service
       end
 
       def _region response

data/lib/aws/core/model.rb

@@ -52,6 +52,11 @@ module AWS
         "<#{self.class}>"
       end
 
+      # @api private
+      def to_yaml_properties
+        instance_variables.map(&:to_s) - %w(@config)
+      end
+
     end
   end
 end

data/lib/aws/core/option_grammar.rb

@@ -378,13 +378,13 @@ module AWS
 
             option.extend self
 
-            key_option = option.key_option
+            key_option = option.key_option(members)
             if key_descriptors = members[:key]
               key_option = key_option.extend_with_config(*key_descriptors)
               MetaUtils.extend_method(option, :key_option) { key_option }
             end
 
-            value_option = option.value_option
+            value_option = option.value_option(members)
             if value_descriptors = members[:value]
               value_option = value_option.extend_with_config(*value_descriptors)
               MetaUtils.extend_method(option, :value_option) { value_option }
@@ -416,13 +416,13 @@ module AWS
             values.inject([]) do |params, (key,value)|
 
               index = params.size / 2 + 1
-              common_prefix = "#{prefixed_name(prefix)}#{separator}#{index}."
+              common_prefix = "#{prefixed_name(prefix)}#{separator}#{index}"
 
               key_name = common_prefix + key_option.param_name
               value_name = common_prefix + value_option.param_name
 
-              params << Http::Request::Param.new(key_name, key)
-              params << Http::Request::Param.new(value_name, value)
+              params += key_option.request_params(key, common_prefix)
+              params += value_option.request_params(value, common_prefix)
 
             end
           end
@@ -436,12 +436,12 @@ module AWS
             end
           end
 
-          def key_option
-            @_key_option ||= MapOption.new("key")
+          def key_option(options)
+            @_key_option ||= MapOption.new(options[:key_param] || "key")
           end
 
-          def value_option
-            @_value_option ||= MapOption.new("value")
+          def value_option(options)
+            @_value_option ||= MapOption.new(options[:value_param] || "value")
           end
 
         end

data/lib/aws/core/policy.rb

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'uuidtools'
 require 'date'
 require 'json'
 
@@ -84,7 +83,7 @@ module AWS
         if opts.has_key?(:id) or opts.has_key?("Id")
           @id = opts[:id] || opts["Id"]
         else
-          @id = UUIDTools::UUID.timestamp_create.to_s.tr('-','')
+          @id = SecureRandom.uuid.tr('-','')
         end
         if opts.has_key?(:version) or opts.has_key?("Version")
           @version = opts[:version] || opts["Version"]
@@ -748,7 +747,7 @@ module AWS
         #   Policy#deny to add conditions to a statement.
         # @see S3::Client
         def initialize(opts = {})
-          self.sid = UUIDTools::UUID.timestamp_create.to_s.tr('-','')
+          self.sid = SecureRandom.uuid.tr('-','')
           self.conditions = ConditionBlock.new
 
           parse_options(opts)

data/lib/aws/core/response.rb

@@ -70,6 +70,9 @@ module AWS
       #   returned this response.
       attr_accessor :request_type
 
+      # @return [String] The API version of the request/client.
+      attr_accessor :api_version
+
       # @return [Hash] Returns the hash of options passed to the client
       #   request method that generated this response.
       attr_accessor :request_options
@@ -141,6 +144,7 @@ module AWS
       # @api private
       def cache_key
         [
+          api_version,
           http_request.access_key_id,
           http_request.host,
           request_type,

data/lib/aws/core/signers/version_4.rb

@@ -192,7 +192,7 @@ module AWS
         # @param [String] value
         # @return [String]
         def hexdigest value
-          digest = Digest::SHA256.new
+          digest = OpenSSL::Digest::SHA256.new
           if value.respond_to?(:read)
             chunk = nil
             chunk_size = 1024 * 1024 # 1 megabyte

data/lib/aws/core/signers/version_4/chunk_signed_stream.rb

@@ -150,7 +150,7 @@ module AWS
           end
 
           def hash value
-            Digest::SHA256.new.update(value).hexdigest
+            OpenSSL::Digest::SHA256.new.update(value).hexdigest
           end
 
           class << self

data/lib/aws/core/xml/frame.rb

@@ -231,6 +231,7 @@ module AWS
           # that AWS uses almost (??) everywhere.
           if @text.tr(*TRANSLATE_DIGITS) == EASY_FORMAT
             parts = @text.tr(*DATE_PUNCTUATION).chop.split.map {|p| p.to_i }
+            parts[-1] = parts[-1] * 1000
             klass.send(parts_constructor, *parts)
           else
             # fallback in case we have to handle another date format

data/lib/aws/core/xml/grammar.rb

@@ -283,6 +283,7 @@ module AWS
           other.is_a?(Grammar) and self.rules == other.rules
         end
         alias_method :==, :eql?
+        public :==
 
         def enum *args; end
         def position *args; end

data/lib/aws/dynamo_db.rb

@@ -22,6 +22,20 @@ module AWS
   #       :access_key_id => '...',
   #       :secret_access_key => '...')
   #
+  # # Supported API Version
+  #
+  # Please note, the `AWS::DynamoDB` classes have been built against
+  # the 2011-12-05 API version. Constructing a `AWS::DynamoDB` object
+  # with a newer API version will emit a warning and then ignore the
+  # specified version.
+  #
+  # If you would like to use features of the newer 2012-08-10 API
+  # version, then please construct a DynamoDB client and use the
+  # client API directly.
+  #
+  #     # supports the latest API version
+  #     ddb = AWS::DynamoDB::Client.new(api_verison:'2012-08-10')
+  #
   # # Tables
   #
   # Tables contain items, and organize information into discrete
@@ -124,10 +138,12 @@ module AWS
 
     endpoint_prefix 'dynamodb'
 
+    IGNORING_API_SPECIFIED_MSG = "WARNING: Ignoring DynamoDB API version specified because only '2011-12-05' is supported by this class.  To use another version of the API, invoke the lower level AWS::DynamoDB::Client explicitly."
 
     def initialize options = {}
       options = options.dup
       options[:dynamo_db] ||= {}
+      warn(IGNORING_API_SPECIFIED_MSG) if options[:dynamo_db][:api_version]
       options[:dynamo_db][:api_version] = '2011-12-05'
       super(options)
     end

data/lib/aws/dynamo_db/batch_write.rb

@@ -240,8 +240,10 @@ module AWS
         case type
         when "S"  then { :s  => value }
         when "N"  then { :n  => value }
+        when "B"  then { :b  => value }
         when "SS" then { :ss => value }
         when "NS" then { :ns => value }
+        when "BS" then { :bs => value }
         else
           raise "unhandled key type: #{type.inspect}"
         end

data/lib/aws/dynamo_db/table.rb

@@ -154,15 +154,11 @@ module AWS
         end
       end
 
+      # Updates the provisioned throughput for this table.
       # @param [Hash] options
-      #
-      # @option options [Integer] :read_capacity_units
-      #
-      # @option options [Integer] :write_capacity_units
-      #
-      # @return [Hash] Returns a hash with the current throughput
-      #   provisioning (`:read_capacity_units` and `:write_capacity_units`).
-      #
+      # @option options [Integer] :read_capacity_units The desired read capacity units.
+      # @option options [Integer] :write_capacity_units The desired write capacity units.
+      # @return [Hash] Returns the given `options` hash.
       def provision_throughput options = {}
 
         options[:read_capacity_units] ||= read_capacity_units

data/lib/aws/ec2.rb

@@ -123,7 +123,7 @@ module AWS
   # In the following example we release all elastic IP addresses that are
   # not currently associated with an instance:
   #
-  #     ec2.select{|ip| !ip.associated? }.each(&:release)
+  #     ec2.elastic_ips.select{|ip| !ip.associated? }.each(&:release)
   #
   # ## Key Pairs
   #

data/lib/aws/ec2/client.rb

@@ -17,7 +17,7 @@ module AWS
     # Client class for Amazon Elastic Compute Cloud (EC2).
     class Client < Core::QueryClient
 
-      API_VERSION = '2013-10-15'
+      API_VERSION = '2014-05-01'
 
       def sign_request request
         version = @config.ec2_signature_version ?
@@ -31,6 +31,14 @@ module AWS
         end
       end
 
+      def retryable_error?(response)
+        if response.error.is_a?(Errors::InsufficientInstanceCapacity)
+          false
+        else
+          super
+        end
+      end
+
       # @api private
       CACHEABLE_REQUESTS = Set[
         :describe_addresses,
@@ -97,5 +105,60 @@ module AWS
       define_client_methods('2013-10-15')
     end
 
+    class Client::V20140201 < Client
+      define_client_methods('2014-02-01')
+    end
+
+    class Client::V20140501 < Client
+
+      define_client_methods('2014-05-01')
+
+      alias basic_copy_snapshot copy_snapshot
+
+      def copy_snapshot(params = {})
+        # Adding logic to auto-compute the destination group and presigned
+        # url params for the copy snapshot operation.  This is necessary
+        # when calling copy snapshot on snapshots for encrypted volumes.
+        # This addition should be transparent to the API user.
+        params = params.dup
+        params[:destination_region] = @region
+        params[:presigned_url] = presigned_copy_snapshot_url(params)
+        basic_copy_snapshot(params)
+      end
+
+      private
+
+      def presigned_copy_snapshot_url(params)
+        token = credential_provider.session_token
+
+        client = self.with_options(:ec2_region => params[:source_region])
+
+        req = client.build_request(:copy_snapshot, params)
+
+        now = req.remove_param("Timestamp").value
+        now = Time.parse(now).strftime("%Y%m%dT%H%M%SZ")
+
+        req.add_param("X-Amz-Algorithm", "AWS4-HMAC-SHA256")
+        req.add_param("X-Amz-Date", now)
+        req.add_param("X-Amz-SignedHeaders", 'host')
+        req.add_param("X-Amz-Expires", "3600")
+        req.add_param('X-Amz-Security-Token', token) if token
+        req.add_param("X-Amz-Credential", client.v4_signer.credential(now))
+
+        req.http_method = 'GET'
+        req.uri = '/?' + req.url_encoded_params
+        req.body = ''
+        req.headers.clear
+        req.headers['host'] = client.config.ec2_endpoint
+
+        key = client.v4_signer.derive_key(now)
+        sig = client.v4_signer.signature(req, key, now, client.v4_signer.class::EMPTY_DIGEST)
+
+        req.add_param('X-Amz-Signature', sig)
+
+        req.endpoint + '/?' + req.url_encoded_params
+      end
+
+    end
   end
 end

data/lib/aws/ec2/image_collection.rb

@@ -72,8 +72,7 @@ module AWS
 
       # @yield [image] Each image in the collection.
       # @return [nil]
-      def each &block
-        opts = {}
+      def each(opts = {}, &block)
         opts[:owners] = @owners.map { |id| id.to_s } unless @owners.empty?
         opts[:executable_users] = @executable_users.map { |id| id.to_s } unless
           @executable_users.empty?

data/lib/aws/ec2/instance.rb

@@ -40,7 +40,7 @@ module AWS
     # @attr [Boolean] ebs_optimized The instance must be in a stopped state to
     #   change the ebs_optimized state.
     #
-    # @attr [Boolean] api_termination_disabled True if the instance
+    # @attr [Boolean] api_termination_disabled? True if the instance
     #   cannot be terminated using the {#terminate} method.  This
     #   attribute can be changed at any time.
     #
@@ -267,7 +267,7 @@ module AWS
 
       describe_call_attribute :client_token
 
-      describe_call_attribute :image_id
+      describe_call_attribute :image_id, :static => true
 
       describe_call_attribute :key_name, :static => true
 
@@ -304,7 +304,7 @@ module AWS
       mutable_describe_call_attribute :ramdisk_id, :set_as => :ramdisk
 
       mutable_describe_attribute :source_dest_check do
-        translates_output{|bool| bool == "true" }
+        translates_output{|bool| bool.to_s == "true" }
       end
 
       alias_method :source_dest_check?, :source_dest_check

data/lib/aws/ec2/instance_collection.rb

@@ -12,7 +12,6 @@
 # language governing permissions and limitations under the License.
 
 require 'base64'
-require 'uuidtools'
 
 module AWS
   class EC2
@@ -118,6 +117,9 @@ module AWS
       #   availability zone where the instance should run.  Without
       #   this option, EC2 will choose an availability zone for you.
       #
+      # @option options [String] :placement_group Specifies the
+      #   cluster placement group where the instance should run.
+      #
       # @option options [String] :image_id ID of the AMI you want to
       #   launch.
       #
@@ -199,6 +201,8 @@ module AWS
       #   *NOTE:* EBS Optimized instances incur an additional service charge. This
       #   optional is only valid for certain instance types.
       #
+      # @option options [Boolean] :associate_public_ip_address (false)
+      #
       # @return [Instance or Array] If a single instance is being created,
       #   this returns an {EC2::Instance} to represent the newly
       #   created instance.  Otherwise it returns an array of instance
@@ -255,6 +259,11 @@ module AWS
           options.delete(:availability_zone)
         end
 
+        if options[:placement_group]
+          placement[:group_name] = options[:placement_group].to_s
+          options.delete(:placement_group)
+        end
+
         if options[:dedicated_tenancy]
           placement[:tenancy] = 'dedicated'
           options.delete(:dedicated_tenancy)
@@ -289,7 +298,7 @@ module AWS
 
         security_group_opts(options)
 
-        options[:client_token] = UUIDTools::UUID.timestamp_create.to_s
+        options[:client_token] = SecureRandom.uuid
 
         resp = client.run_instances(options)
 
@@ -308,7 +317,9 @@ module AWS
         response = filtered_request(:describe_instances)
         response.reservation_set.each do |reservation|
           reservation.instances_set.each do |i|
-            yield(Instance.new(i.instance_id, :config => config))
+            instance = Instance.new_from(:describe_instances, i,
+              i.instance_id, :config => config)
+            yield(instance)
           end
         end
       end

data/lib/aws/ec2/snapshot_collection.rb

@@ -29,7 +29,7 @@ module AWS
     #   snapshot.exists?
     #
     # @example Get a map of snapshot IDs to snapshot status
-    #   ec2.snapshots.inject({}) { |m, s| m[i.id] = s.status; m }
+    #   ec2.snapshots.inject({}) { |m, s| m[s.id] = s.status; m }
     #   # => { "snap-12345678" => :pending, "snap-87654321" => :completed }
     class SnapshotCollection < Collection
 

data/lib/aws/ec2/subnet_collection.rb

@@ -51,9 +51,13 @@ module AWS
       include TaggedCollection
       include Core::Collection::Simple
 
-      # Creates a Subnet.  Subnets require a valid CIDR block and
-      # are created inside a VPC.  If this collection does not
-      # have a
+      # Creates a Subnet.  Subnets require a valid CIDR block and are created
+      # inside an existing VPC. If you do not set an AvailabilityZone, then
+      # Amazon EC2 will select one for you (this is recommended).
+      #
+      # For complete information about creating subnets, see
+      # {http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSubnet.html
+      # CreateSubnet} in the Amazon EC2 API Reference.
       #
       # @param [String] cidr_block The CIDR block you want the subnet to
       #   cover (e.g., 10.0.0.0/24).

data/lib/aws/ec2/tagged_collection.rb

@@ -22,6 +22,20 @@ module AWS
     #
     module TaggedCollection
 
+      # Filters the collection by a paired tag key and value.
+      #
+      #    ec2.instances.with_tag('role', 'web')
+      #
+      # You can filter a single tag key with multiple values:
+      #
+      #    ec2.instances.with_tag('role', ['web', 'db'])
+      #
+      # @param [String] tag_key
+      # @param [String, Array<String>] tag_value
+      def with_tag(tag_key, *values)
+        filter("tag:#{tag_key}", *values)
+      end
+
       # Filter the collection by one or more tag keys.  If you pass multiple
       # tag keys they will be be treated as OR conditions.  If you want to
       # AND them together call tagged multiple times (chained).