fog-aws 3.6.6 → 3.10.0

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.6.6"
+    VERSION = "3.10.0"
   end
 end

data/tests/credentials_tests.rb

@@ -60,6 +60,47 @@ Shindo.tests('AWS | credentials', ['aws']) do
 
     ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = nil
 
+    ENV['AWS_WEB_IDENTITY_TOKEN_FILE'] = File.dirname(__FILE__) + '/lorem.txt'
+    ENV['AWS_ROLE_ARN'] = "dummyrole"
+    ENV['AWS_ROLE_SESSION_NAME'] = "dummyrolesessionname"
+    document = 
+      '<AssumeRoleWithWebIdentityResponse xmlns="https://sts.amazonaws.com/doc/2011-06-15/">'\
+        '<AssumeRoleWithWebIdentityResult>'\
+          '<Credentials>'\
+            '<SessionToken>dummytoken</SessionToken>'\
+            '<SecretAccessKey>dummysecret</SecretAccessKey>'\
+            "<Expiration>#{expires_at.xmlschema}</Expiration>"\
+            '<AccessKeyId>dummykey</AccessKeyId>'\
+          '</Credentials>'\
+        '</AssumeRoleWithWebIdentityResult>'\
+      '</AssumeRoleWithWebIdentityResponse>'
+    
+    Excon.stub({method: :get, path: "/", idempotent: true}, { status: 200, body: document})
+
+    tests('#fetch_credentials token based') do
+      returns(
+        aws_access_key_id: 'dummykey',
+        aws_secret_access_key: 'dummysecret',
+        aws_session_token: 'dummytoken',
+        region: 'us-west-1',
+        aws_credentials_expire_at: expires_at
+      ) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
+    end
+
+    ENV['AWS_ROLE_SESSION_NAME'] = nil
+
+    tests('#fetch_credentials token based without session name') do
+      returns(
+        aws_access_key_id: 'dummykey',
+        aws_secret_access_key: 'dummysecret',
+        aws_session_token: 'dummytoken',
+        region: 'us-west-1',
+        aws_credentials_expire_at: expires_at
+      ) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
+    end
+
+    ENV['AWS_WEB_IDENTITY_TOKEN_FILE'] = nil
+
     compute = Fog::AWS::Compute.new(use_iam_profile: true)
 
     tests('#refresh_credentials_if_expired') do
@@ -100,6 +141,7 @@ Shindo.tests('AWS | credentials', ['aws']) do
     end
   ensure
     ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = nil
+    ENV['AWS_WEB_IDENTITY_TOKEN_FILE'] = nil
     Excon.stubs.clear
     Excon.defaults[:mock] = old_mock_value
     Fog.mock! if fog_was_mocked

data/tests/helpers/succeeds_helper.rb

@@ -1,8 +1,8 @@
 module Shindo
   class Tests
-    def succeeds
+    def succeeds(&block)
       test('succeeds') do
-        !instance_eval(&Proc.new).nil?
+        !instance_eval(&Proc.new(&block)).nil?
       end
     end
   end

data/tests/models/storage/directory_tests.rb

@@ -1,4 +1,117 @@
 Shindo.tests("Storage[:aws] | directory", ["aws"]) do
+  tests('Fog::Storage[:aws]', "#request_params") do
+    def slice(hash, *args)
+      hash.select { |k, _| args.include?(k) }
+    end
+
+    instance = Fog::Storage[:aws]
+    method = instance.method(:request_params)
+
+    params = {bucket_name: 'profile-uploads', host: 'profile-uploads.s3.us-west-2.amazonaws.com'}
+    tests("given #{params}, request_params[:host]").returns("profile-uploads.s3.us-west-2.amazonaws.com") do
+      method.call(params)[:host]
+    end
+
+    params = {bucket_name: 'profile-uploads.johnsmith.net', cname: 'profile-uploads.johnsmith.net', virtual_host: true}
+    tests("given #{params}, request_params[:host]").returns("profile-uploads.johnsmith.net") do
+      method.call(params)[:host]
+    end
+
+    params = {bucket_name: 'profile-uploads.johnsmith.net', cname: 'profile-uploads.johnsmith.net', virtual_host: false}
+    tests("given #{params}, request_params[:host], request_params[:path]").
+      returns({host: "s3.amazonaws.com", path: "/profile-uploads.johnsmith.net/"}) do
+      slice(method.call(params), :host, :path)
+    end
+
+    params = {bucket_name: 'profile-uploads.johnsmith.net', bucket_cname: 'profile-uploads.johnsmith.net'}
+    tests("given #{params}, request_params[:host]").returns("profile-uploads.johnsmith.net") do
+      method.call(params)[:host]
+    end
+
+    params = {bucket_name: 'profile-uploads'}
+    tests("given #{params}, request_params[:path], request_params[:host]").
+      returns({path: "/", host: "profile-uploads.s3.amazonaws.com"}) do
+        slice(method.call(params), :path, :host)
+      end
+
+    params = {bucket_name: 'profile-uploads', path_style: true}
+    tests("given #{params}, request_params[:path], request_params[:host]").
+      returns({path: "/profile-uploads/", host: "s3.amazonaws.com"}) do
+        slice(method.call(params), :path, :host)
+      end
+
+    params = {bucket_name: 'profile-uploads', path_style: false}
+    tests("given #{params}, request_params[:path], request_params[:host]").
+      returns({path: "/", host: "profile-uploads.s3.amazonaws.com"}) do
+        slice(method.call(params), :path, :host)
+      end
+
+    params = {scheme: 'https', bucket_name: 'profile.uploads', path_style: false}
+    tests("given #{params}, request_params[:path], request_params[:host]").
+      returns(path: "/profile.uploads/", host: "s3.amazonaws.com") do
+        slice(method.call(params), :path, :host)
+      end
+
+    params = {:headers=>{:"Content-Type"=>"application/json"}}
+    tests("given #{params}, request_params[:headers]").returns({:"Content-Type"=>"application/json"}) do
+      method.call(params)[:headers]
+    end
+
+    params = {headers: {}}
+    tests("given #{params}, request_params[:headers]").returns({}) do
+      method.call(params)[:headers]
+    end
+
+    params = {scheme: 'http'}
+    tests("given #{params}, request_params[:scheme]").returns('http') do
+      method.call(params)[:scheme]
+    end
+
+    params = {}
+    tests("given #{params}, request_params[:scheme]").returns('https') do
+      method.call(params)[:scheme]
+    end
+
+    params = {scheme: 'http', port: 8080}
+    tests("given #{params} (default scheme), request_params[:port]").returns(8080) do
+      method.call(params)[:port]
+    end
+
+    params = {scheme: 'https', port: 443}
+    tests("given #{params}, request_params[:port]").returns(nil) do
+      method.call(params)[:port]
+    end
+
+    params = {}
+    tests("given #{params}, request_params[:host]").returns("s3.amazonaws.com") do
+      method.call(params)[:host]
+    end
+
+    params = {region: 'us-east-1'}
+    tests("given #{params}, request_params[:host]").returns("s3.amazonaws.com") do
+      method.call(params)[:host]
+    end
+
+    params = {region: 'us-west-2'}
+    tests("given #{params}, request_params[:host]").returns("s3.us-west-2.amazonaws.com") do
+      method.call(params)[:host]
+    end
+
+    params= {region: 'us-east-1', host: 's3.us-west-2.amazonaws.com'}
+    tests("given #{params}, request_params[:host]").returns("s3.us-west-2.amazonaws.com") do
+      method.call(params)[:host]
+    end
+
+    params = {object_name: 'image.png'}
+    tests("given #{params}, request_params[:host]").returns("/image.png") do
+      method.call(params)[:path]
+    end
+
+    params = {object_name: 'image.png', path: '/images/image.png'}
+    tests("given #{params}, request_params[:host]").returns("/images/image.png") do
+      method.call(params)[:path]
+    end
+  end
 
   directory_attributes = {
     :key => uniq_id('fogdirectorytests')
@@ -85,7 +198,5 @@ Shindo.tests("Storage[:aws] | directory", ["aws"]) do
         @instance.versioning?
       end
     end
-
   end
-
 end

data/tests/models/storage/files_tests.rb

@@ -50,6 +50,38 @@ Shindo.tests("Storage[:aws] | files", ["aws"]) do
       end
     end
 
+    tests('#normalize_headers') do
+      files = @directory.files
+      response = Excon::Response.new
+      current_time = Time.new(2021, 02, 21)
+
+      response.headers['last-modified'] = current_time.to_s
+      response.headers['etag'] = '12345'
+      response.headers['ETAG'] = '12345'
+      response.headers['Cache-Control'] = 'no-cache'
+      response.headers['Content-disposition'] = 'attachment'
+      response.headers['content-length'] = 100
+      response.headers['content-Encoding'] = 'gzip'
+      response.headers['content-md5'] = 'ABCDEAB'
+      response.headers['content-Md5'] = 'ABCDEAB'
+      response.headers['ConTent-Type'] = 'application/json'
+
+      expected = {
+        'Last-Modified' => current_time,
+        'ETag' => '12345',
+        'Cache-Control' => 'no-cache',
+        'Content-Disposition' => 'attachment',
+        'Content-Length' => 100,
+        'Content-Encoding' => 'gzip',
+        'Content-MD5' => 'ABCDEAB',
+        'Content-Type' => 'application/json'
+      }
+
+      tests('header keys are normalized').returns(expected) do
+        files.normalize_headers(response)
+        response.headers
+      end
+    end
   end
 
   @directory.versions.each(&:destroy)

data/tests/requests/storage/bucket_tests.rb

@@ -158,7 +158,7 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       Fog::Storage[:aws].put_bucket_website(@aws_bucket_name, :IndexDocument => 'index.html')
     end
 
-    tests("#put_bucket_website('#{@aws_bucket_name}', :RedirectAllRequestsTo => 'redirect.example..com')").succeeds do
+    tests("#put_bucket_website('#{@aws_bucket_name}', :RedirectAllRequestsTo => 'redirect.example.com')").succeeds do
       Fog::Storage[:aws].put_bucket_website(@aws_bucket_name, :RedirectAllRequestsTo => 'redirect.example.com')
     end
 

data/tests/requests/storage/multipart_copy_tests.rb

@@ -0,0 +1,93 @@
+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 * 600000
+  @large_blob = Fog::Storage[:aws].put_object(@directory.identity, 'large_object', @large_data)
+
+  tests('copies an empty object') do
+    Fog::Storage[:aws].put_object(@directory.identity, 'empty_object', '')
+
+    file = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('empty_object')
+    file.multipart_chunk_size = Fog::AWS::Storage::File::MIN_MULTIPART_CHUNK_SIZE
+
+    tests("#copy_object('#{@directory.identity}', 'empty_copied_object'").succeeds do
+      file.copy(@directory.identity, 'empty_copied_object')
+    end
+
+    copied = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('empty_copied_object')
+    test("copied is the same") { copied.body == file.body }
+  end
+
+  tests('copies a small object') do
+    Fog::Storage[:aws].put_object(@directory.identity, 'fog_object', lorem_file)
+
+    file = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('fog_object')
+
+    tests("#copy_object('#{@directory.identity}', 'copied_object'").succeeds do
+      file.copy(@directory.identity, 'copied_object')
+    end
+
+    copied = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('copied_object')
+    test("copied is the same") { copied.body == file.body }
+  end
+
+  tests('copies a file needing a single part') do
+    data = '*' * Fog::AWS::Storage::File::MIN_MULTIPART_CHUNK_SIZE
+    Fog::Storage[:aws].put_object(@directory.identity, '1_part_object', data)
+
+    file = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('1_part_object')
+    file.multipart_chunk_size = Fog::AWS::Storage::File::MIN_MULTIPART_CHUNK_SIZE
+
+    tests("#copy_object('#{@directory.identity}', '1_part_copied_object'").succeeds do
+      file.copy(@directory.identity, '1_part_copied_object')
+    end
+
+    copied = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('1_part_copied_object')
+    test("copied is the same") { copied.body == file.body }
+  end
+
+  tests('copies a file with many parts') 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
+
+    tests("#copy_object('#{@directory.identity}', 'large_copied_object'").succeeds do
+      file.copy(@directory.identity, 'large_copied_object')
+    end
+
+    copied = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('large_copied_object')
+
+    test("concurrency defaults to 1") { file.concurrency == 1 }
+    test("copied is the same") { copied.body == file.body }
+  end
+
+  tests('copies a file with many parts with 10 threads') 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
+
+    test("concurrency is set to 10") { file.concurrency == 10 }
+
+    tests("#copy_object('#{@directory.identity}', 'copied_object_with_10_threads'").succeeds do
+      file.copy(@directory.identity, 'copied_object_with_10_threads')
+    end
+
+    copied = Fog::Storage[:aws].directories.new(key: @directory.identity).files.get('copied_object_with_10_threads')
+
+    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

data/tests/requests/storage/versioning_tests.rb

@@ -134,6 +134,44 @@ Shindo.tests('Fog::Storage[:aws] | versioning', ["aws"]) do
       end
     end
 
+    tests("deleting_multiple_objects_versions('#{@aws_bucket_name}", 'file') do
+      clear_bucket
+
+      bucket = Fog::Storage[:aws].directories.get(@aws_bucket_name)
+
+      file_count = 5
+      file_names = []
+      files = {}
+      file_count.times do |id|
+        file_names << "file_#{id}"
+        file_version_count = rand(1..5)
+        file_version_count.times do
+          files[file_names.last] = bucket.files.create(:body => 'a',
+                                                      :key => file_names.last)
+        end
+      end
+
+      tests("deleting an object with multiple versions").returns(true) do
+        versions = Fog::Storage[:aws].get_bucket_object_versions(
+                        @aws_bucket_name) 
+        file_versions = {}
+        versions.body['Versions'].each do |version|
+          object = version[version.keys.first]
+          if file_versions[object['Key']]
+            file_versions[object['Key']] = file_versions[object['Key']] << object['VersionId']
+          else
+            file_versions[object['Key']] = [object['VersionId']]
+          end
+        end
+
+        Fog::Storage[:aws].delete_multiple_objects(@aws_bucket_name,
+                                                  file_names, 'versionId' => file_versions)
+        versions = Fog::Storage[:aws].get_bucket_object_versions(
+                      @aws_bucket_name)
+        versions.body['Versions'].empty?
+      end
+    end
+
     tests("deleting_multiple_objects('#{@aws_bucket_name}", 'file') do
       clear_bucket
 

metadata

@@ -1,44 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.10.0
 platform: ruby
 authors:
 - Josh Lane
 - Wesley Beary
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -147,8 +147,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ruby.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -160,7 +162,6 @@ files:
 - bin/setup
 - fog-aws.gemspec
 - gemfiles/Gemfile-edge
-- gemfiles/Gemfile-ruby-2.0
 - lib/fog-aws.rb
 - lib/fog/aws.rb
 - lib/fog/aws/auto_scaling.rb
@@ -754,6 +755,7 @@ files:
 - lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
 - lib/fog/aws/parsers/storage/list_multipart_uploads.rb
 - lib/fog/aws/parsers/storage/list_parts.rb
+- lib/fog/aws/parsers/storage/upload_part_copy_object.rb
 - lib/fog/aws/parsers/sts/assume_role.rb
 - lib/fog/aws/parsers/sts/assume_role_with_saml.rb
 - lib/fog/aws/parsers/sts/assume_role_with_web_identity.rb
@@ -1442,6 +1444,7 @@ files:
 - lib/fog/aws/requests/storage/shared_mock_methods.rb
 - lib/fog/aws/requests/storage/sync_clock.rb
 - lib/fog/aws/requests/storage/upload_part.rb
+- lib/fog/aws/requests/storage/upload_part_copy.rb
 - lib/fog/aws/requests/sts/assume_role.rb
 - lib/fog/aws/requests/sts/assume_role_with_saml.rb
 - lib/fog/aws/requests/sts/assume_role_with_web_identity.rb
@@ -1459,7 +1462,6 @@ files:
 - lib/fog/aws/sts.rb
 - lib/fog/aws/support.rb
 - lib/fog/aws/version.rb
-- stale.yml
 - tests/credentials_tests.rb
 - tests/helper.rb
 - tests/helpers/collection_helper.rb
@@ -1709,6 +1711,7 @@ files:
 - tests/requests/storage/bucket_tests.rb
 - tests/requests/storage/cors_utils_tests.rb
 - tests/requests/storage/delete_multiple_objects_tests.rb
+- tests/requests/storage/multipart_copy_tests.rb
 - tests/requests/storage/multipart_upload_tests.rb
 - tests/requests/storage/object_tests.rb
 - tests/requests/storage/versioning_tests.rb
@@ -1726,7 +1729,7 @@ homepage: https://github.com/fog/fog-aws
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1741,8 +1744,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.
 test_files: []