aws-sdk-core 2.0.24 → 2.0.25

data/endpoints.json

@@ -11,9 +11,6 @@
     "us-gov-west-1/iam": {
       "endpoint": "iam.us-gov.amazonaws.com"
     },
-    "us-gov-west-1/sts": {
-      "endpoint": "sts.us-gov-west-1.amazonaws.com"
-    },
     "us-gov-west-1/s3": {
       "endpoint": "s3-{region}.amazonaws.com"
     },
@@ -29,9 +26,6 @@
     "*/route53": {
       "endpoint": "route53.amazonaws.com"
     },
-    "*/sts": {
-      "endpoint": "sts.amazonaws.com"
-    },
     "us-east-1/sdb": {
       "endpoint": "sdb.amazonaws.com"
     },

data/lib/aws-sdk-core.rb

@@ -57,6 +57,7 @@ module Aws
     SimpleDB
     SNS
     SQS
+    SSM
     StorageGateway
     STS
     Support

data/lib/aws-sdk-core/credential_provider_chain.rb

@@ -23,7 +23,11 @@ module Aws
         [:env_credentials, { prefix: 'AMAZON' }],
         [:env_credentials, { key:'AWS_ACCESS_KEY', secret:'AWS_SECRET_KEY' }],
         [:shared_credentials, {}],
-        [:instance_profile_credentials, {}],
+        [:instance_profile_credentials, {
+          retries: 0,
+          http_open_timeout: 1,
+          http_read_timeout: 1,
+        }],
       ]
     end
 
@@ -54,8 +58,8 @@ module Aws
       nil
     end
 
-    def instance_profile_credentials(*args)
-      InstanceProfileCredentials.new
+    def instance_profile_credentials(options)
+      InstanceProfileCredentials.new(options)
     end
 
   end

data/lib/aws-sdk-core/instance_profile_credentials.rb

@@ -25,22 +25,27 @@ module Aws
     ]
 
     # @param [Hash] options
-    # @option options [Integer] :retries (0) Number of times to retry
+    # @option options [Integer] :retries (5) Number of times to retry
     #   when retrieving credentials.
     # @option options [String] :ip_address ('169.254.169.254')
     # @option options [Integer] :port (80)
-    # @option options [Float] :http_open_timeout (1)
-    # @option options [Float] :http_read_timeout (1)
+    # @option options [Float] :http_open_timeout (5)
+    # @option options [Float] :http_read_timeout (5)
+    # @option options [Numeric, Proc] :delay By default, failures are retried
+    #   with exponential back-off, i.e. `sleep(1.2 ** num_failures)`. You can
+    #   pass a number of seconds to sleep between failed attempts, or
+    #   a Proc that accepts the number of failures.
     # @option options [IO] :http_debug_output (nil) HTTP wire
     #   traces are sent to this object.  You can specify something
     #   like $stdout.
     def initialize options = {}
-      @retries = options[:retries] || 0
+      @retries = options[:retries] || 5
       @ip_address = options[:ip_address] || '169.254.169.254'
       @port = options[:port] || 80
-      @http_open_timeout = options[:http_open_timeout] || 1
-      @http_read_timeout = options[:http_read_timeout] || 1
+      @http_open_timeout = options[:http_open_timeout] || 5
+      @http_read_timeout = options[:http_read_timeout] || 5
       @http_debug_output = options[:http_debug_output]
+      @backoff = backoff(options[:backoff])
       super
     end
 
@@ -50,6 +55,14 @@ module Aws
 
     private
 
+    def backoff(backoff)
+      case backoff
+      when Proc then backoff
+      when Numeric then lambda { |_| sleep(backoff) }
+      else lambda { |num_failures| Kernel.sleep(1.2 ** num_failures) }
+      end
+    end
+
     def refresh
       credentials = MultiJson.load(get_credentials)
       @access_key_id = credentials['AccessKeyId']
@@ -72,7 +85,7 @@ module Aws
         end
       rescue *FAILURES => e
         if failed_attempts < @retries
-          backoff(failed_attempts)
+          @backoff.call(failed_attempts)
           failed_attempts += 1
           retry
         else
@@ -81,10 +94,6 @@ module Aws
       end
     end
 
-    def backoff(failed_attempts)
-      Kernel.sleep(2 ** failed_attempts)
-    end
-
     def open_connection
       http = Net::HTTP.new(@ip_address, @port, nil)
       http.open_timeout = @http_open_timeout

data/lib/aws-sdk-core/plugins/s3_request_signer.rb

@@ -6,7 +6,7 @@ module Aws
     # @api private
     class S3RequestSigner < Seahorse::Client::Plugin
 
-      class SigningHandler < Seahorse::Client::Handler
+      class SigningHandler < RequestSigner::Handler
 
         # List of regions that support older S3 signature versions.
         # All new regions only support signature version 4.
@@ -23,6 +23,7 @@ module Aws
         ))
 
         def call(context)
+          require_credentials(context)
           version = signature_version(context)
           case version
           when /v4/ then apply_v4_signature(context)

data/lib/aws-sdk-core/shared_credentials.rb

@@ -91,7 +91,7 @@ module Aws
         if section
           current_section = section[1]
         elsif current_section
-          item = line.match(/^\s*(.+?)\s*=\s*(.+)\s*$/) unless line.nil?
+          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]

data/lib/aws-sdk-core/ssm.rb

@@ -0,0 +1,4 @@
+Aws.add_service(:SSM, {
+  api: File.join(Aws::API_DIR, 'SSM.api.json'),
+  docs: File.join(Aws::API_DIR, 'SSM.docs.json'),
+})

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.24'
+  VERSION = '2.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.25
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -66,8 +66,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Provides API clients for AWS.
-email: 
+description: Provides API clients for AWS. This gem is part of the official AWS SDK
+  for Ruby.
+email:
+- trevrowe@amazon.com
 executables:
 - aws.rb
 extensions: []
@@ -161,6 +163,7 @@ files:
 - apis/SNS.resources.json
 - apis/SQS.api.json
 - apis/SQS.paginators.json
+- apis/SSM.api.json
 - apis/STS.api.json
 - apis/SWF.api.json
 - apis/SWF.paginators.json
@@ -292,6 +295,7 @@ files:
 - lib/aws-sdk-core/simpledb.rb
 - lib/aws-sdk-core/sns.rb
 - lib/aws-sdk-core/sqs.rb
+- lib/aws-sdk-core/ssm.rb
 - lib/aws-sdk-core/storagegateway.rb
 - lib/aws-sdk-core/structure.rb
 - lib/aws-sdk-core/sts.rb
@@ -353,7 +357,7 @@ files:
 - lib/seahorse/model/shapes.rb
 - lib/seahorse/util.rb
 - lib/seahorse/version.rb
-homepage: http://github.com/aws/aws-sdk-core-ruby
+homepage: http://github.com/aws/aws-sdk-ruby
 licenses:
 - Apache 2.0
 metadata: {}