fog-aws 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac0628bad4edf849a2b1395bd829d18ae77bff352841e68fbc7ecdb475ef82b
-  data.tar.gz: 5a545b7e8ad44c321273fac7b87b11b79be3a9af1c2d038b2790ea95c529df30
+  metadata.gz: b7361a3fa82cc86bf32908aa54819a2efb8485e6639cbe9cd62a0e3bedb8e422
+  data.tar.gz: d0b4dea28aecb3a18b887ce40437baa868f38ebd83fa69e13ecf912d0aba3df8
 SHA512:
-  metadata.gz: 06156a44eec55618672a3d5beed5d35c0e7195ba07a3a515e944db462edbd6b4e56f6ff693bd5dd0013090c2083f395cf9f310013a164d3a3163c7ea82f96b9e
-  data.tar.gz: ebf606599061ed26cf2f1995e91690aebb7b409b15fe1d6ee465ef3e36a87b9c714e376e9bf6fee9c276a45a994972d94a24ef49d27f92e8b64ee6a47a9ae082
+  metadata.gz: 9d7602d22a1abab86581a0b4500c00b545af1264e46fac5648d70d0a2fc9dd157ffa37bf289b87aaa08836aa12d7f2cd67ea4437e2732796c7e089811ca2b029
+  data.tar.gz: 9e90b2ae4aeeb8170630825f49fa2500f56b45bcaa38dade2b72b7019a1db5d93d9634645301aa0706f1df25e118d03fe5b9e6a11e2a9f47e78e82dd9790cb7d

data/.travis.yml

@@ -29,6 +29,41 @@ matrix:
     gemfile: gemfiles/Gemfile-edge
   - rvm: jruby-head
     gemfile: Gemfile
+# ppc64le specific changes
+  - rvm: 2.3.0
+    gemfile: Gemfile
+    arch: ppc64le
+  - rvm: 2.3.0
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.4.0
+    arch: ppc64le
+    gemfile: Gemfile
+  - rvm: 2.4.0
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.5.0
+    arch: ppc64le
+    gemfile: Gemfile
+  - rvm: 2.5.0
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.6.6
+    arch: ppc64le
+    gemfile: Gemfile
+  - rvm: 2.6.6
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.7.2
+    arch: ppc64le
+    gemfile: Gemfile
+  - rvm: 2.7.2
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: jruby-head
+    arch: ppc64le
+    gemfile: Gemfile
+    
   allow_failures:
   - rvm: jruby-head
     gemfile: Gemfile
@@ -44,6 +79,28 @@ matrix:
     gemfile: gemfiles/Gemfile-edge
   - rvm: 2.7.2
     gemfile: gemfiles/Gemfile-edge
+# ppc64le specific changes
+  - rvm: jruby-head
+    arch: ppc64le
+    gemfile: Gemfile
+  - rvm: 2.2.0
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.3.0
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.4.0
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.5.0
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.6.6
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.7.2
+    arch: ppc64le
+    gemfile: gemfiles/Gemfile-edge
 notifications:
   email: false
   irc:

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Change Log
 
+## [v3.8.0](https://github.com/fog/fog-aws/tree/v3.8.0)
+
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.7.0...v3.8.0)
+
+**Closed issues:**
+
+- Getting Auth failure Exception for non enabled AWS regions in AWS account. [\#585](https://github.com/fog/fog-aws/issues/585)
+
+**Merged pull requests:**
+
+- Filter unknown UploadPartCopy paramaters [\#589](https://github.com/fog/fog-aws/pull/589) ([stanhu](https://github.com/stanhu))
+- Fix NameError in multipart copy [\#588](https://github.com/fog/fog-aws/pull/588) ([stanhu](https://github.com/stanhu))
+- Rewind pointer if file is eof on put\_object mock [\#587](https://github.com/fog/fog-aws/pull/587) ([ekulz](https://github.com/ekulz))
+- Update .travis.yml [\#584](https://github.com/fog/fog-aws/pull/584) ([nageshlop](https://github.com/nageshlop))
+
 ## [v3.7.0](https://github.com/fog/fog-aws/tree/v3.7.0) (2020-12-01)
-[Full Changelog](https://github.com/fog/fog-aws/compare/v3.7.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.6.7...v3.7.0)
 
 **Closed issues:**
 
@@ -34,7 +49,6 @@
 **Merged pull requests:**
 
 - added missing region EU South \(Milan\) [\#570](https://github.com/fog/fog-aws/pull/570) ([saldan](https://github.com/saldan))
-- hibernation option to compute [\#569](https://github.com/fog/fog-aws/pull/569) ([taniahagan](https://github.com/taniahagan))
 - Fix VPC model is\_default requires [\#567](https://github.com/fog/fog-aws/pull/567) ([biinari](https://github.com/biinari))
 
 ## [v3.6.5](https://github.com/fog/fog-aws/tree/v3.6.5) (2020-05-22)
@@ -83,6 +97,7 @@
 
 **Merged pull requests:**
 
+- hibernation option to compute [\#569](https://github.com/fog/fog-aws/pull/569) ([taniahagan](https://github.com/taniahagan))
 - Adding two missing regions to Fog::AWS.regions [\#552](https://github.com/fog/fog-aws/pull/552) ([lvangool](https://github.com/lvangool))
 - Adds missing param WebIdentityToken for the request to the AWS api [\#550](https://github.com/fog/fog-aws/pull/550) ([dgoradia](https://github.com/dgoradia))
 - Fixes type in class name for STS assume\_role\_with\_web\_identity parser [\#549](https://github.com/fog/fog-aws/pull/549) ([dgoradia](https://github.com/dgoradia))
@@ -363,6 +378,7 @@
 - Fog mock accuracy, fixes \#341 [\#344](https://github.com/fog/fog-aws/pull/344) ([easkay](https://github.com/easkay))
 - Subnet [\#343](https://github.com/fog/fog-aws/pull/343) ([ehowe](https://github.com/ehowe))
 - Fix multipart upload [\#340](https://github.com/fog/fog-aws/pull/340) ([nobmurakita](https://github.com/nobmurakita))
+- credential\_fetcher: Mark AWS metadata calls as idempotent [\#329](https://github.com/fog/fog-aws/pull/329) ([mtekel](https://github.com/mtekel))
 
 ## [v1.2.0](https://github.com/fog/fog-aws/tree/v1.2.0) (2017-01-20)
 [Full Changelog](https://github.com/fog/fog-aws/compare/v1.1.0...v1.2.0)
@@ -390,14 +406,13 @@
 - Canada and London regions [\#333](https://github.com/fog/fog-aws/pull/333) ([mattheworiordan](https://github.com/mattheworiordan))
 - Updated ELB Dual Stack hosted zone DNS records [\#332](https://github.com/fog/fog-aws/pull/332) ([mattheworiordan](https://github.com/mattheworiordan))
 - Added support for attaching auto scaling groups to target groups [\#330](https://github.com/fog/fog-aws/pull/330) ([maf23](https://github.com/maf23))
-- credential\_fetcher: Mark AWS metadata calls as idempotent [\#329](https://github.com/fog/fog-aws/pull/329) ([mtekel](https://github.com/mtekel))
+- fix host header with another port on s3 [\#327](https://github.com/fog/fog-aws/pull/327) ([rodrigoapereira](https://github.com/rodrigoapereira))
 
 ## [v1.0.0](https://github.com/fog/fog-aws/tree/v1.0.0) (2016-12-12)
 [Full Changelog](https://github.com/fog/fog-aws/compare/v0.13.0...v1.0.0)
 
 **Merged pull requests:**
 
-- fix host header with another port on s3 [\#327](https://github.com/fog/fog-aws/pull/327) ([rodrigoapereira](https://github.com/rodrigoapereira))
 - Add new t2.xlarge, t2.2xlarge and r4 class instances. [\#326](https://github.com/fog/fog-aws/pull/326) ([rogersd](https://github.com/rogersd))
 - Fix the bug that can't create fifo queue in SQS. [\#323](https://github.com/fog/fog-aws/pull/323) ([ebihara99999](https://github.com/ebihara99999))
 - data pipeline mocks [\#318](https://github.com/fog/fog-aws/pull/318) ([ehowe](https://github.com/ehowe))

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

@@ -148,7 +148,8 @@ module Fog
           self.multipart_chunk_size = MIN_MULTIPART_CHUNK_SIZE * 2 if !multipart_chunk_size && self.content_length.to_i > MAX_SINGLE_PUT_SIZE
 
           if multipart_chunk_size && self.content_length.to_i >= multipart_chunk_size
-            upload_part_options = options.merge({ 'x-amz-copy-source' => "#{directory.key}/#{key}" })
+            upload_part_options = options.select { |key, _| ALLOWED_UPLOAD_PART_OPTIONS.include?(key.to_sym) }
+            upload_part_options = upload_part_options.merge({ 'x-amz-copy-source' => "#{directory.key}/#{key}" })
             multipart_copy(options, upload_part_options, target_directory_key, target_file_key)
           else
             service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
@@ -360,7 +361,7 @@ module Fog
           completed = PartList.new
           errors = upload_in_threads(target_directory_key, target_file_key, upload_id, pending, completed, thread_count)
 
-          raise error.first if errors.any?
+          raise errors.first if errors.any?
 
           part_tags = completed.to_a.sort_by { |part| part.part_number }.map(&:etag)
         rescue => e

data/lib/fog/aws/requests/storage/shared_mock_methods.rb

@@ -15,6 +15,7 @@ module Fog
         def parse_mock_data(data)
           data = Fog::Storage.parse_data(data)
           unless data[:body].is_a?(String)
+            data[:body].rewind if data[:body].eof?
             data[:body] = data[:body].read
           end
           data

data/lib/fog/aws/requests/storage/upload_part_copy.rb

@@ -1,6 +1,25 @@
 module Fog
   module AWS
     class Storage
+      # From https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPartCopy.html
+      ALLOWED_UPLOAD_PART_OPTIONS = %i(
+        x-amz-copy-source
+        x-amz-copy-source-if-match
+        x-amz-copy-source-if-modified-since
+        x-amz-copy-source-if-none-match
+        x-amz-copy-source-if-unmodified-since
+        x-amz-copy-source-range
+        x-amz-copy-source-server-side-encryption-customer-algorithm
+        x-amz-copy-source-server-side-encryption-customer-key
+        x-amz-copy-source-server-side-encryption-customer-key-MD5
+        x-amz-expected-bucket-owner
+        x-amz-request-payer
+        x-amz-server-side-encryption-customer-algorithm
+        x-amz-server-side-encryption-customer-key
+        x-amz-server-side-encryption-customer-key-MD5
+        x-amz-source-expected-bucket-owner
+      ).freeze
+
       class Real
         require 'fog/aws/parsers/storage/upload_part_copy_object'
 
@@ -45,6 +64,8 @@ module Fog
         include Fog::AWS::Storage::SharedMockMethods
 
         def upload_part_copy(target_bucket_name, target_object_name, upload_id, part_number, options = {})
+          validate_options!(options)
+
           copy_source = options['x-amz-copy-source']
           copy_range = options['x-amz-copy-source-range']
 
@@ -86,6 +107,12 @@ module Fog
 
           [matches[1].to_i, end_pos]
         end
+
+        def validate_options!(options)
+          options.keys.each do |key|
+            raise "Invalid UploadPart option: #{key}" unless ::Fog::AWS::Storage::ALLOWED_UPLOAD_PART_OPTIONS.include?(key.to_sym)
+          end
+        end
       end # Mock
     end # Storage
   end # AWS

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.7.0"
+    VERSION = "3.8.0"
   end
 end

data/tests/requests/storage/multipart_copy_tests.rb

@@ -3,7 +3,7 @@ require 'securerandom'
 Shindo.tests('Fog::Storage[:aws] | copy requests', ["aws"]) do
 
   @directory = Fog::Storage[:aws].directories.create(:key => uniq_id('fogmultipartcopytests'))
-  @large_data = SecureRandom.hex * 19 * 1024 * 1024
+  @large_data = SecureRandom.hex * 600000
   @large_blob = Fog::Storage[:aws].put_object(@directory.identity, 'large_object', @large_data)
 
   tests('copies an empty object') do
@@ -77,4 +77,17 @@ Shindo.tests('Fog::Storage[:aws] | copy requests', ["aws"]) do
 
     test("copied is the same") { copied.body == file.body }
   end
+
+  tests('copies an object with unknown headers') do
+    file = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('large_object')
+    file.multipart_chunk_size = Fog::AWS::Storage::File::MIN_MULTIPART_CHUNK_SIZE
+    file.concurrency = 10
+
+    tests("#copy_object('#{@directory.identity}', 'copied_object'").succeeds do
+      file.copy(@directory.identity, 'copied_object', { unknown: 1 } )
+    end
+
+    copied = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('copied_object')
+    test("copied is the same") { copied.body == file.body }
+  end
 end

data/tests/requests/storage/object_tests.rb

@@ -18,6 +18,13 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
       Fog::Storage[:aws].put_object(@directory.identity, 'fog_object', lorem_file)
     end
 
+    tests("#put_object('#{@directory.identity}', 'fog_object', lorem_file at EOF)").returns(lorem_file.read) do
+      file = lorem_file
+      file.read
+      Fog::Storage[:aws].put_object(@directory.identity, 'fog_object', file)
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object').body
+    end
+
     tests("#copy_object('#{@directory.identity}', 'fog_object', '#{@directory.identity}', 'fog_other_object')").succeeds do
       Fog::Storage[:aws].copy_object(@directory.identity, 'fog_object', @directory.identity, 'fog_other_object')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler