Merge pull request #449 from AlexanderZagaynov/aws_sdk_v3

update aws-sdk gem to v3
ManageIQ · Oct 21, 2019 · f92379b · f92379b
2 parents dc93066 + f0a5d5a
commit f92379b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 284 deletions.
diff --git a/lib/gems/pending/util/extensions/aws-sdk/s3_upload_stream_patch.rb b/lib/gems/pending/util/extensions/aws-sdk/s3_upload_stream_patch.rb
diff --git a/lib/gems/pending/util/object_storage/miq_s3_storage.rb b/lib/gems/pending/util/object_storage/miq_s3_storage.rb
@@ -84,8 +84,8 @@ def bucket
   private
 
   def s3
-    require 'aws-sdk'
-    require 'util/extensions/aws-sdk/s3_upload_stream_patch'
+    require 'aws-sdk-s3'
+
     @s3 ||= Aws::S3::Resource.new(:region            => @settings[:region],
                                   :access_key_id     => @settings[:username],
                                   :secret_access_key => @settings[:password])

diff --git a/manageiq-gems-pending.gemspec b/manageiq-gems-pending.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activerecord",            "< 5.3"
   s.add_runtime_dependency "activesupport",           "< 5.3"
   s.add_runtime_dependency "awesome_spawn",           "~> 1.4"
-  s.add_runtime_dependency "aws-sdk",                 "~> 2.9.7"
+  s.add_runtime_dependency "aws-sdk",                 "~> 3.0.1"
   s.add_runtime_dependency "binary_struct",           "~> 2.1"
   s.add_runtime_dependency "bundler",                 ">= 1.8.4" # rails-assets requires bundler >= 1.8.4, see: https://rails-assets.org/
   s.add_runtime_dependency "fog-openstack",           "~> 0.3"