Merge pull request #488 from AlexanderZagaynov/aws_sdk_v3

update aws-sdk gem to v3

app/models/authenticator/amazon.rb

@@ -129,8 +129,8 @@ def aws_connect(access_key_id, secret_access_key, service = :IAM, proxy_uri = ni
       service   ||= :EC2
       proxy_uri ||= VMDB::Util.http_proxy_uri
 
-      require 'aws-sdk'
-      require 'patches/aws-sdk-core/seahorse_client_net_http_pool_patch'
+      require "aws-sdk-#{service.to_s.downcase}"
+
       Aws.const_get(service)::Resource.new(
         :access_key_id     => access_key_id,
         :secret_access_key => secret_access_key,

app/models/manageiq/providers/amazon/manager_mixin.rb

@@ -78,9 +78,7 @@ def verify_credentials(args)
 
     def raw_connect(access_key_id, secret_access_key, service, region,
                     proxy_uri = nil, validate = false, uri = nil, assume_role: nil)
-
-      require 'aws-sdk'
-      require 'patches/aws-sdk-core/seahorse_client_net_http_pool_patch'
+      require "aws-sdk-#{service.to_s.downcase}"
 
       log_formatter_pattern = Aws::Log::Formatter.default.pattern.chomp
       secret_access_key     = ManageIQ::Password.try_decrypt(secret_access_key)
@@ -128,8 +126,7 @@ def connection_rescue_block
     end
 
     def translate_exception(err)
-      require 'aws-sdk'
-      require 'patches/aws-sdk-core/seahorse_client_net_http_pool_patch'
+      require 'aws-sdk-ec2'
       case err
       when Aws::EC2::Errors::SignatureDoesNotMatch
         MiqException::MiqHostError.new "SignatureMismatch - check your AWS Secret Access Key and signing method"

manageiq-providers-amazon.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,lib}/**/*"]
 
-  s.add_dependency("aws-sdk", ["~>2.9.7"])
+  s.add_dependency "aws-sdk", "~> 3.0.1"
 
   s.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
   s.add_development_dependency "simplecov"

spec/models/authenticator/amazon_spec.rb

@@ -1,4 +1,5 @@
-require 'aws-sdk'
+require 'aws-sdk-iam'
+require 'aws-sdk-ec2'
 
 describe Authenticator::Amazon do
   AWS_ROOT_USER_KEY = 'aws_root_key'.freeze

spec/models/manageiq/providers/amazon/aws_helper.rb

@@ -1,10 +1,11 @@
-require 'aws-sdk'
-
 def with_aws_stubbed(stub_responses_per_service)
   stub_responses_per_service.each do |service, stub_responses|
-    raise "Aws.config[#{service}][:stub_responses] already set" if Aws.config.fetch(service, {})[:stub_responses]
-    Aws.config[service] ||= {}
-    Aws.config[service][:stub_responses] = stub_responses
+    if Aws.config.dig(service, :stub_responses).present?
+      raise "Aws.config[#{service}][:stub_responses] already set"
+    else
+      require "aws-sdk-#{service.to_s.downcase}"
+      (Aws.config[service] ||= {})[:stub_responses] = stub_responses
+    end
   end
   yield
 ensure

spec/models/manageiq/providers/amazon/cloud_manager/event_catcher/stream_spec.rb

@@ -1,5 +1,7 @@
 require_relative "../../aws_helper"
 
+require 'aws-sdk-sns'
+
 describe ManageIQ::Providers::Amazon::CloudManager::EventCatcher::Stream do
   subject do
     ems = FactoryBot.create(:ems_amazon_with_authentication)

spec/models/manageiq/providers/amazon/cloud_manager/specific_stubbed_refresher_spec.rb

@@ -29,9 +29,9 @@
 
         context "OrchestrationStack refresh" do
           context "with all empty relations" do
-            let(:mocked_stack_parameters) { nil }
-            let(:mocked_stack_resources) { nil }
-            let(:mocked_stack_outputs) { nil }
+            let(:mocked_stack_parameters) { [] }
+            let(:mocked_stack_resources) { [] }
+            let(:mocked_stack_outputs) { [] }
 
             it "tests refresh passes" do
               with_aws_stubbed(stub_responses) do
@@ -47,7 +47,7 @@
           end
 
           context "with empty parameters relation" do
-            let(:mocked_stack_parameters) { nil }
+            let(:mocked_stack_parameters) { [] }
 
             it "tests refresh passes" do
               with_aws_stubbed(stub_responses) do
@@ -62,7 +62,7 @@
           end
 
           context "with empty outputs relation" do
-            let(:mocked_stack_outputs) { nil }
+            let(:mocked_stack_outputs) { [] }
 
             it "tests refresh passes" do
               with_aws_stubbed(stub_responses) do
@@ -77,7 +77,7 @@
           end
 
           context "with empty resources relation" do
-            let(:mocked_stack_resources) { nil }
+            let(:mocked_stack_resources) { [] }
 
             it "tests refresh passes" do
               with_aws_stubbed(stub_responses) do