aws-sdk-v1 1.54.0 → 1.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cc3c43b9f242437b98a559ad99666e50709b92
-  data.tar.gz: 7cb63559555044a4732bbaf229ef8d120a378a66
+  metadata.gz: 00ae7ed02850c7e4e23ea26b1b1efe6c739a456d
+  data.tar.gz: e7394ac1815b813ea14c1c534dd6643c8aa12fbd
 SHA512:
-  metadata.gz: e5b9feb784ae55d047041c70b6c054d6e03580207e065c1dbcb4009641f4fc0c27be58679b26de012434d4bed1a2156317aaf5dbc406d320c7176091db895274
-  data.tar.gz: 2663ec4f188e14684f682344441727f16bb40209fbd0ce5d3cf94516e3e9bff287e890294deeff2a2bee737928d6f01002699d0abd05162266cf66bf6b3d937e
+  metadata.gz: e3848fee9c1e29345a3c3f1c3a2e66fd214cf6a7a9214fb3d0bfb75d713a8c97c40c1b03029bf9837669c307b976d8f998513a4eaa0ce45624d157bf437f4a93
+  data.tar.gz: 62c6aea9c28fb36a43814fb21619ed4594e8652a5ac0024e9c20206c4faf95ad93e769899878bcc8ad406a5672f9e90501f99c8624f76c7f590530200723f76f

data/README.md

@@ -82,6 +82,14 @@ ec2.instances['i-12345678'].tags.to_h
 
 See the [API Documentation](http://docs.aws.amazon.com/AWSRubySDK/latest/frames.html) for more examples.
 
+## Testing
+
+All HTTP requests to live services can be globally mocked (e.g. from within the `spec_helper.rb` file):
+
+```
+AWS.stub!
+```
+
 ## Links of Interest
 
 * [API Documentation](http://docs.aws.amazon.com/AWSRubySDK/latest/frames.html)

data/bin/aws-rb

@@ -104,7 +104,7 @@ options[:load_paths].each do |path|
   $LOAD_PATH.unshift(path)
 end
 
-require 'aws-sdk'
+require 'aws-sdk-v1'
 
 # configure the aws-sdk gem
 

data/lib/aws/core.rb

@@ -678,7 +678,7 @@ module AWS
         versions = {}
         pattern = File.join(File.dirname(__FILE__), 'api_config', '*.yml')
         Dir.glob(pattern).each do |path|
-          matches = path.match(/(\w+)-(\d{4}-\d{2}-\d{2})/)
+          path.match(/(\w+)-(\d{4}-\d{2}-\d{2})/)
           svc = SERVICES[$1].full_name
           versions[svc] ||= []
           versions[svc] << $2

data/lib/aws/core/credential_providers.rb

@@ -354,6 +354,8 @@ module AWS
         # @param [Hash] options
         # @option options [String] :ip_address ('169.254.169.254')
         # @option options [Integer] :port (80)
+        # @option options [Integer] :retries (0) Number of times to
+        #   retry retrieving credentials.
         # @option options [Float] :http_open_timeout (1)
         # @option options [Float] :http_read_timeout (1)
         # @option options [Object] :http_debug_output (nil) HTTP wire
@@ -362,6 +364,7 @@ module AWS
         def initialize options = {}
           @ip_address = options[:ip_address] || '169.254.169.254'
           @port = options[:port] || 80
+          @retries = options[:retries] || 0
           @http_open_timeout = options[:http_open_timeout] || 1
           @http_read_timeout = options[:http_read_timeout] || 1
           @http_debug_output = options[:http_debug_output]
@@ -373,6 +376,9 @@ module AWS
         # @return [Integer] Defaults to port 80.
         attr_accessor :port
 
+        # @return [Integer] Defaults to 0
+        attr_accessor :retries
+
         # @return [Float]
         attr_accessor :http_open_timeout
 
@@ -404,6 +410,8 @@ module AWS
 
         # (see Provider#get_credentials)
         def get_credentials
+          retries_left = retries
+
           begin
 
             http = Net::HTTP.new(ip_address, port, nil)
@@ -432,7 +440,15 @@ module AWS
             credentials
 
           rescue *FAILURES => e
-            {}
+            if retries_left > 0
+              sleep_time = 2 ** (retries - retries_left)
+              Kernel.sleep(sleep_time)
+
+              retries_left -= 1
+              retry
+            else
+              {}
+            end
           end
         end
 
@@ -566,7 +582,7 @@ module AWS
 
         include Provider
 
-        # @option options [AWS::STS] :sts (STS.new) An instance of {AWS::STS}. 
+        # @option options [AWS::STS] :sts (STS.new) An instance of {AWS::STS}.
         #   This is used to make the API call to assume role.
         # @option options [required, String] :role_arn
         # @option options [required, String] :role_session_name

data/lib/aws/core/data.rb

@@ -241,6 +241,11 @@ module AWS
         end
         alias_method :is_a?, :kind_of?
 
+        # @api private
+        def empty?
+          @data.empty?
+        end
+
       end
     end
   end

data/lib/aws/core/http/curb_handler.rb

@@ -19,7 +19,7 @@ module AWS
 
       # @api private
       class CurbHandler
-
+        class NetworkError < StandardError; end
         def initialize
           @q = []
           @sem = Mutex.new
@@ -133,6 +133,9 @@ module AWS
 
           curl.on_complete do
             response.status = curl.response_code
+            unless curl.response_code > 0
+              response.network_error = NetworkError.new('Empty response. Assume network error.')
+            end
             unless read_block
               response.body = buffer.join("")
             end

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

@@ -231,7 +231,8 @@ 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
+            milliseconds = parts.pop
+            parts[-1] = parts[-1] + "0.#{milliseconds}".to_f
             klass.send(parts_constructor, *parts)
           else
             # fallback in case we have to handle another date format

data/lib/aws/ec2/instance_collection.rb

@@ -105,6 +105,7 @@ module AWS
       #       * `:volume_type` - (String) Valid values include:
       #         * `standard`
       #         * `io1`
+      #         * `gp2`
       #       * `:iops` - (Integer)
       #     * `:no_device` - (String) Specifies the device name to suppress
       #       during instance launch.

data/lib/aws/rails.rb

@@ -104,7 +104,7 @@ module AWS
 
       path = Pathname.new("#{rails_root}/config/aws.yml")
 
-      if File.exists?(path)
+      if File.exist?(path)
         cfg = YAML::load(ERB.new(File.read(path)).result)
         unless cfg[rails_env]
           raise "config/aws.yml is missing a section for `#{rails_env}`"

data/lib/aws/route_53/change_batch.rb

@@ -128,6 +128,7 @@ module AWS
         q[:resource_record_set][:ttl] = @change_options[:ttl] if @change_options[:ttl]
         q[:resource_record_set][:resource_records] = @change_options[:resource_records] if @change_options[:resource_records]
         q[:resource_record_set][:alias_target] = @change_options[:alias_target] if @change_options[:alias_target]
+        q[:resource_record_set][:geo_location] = @change_options[:geo_location] if @change_options[:geo_location]
         q[:resource_record_set][:failover] = @change_options[:failover] if @change_options[:failover]
         q[:resource_record_set][:health_check_id] = @change_options[:health_check_id] if @change_options[:health_check_id]
         q

data/lib/aws/route_53/resource_record_set.rb

@@ -119,6 +119,12 @@ module AWS
         @create_options[:ttl] = new_ttl
       end
 
+      attribute :geo_location
+
+      def geo_location= new_geo_location
+        @create_options[:geo_location] = new_geo_location
+      end
+
       attribute :failover
 
       def failover= new_failover
@@ -241,6 +247,7 @@ module AWS
           options[:region] = region if region
           options[:ttl] = ttl if ttl
           options[:resource_records] = resource_records if resource_records && !resource_records.empty?
+          options[:geo_location] = geo_location if geo_location
           options[:failover] = failover if failover
           options[:health_check_id] = health_check_id if health_check_id
         end

data/lib/aws/s3/bucket.rb

@@ -238,11 +238,12 @@ module AWS
 
       # Returns the url for this bucket.
       # @return [String] url to the bucket
-      def url
+      def url(options = {})
+        protocol = options.fetch(:secure, false) ? "https://" : "http://"
         if client.dns_compatible_bucket_name?(name)
-          "http://#{name}.s3.amazonaws.com/"
+          "#{protocol}#{name}.s3.amazonaws.com/"
         else
-          "http://s3.amazonaws.com/#{name}/"
+          "#{protocol}s3.amazonaws.com/#{name}/"
         end
       end
 

data/lib/aws/s3/client.rb

@@ -51,10 +51,7 @@ module AWS
       # @param [Core::Http::Request] request
       # @api private
       def sign_request request
-        version = @config.s3_signature_version ?
-          @config.s3_signature_version.to_sym :
-          (@region =~ /cn-/ ? :v4 : :v3)
-        case version
+        case @config.s3_signature_version
         when :v4 then v4_signer.sign_request(request)
         when :v3 then v3_signer.sign_request(request)
         else

data/lib/aws/s3/config.rb

@@ -36,14 +36,25 @@ AWS::Core::Configuration.module_eval do
   add_option :s3_cache_object_attributes, false, :boolean => true
 
   add_option :s3_signature_version do |config, value|
-    if config.s3_region.match(/^cn-/)
-      :v4
-    elsif value
+    v3_regions = %w(
+      us-east-1
+      us-west-1
+      us-west-2
+      ap-northeast-1
+      ap-southeast-1
+      ap-southeast-2
+      sa-east-1
+      eu-west-1
+      us-gov-west-1
+    )
+    if value
       value
     elsif config.s3 && config.s3[:signature_version]
       config.s3[:signature_version]
-    else
+    elsif v3_regions.include?(config.s3_region)
       :v3
+    else
+      :v4
     end
   end
 

data/lib/aws/s3/presign_v4.rb

@@ -55,7 +55,7 @@ module AWS
         signed_headers = 'Host'
 
         if options[:acl]
-          request.add_param("X-Amz-Acl", options[:acl].to_s.gsub(/_/, '-'))
+          request.add_param("x-amz-acl", options[:acl].to_s.gsub(/_/, '-'))
         end
 
         # must be sent along with the PUT request headers

data/lib/aws/s3/s3_object.rb

@@ -805,9 +805,9 @@ module AWS
       #
       # @param [Hash] options
       #
-      # @option options [String] :bucket_name The name of the bucket
-      #   the source object can be found in.  Defaults to the current
-      #   object's bucket.
+      # @option options [String] :bucket_name The slash-prefixed name of
+      #   the bucket the source object can be found in.  Defaults to the
+      #   current object's bucket.
       #
       # @option options [Bucket] :bucket The bucket the source object
       #   can be found in.  Defaults to the current object's bucket.
@@ -873,17 +873,20 @@ module AWS
         options[:copy_source] =
           case source
           when S3Object
-            "#{source.bucket.name}/#{source.key}"
+            "/#{source.bucket.name}/#{source.key}"
           when ObjectVersion
             options[:version_id] = source.version_id
-            "#{source.object.bucket.name}/#{source.object.key}"
+            "/#{source.object.bucket.name}/#{source.object.key}"
           else
             if options[:bucket]
-              "#{options.delete(:bucket).name}/#{source}"
+              "/#{options.delete(:bucket).name}/#{source}"
             elsif options[:bucket_name]
+              # oops, this should be slash-prefixed, but unable to change
+              # this without breaking users that already work-around this
+              # bug by sending :bucket_name => "/bucket-name"
               "#{options.delete(:bucket_name)}/#{source}"
             else
-              "#{self.bucket.name}/#{source}"
+              "/#{self.bucket.name}/#{source}"
             end
           end
 
@@ -936,9 +939,9 @@ module AWS
       #
       # @param [Hash] options
       #
-      # @option options [String] :bucket_name The name of the bucket
-      #   the object should be copied into.  Defaults to the current object's
-      #   bucket.
+      # @option options [String] :bucket_name The slash-prefixed name of the
+      #   bucket the object should be copied into.  Defaults to the current
+      #   object's bucket.
       #
       # @option options [Bucket] :bucket The bucket the target object
       #   should be copied into. Defaults to the current object's bucket.

data/lib/aws/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-v1
 version: !ruby/object:Gem::Version
-  version: 1.54.0
+  version: 1.55.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri