fog-aws 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507acde666f266cc70e6346a9274bcf1e1bff19c
-  data.tar.gz: 105bb905004f27b5336ff4f17feb006164feef21
+  metadata.gz: 6337216d400d2563de64b38f700c73f5c35c1b9d
+  data.tar.gz: 014d339b4064fe6d22b6114817225778c3b131ee
 SHA512:
-  metadata.gz: 6403c1fc64c5cc9396f4671118897c6be37aa49e88b09f8e96cdbe9f5ef68f18e087ec52a03755d53f04c4991f4616f6064e386bff3cdaa0d5dd084e7537d43e
-  data.tar.gz: d5e45bdab2ee7dca720cc549ba6dd0202f1d9d60d98c3b2e178e36fb6910c72ac069a6197c2cf6167b8741067bc2d41280ace84430f0c2c59afe3580d1cb7f15
+  metadata.gz: 52648d0ea0a5f618477d8db41edf397064796c475871b857a916650c1b7d3f295dd094f286a7b5cdc7c816e57379b4d1e3545e8b2b26bd8a67561e6d4275932e
+  data.tar.gz: 36a0947508b7d40a7ff78b20763a84ece69d7b7b439fcc2e15d34743f99d934ed4f761d2d3971e08131f2b4e334071332096034915a197a01458895d0a7fad66

data/CHANGELOG.md

@@ -2,7 +2,29 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v1.2.1...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.3.0...HEAD)
+
+**Closed issues:**
+
+- Support REST Bucket Get v2 [\#369](https://github.com/fog/fog-aws/issues/369)
+- Fog::AWS::IAM::Error: InvalidAction =\> Could not find operation "ReplaceIamInstanceProfileAssociation" for version 2010-05-08 [\#368](https://github.com/fog/fog-aws/issues/368)
+- Multipart upload fails on empty files [\#364](https://github.com/fog/fog-aws/issues/364)
+- The action `ModifyVolume` is not valid for this web service. [\#363](https://github.com/fog/fog-aws/issues/363)
+- Tag instances upon creation of new instance [\#359](https://github.com/fog/fog-aws/issues/359)
+- Cache/read local amazon data [\#354](https://github.com/fog/fog-aws/issues/354)
+
+**Merged pull requests:**
+
+- add NextContinuationToken support to GetBucket operation [\#370](https://github.com/fog/fog-aws/pull/370) ([khoan](https://github.com/khoan))
+- Add a top-level require that matches the gem name [\#367](https://github.com/fog/fog-aws/pull/367) ([lanej](https://github.com/lanej))
+- Fixed credential refresh when instance metadata host is inaccessible [\#366](https://github.com/fog/fog-aws/pull/366) ([ankane](https://github.com/ankane))
+- Handle multipart upload of empty files [\#365](https://github.com/fog/fog-aws/pull/365) ([fcheung](https://github.com/fcheung))
+- Add p2 instance types [\#362](https://github.com/fog/fog-aws/pull/362) ([Caged](https://github.com/Caged))
+- Exponential backoff [\#361](https://github.com/fog/fog-aws/pull/361) ([VVMichaelSawyer](https://github.com/VVMichaelSawyer))
+- Skip call to instance metadata host if region is specified [\#360](https://github.com/fog/fog-aws/pull/360) ([ankane](https://github.com/ankane))
+
+## [v1.3.0](https://github.com/fog/fog-aws/tree/v1.3.0) (2017-03-29)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.2.1...v1.3.0)
 
 **Closed issues:**
 

data/lib/fog-aws.rb

@@ -0,0 +1 @@
+require 'fog/aws'

data/lib/fog/aws/compute.rb

@@ -3,6 +3,8 @@ module Fog
     class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
+      class RequestLimitExceeded < Fog::Errors::Error; end
+
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name, :version
 
@@ -537,7 +539,11 @@ module Fog
           end
         end
 
-        def _request(body, headers, idempotent, parser)
+        def _request(body, headers, idempotent, parser, retries = 0)
+
+          max_retries = 10
+
+          begin
           @connection.request({
               :body       => body,
               :expects    => 200,
@@ -546,15 +552,24 @@ module Fog
               :method     => 'POST',
               :parser     => parser
             })
-        rescue Excon::Errors::HTTPStatusError => error
-          match = Fog::AWS::Errors.match_error(error)
-          raise if match.empty?
-          raise case match[:code]
+          rescue Excon::Errors::HTTPStatusError => error
+            match = Fog::AWS::Errors.match_error(error)
+            raise if match.empty?
+            raise case match[:code]
                 when 'NotFound', 'Unknown'
                   Fog::Compute::AWS::NotFound.slurp(error, match[:message])
+                when 'RequestLimitExceeded'
+                  if retries < max_retries
+                    sleep (2.0 ** (1.0 + retries) * 100) / 1000.0
+                    retries += 1
+                    retry
+                  else
+                    Fog::Compute::AWS::RequestLimitExceeded.slurp(error, "Max retries exceeded (#{max_retries}) #{match[:code]} => #{match[:message]}")
+                  end
                 else
                   Fog::Compute::AWS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
                 end
+          end
         end
       end
     end

data/lib/fog/aws/credential_fetcher.rb

@@ -16,7 +16,7 @@ module Fog
           if options[:use_iam_profile]
             begin
               role_data = nil
-              az_data = nil
+              region = options[:region]
 
               if ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
                 connection = options[:connection] || Excon.new(CONTAINER_CREDENTIALS_HOST)
@@ -24,16 +24,14 @@ module Fog
                 role_data = connection.get(:path => credential_path, :idempotent => true, :expects => 200).body
 
                 connection = options[:metadata_connection] || Excon.new(INSTANCE_METADATA_HOST)
-                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body
+                region ||= connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body[0..-2]
               else
                 connection = options[:connection] || Excon.new(INSTANCE_METADATA_HOST)
                 role_name = connection.get(:path => INSTANCE_METADATA_PATH, :idempotent => true, :expects => 200).body
                 role_data = connection.get(:path => INSTANCE_METADATA_PATH+role_name, :idempotent => true, :expects => 200).body
-                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body
+                region ||= connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body[0..-2]
               end
 
-              region = az_data[0..-2] # get region from az
-
               session = Fog::JSON.decode(role_data)
               credentials = {}
               credentials[:aws_access_key_id] = session['AccessKeyId']
@@ -70,7 +68,7 @@ module Fog
 
         def refresh_credentials
           if @use_iam_profile
-            new_credentials = service.fetch_credentials :use_iam_profile => @use_iam_profile
+            new_credentials = service.fetch_credentials :use_iam_profile => @use_iam_profile, :region => @region
             if new_credentials.any?
               setup_credentials new_credentials
               return true

data/lib/fog/aws/models/compute/flavors.rb

@@ -683,6 +683,36 @@ module Fog
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "p2.xlarge",
+          :name                    => "General Purpose GPU Extra Large",
+          :bits                    => 64,
+          :cores                   => 2496,
+          :ram                     => 65498,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "p2.8xlarge",
+          :name                    => "General Purpose GPU Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 19968,
+          :ram                     => 523986,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "p2.16xlarge",
+          :name                    => "General Purpose GPU Sixteen Extra Large",
+          :bits                    => 64,
+          :cores                   => 39936,
+          :ram                     => 785979,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         }
       ]
 

data/lib/fog/aws/models/storage/file.rb

@@ -276,6 +276,11 @@ module Fog
             part_tags << part_upload.headers["ETag"]
           end
 
+          if part_tags.empty? #it is an error to have a multipart upload with no parts
+            part_upload = service.upload_part(directory.key, key, upload_id, 1, '', part_headers('', options))
+            part_tags << part_upload.headers["ETag"]
+          end
+
         rescue
           # Abort the upload & reraise
           service.abort_multipart_upload(directory.key, key, upload_id) if upload_id

data/lib/fog/aws/parsers/storage/get_bucket.rb

@@ -35,7 +35,7 @@ module Fog
               end
             when 'LastModified'
               @object['LastModified'] = Time.parse(value)
-            when 'Marker', 'Name'
+            when 'Marker', 'Name', 'NextContinuationToken'
               @response[name] = value
             when 'MaxKeys'
               @response['MaxKeys'] = value.to_i

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

data/tests/models/storage/file_tests.rb

@@ -74,6 +74,18 @@ Shindo.tests("Storage[:aws] | file", ["aws"]) do
 
     end
 
+    tests("multipart upload with empty file") do
+      pending if Fog.mocking?
+
+      @empty_file = Tempfile.new("fog-test-aws-s3-multipart-empty")
+     
+      tests("#save(:multipart_chunk_size => 5242880)").succeeds do
+        @directory.files.create(:key => 'empty-multipart-upload', :body => @empty_file, :multipart_chunk_size => 5242880)
+      end
+
+      @empty_file.close
+    end
+
     tests("multipart upload with customer encryption").returns(true) do
       pending if Fog.mocking?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,6 +147,7 @@ files:
 - gemfiles/Gemfile-ruby-1.8.7
 - gemfiles/Gemfile-ruby-1.9
 - gemfiles/Gemfile-ruby-2.0
+- lib/fog-aws.rb
 - lib/fog/aws.rb
 - lib/fog/aws/auto_scaling.rb
 - lib/fog/aws/beanstalk.rb
@@ -1698,7 +1699,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.