aws-sdk 1.39.0 → 1.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1944c9e7028cdb44606ba7face978c623e671606
-  data.tar.gz: 66772a9d7f1682dfad98b9bc21615d74f3acdb9c
+  metadata.gz: 9ff845ab34b9f0b173f208041f10c01b8f785d9b
+  data.tar.gz: 1be0ec46d195079cdd6719035235dd8c5d7742db
 SHA512:
-  metadata.gz: 4ae299a34d8855a9e79b4dfb5dd05201371286b475401f9083965e6ca216784b3e7dfa14dfb7ca38ce37bd9057fb029828d8b9728af622fc4500a8b7950a0368
-  data.tar.gz: 5390fd465d6c00c1bdd44e662ca363e056acfdaf13e60854516df0bd945a110b6f7d39f5452b7332c19feab502846c1a70465299bd9247f02f2db7f4168169a3
+  metadata.gz: cb869d3622bb68072522b7b7a51701d24c4d07c990bde2f267333ea091345fea9dabab662574d48e563bcf93cdfba05790b500f212320127b5d8850732bd6058
+  data.tar.gz: 0d6d5420c57603d8e49663c97f279ff0ceb63101d4d6a5b65cb063c366521ac9eff174cb0cfe66821e8b5cfcad8b87d3a04a285443140ab5f177e858ba864cc0

data/lib/aws/api_config/SQS-2012-11-05.yml

@@ -229,6 +229,10 @@
     - :list:
       - :string
     - :rename: AttributeNames
+    MessageAttributeName:
+    - :list:
+      - :string
+    - :rename: MessageAttributeNames
     MaxNumberOfMessages:
     - :integer
     VisibilityTimeout:
@@ -249,6 +253,23 @@
                 :map:
                 - Name
                 - Value
+              MessageAttribute:
+                :rename: :message_attributes
+                :map:
+                - Name
+                - Value
+                :children:
+                  Value:
+                    :children:
+                      BinaryValue:
+                        :type: :blob
+                      StringListValue:
+                        :list: true
+                        :rename: :string_list_values
+                      BinaryListValue:
+                        :list: true
+                        :rename: :binary_list_values
+                        :type: :blob
 - :name: RemovePermission
   :method: :remove_permission
   :inputs:
@@ -273,6 +294,31 @@
     - :required
     DelaySeconds:
     - :integer
+    MessageAttribute:
+    - :map:
+        :key:
+        - :string
+        :value:
+        - :structure:
+            StringValue:
+            - :string
+            BinaryValue:
+            - :blob
+            StringListValue:
+            - :list:
+              - :string
+            - :rename: StringListValues
+            BinaryListValue:
+            - :list:
+              - :blob
+            - :rename: BinaryListValues
+            DataType:
+            - :string
+            - :required
+        :key_param: Name
+        :value_param: Value
+        :flattened: true
+    - :rename: MessageAttributes
   :outputs:
     :children:
       SendMessageResult:
@@ -294,6 +340,31 @@
           - :required
           DelaySeconds:
           - :integer
+          MessageAttribute:
+          - :map:
+              :key:
+              - :string
+              :value:
+              - :structure:
+                  StringValue:
+                  - :string
+                  BinaryValue:
+                  - :blob
+                  StringListValue:
+                  - :list:
+                    - :string
+                  - :rename: StringListValues
+                  BinaryListValue:
+                  - :list:
+                    - :blob
+                  - :rename: BinaryListValues
+                  DataType:
+                  - :string
+                  - :required
+              :key_param: Name
+              :value_param: Value
+              :flattened: true
+          - :rename: MessageAttributes
     - :required
     - :rename: Entries
   :outputs:

data/lib/aws/cloud_watch/alarm.rb

@@ -161,6 +161,9 @@ module AWS
       #     * 'LessThanThreshold'
       #     * 'LessThanOrEqualToThreshold'
       #
+      # @option options [String,required] :namespace The namespace for the
+      #   alarm's associated metric.
+      #
       # @option options [Integer,required] :evaluation_periods The number
       #   of periods over which data is compared to the specified threshold.
       #

data/lib/aws/core.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -168,6 +168,7 @@ module AWS
     autoload :Endpoints, "#{SRC}/core/endpoints"
     autoload :IndifferentHash, "#{SRC}/core/indifferent_hash"
     autoload :Inflection, "#{SRC}/core/inflection"
+    autoload :IniParser, "#{SRC}/core/ini_parser"
     autoload :JSONParser, "#{SRC}/core/json_parser"
 
     autoload :JSONClient, "#{SRC}/core/json_client"

data/lib/aws/core/client.rb

@@ -202,6 +202,7 @@ module AWS
       def new_response(*args, &block)
         resp = Response.new(*args, &block)
         resp.config = config
+        resp.api_version = self.class::API_VERSION
         resp
       end
 

data/lib/aws/core/credential_providers.rb

@@ -118,6 +118,7 @@ module AWS
           @providers << ENVProvider.new('AWS')
           @providers << ENVProvider.new('AWS', :access_key_id => 'ACCESS_KEY', :secret_access_key => 'SECRET_KEY', :session_token => 'SESSION_TOKEN')
           @providers << ENVProvider.new('AMAZON')
+          @providers << SharedCredentialFileProvider.new if Dir.home rescue ArgumentError
           @providers << EC2Provider.new
         end
 
@@ -236,7 +237,7 @@ module AWS
 
         attr_reader :credential_file
 
-        # @param [Sring] credential_file The file path of a credential file
+        # @param [String] credential_file The file path of a credential file
         def initialize(credential_file)
           @credential_file = credential_file
         end
@@ -259,6 +260,58 @@ module AWS
         end
       end
 
+      class SharedCredentialFileProvider
+
+        include Provider
+
+        # @api private
+        KEY_MAP = {
+          "aws_access_key_id" => :access_key_id,
+          "aws_secret_access_key" => :secret_access_key,
+          "aws_session_token" => :session_token,
+        }
+
+        # @option [String] :path
+        # @option [String] :profile
+        def initialize(options = {})
+          @path = options[:path] || File.join(Dir.home, '.aws', 'credentials')
+          @profile_name = options[:profile_name]
+          @profile_name ||= ENV['AWS_PROFILE']
+          @profile_name ||= 'default'
+        end
+
+        # @return [String]
+        attr_reader :path
+
+        # @return [String]
+        attr_reader :profile_name
+
+        # (see Provider#get_credentials)
+        def get_credentials
+          if File.exist?(path) && File.readable?(path)
+            load_from_path
+          else
+            {}
+          end
+        end
+
+        private
+
+        def load_from_path
+          profile = load_profile
+          KEY_MAP.inject({}) do |credentials, (source, target)|
+            credentials[target] = profile[source] if profile.key?(source)
+            credentials
+          end
+        end
+
+        def load_profile
+          ini = IniParser.parse(File.read(path))
+          ini[profile_name] || {}
+        end
+
+      end
+
       # This credential provider tries to get credentials from the EC2
       # metadata service.
       class EC2Provider

data/lib/aws/core/ini_parser.rb

@@ -0,0 +1,42 @@
+# Copyright 2011-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  module Core
+
+    # @api private
+    module IniParser
+
+      def self.parse(ini)
+        current_section = {}
+        map = {}
+        ini.split(/\r?\n/).each do |line|
+          line = line.split(/^|\s;/).first # remove comments
+          section = line.match(/^\s*\[([^\[\]]+)\]\s*$/) unless line.nil?
+          if section
+            current_section = section[1]
+          elsif current_section
+            item = line.match(/^\s*(.+?)\s*=\s*(.+)\s*$/) unless line.nil?
+            if item
+              map[current_section] = map[current_section] || {}
+              map[current_section][item[1]] = item[2]
+            end
+          end  
+        end
+        map
+      end
+
+    end
+
+  end
+end

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/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/emr/job_flow_collection.rb

@@ -132,11 +132,10 @@ module AWS
       #     # enumerate jobs that are more than an hour old
       #     emr.job_flows.created_before(Time.now - 3600).each{|job| ... }
       #
-      # @param [Time,DateTime,Date] time
+      # @param [Time,DateTime,Date,Integer] time
       # @return [JobFlowCollection]
       def created_before time
-        time = time.iso8601 if time.respond_to?(:iso8601)
-        filter(:created_before, time)
+        filter(:created_before, time.to_i)
       end
 
       # Returns a new collection that will only enumerate job flows that
@@ -145,11 +144,10 @@ module AWS
       #     # enumerate jobs that are at most 1 hour old
       #     emr.job_flows.created_after(Time.now - 3600).each{|job| ... }
       #
-      # @param [Time,DateTime,Date] time
+      # @param [Time,DateTime,Date,Integer] time
       # @return [JobFlowCollection]
       def created_after time
-        time = time.iso8601 if time.respond_to?(:iso8601)
-        filter(:created_after, time)
+        filter(:created_after, time.to_i)
       end
 
       # @param [String,Symbol] name

data/lib/aws/s3/presign_v4.rb

@@ -54,16 +54,12 @@ module AWS
         request.headers['host'] = request.host
         signed_headers = 'Host'
 
-        # must be sent along with the PUT request headers
         if options[:acl]
-          request.headers['X-Amz-Acl'] = options[:acl].to_s.gsub(/_/, '-')
-          signed_headers << ';X-Amz-Acl'
+          request.add_param("X-Amz-Acl", options[:acl].to_s.gsub(/_/, '-'))
         end
 
-        # must be sent along with the PUT request headers
         if options[:content_md5]
-          request.headers['Content-MD5'] = options[:content_md5]
-          signed_headers << ';Content-MD5'
+          request.add_param("Content-MD5", options[:content_md5])
         end
 
         request_params = Core::Signers::S3::QUERY_PARAMS.map do |p|

data/lib/aws/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.39.0
+  version: 1.40.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -132,6 +132,7 @@ files:
 - lib/aws/core/http/response.rb
 - lib/aws/core/indifferent_hash.rb
 - lib/aws/core/inflection.rb
+- lib/aws/core/ini_parser.rb
 - lib/aws/core/json_client.rb
 - lib/aws/core/json_parser.rb
 - lib/aws/core/json_request_builder.rb