Revert "Merge pull request ManageIQ#432 from NickLaMuro/monkey-patch-…

…aws-sdk-core-for-proxy-auth-fix" This reverts commit 2b2c87f, reversing changes made to beed01f.
AlexanderZagaynov · Oct 5, 2018 · 1879e5c · 1879e5c
1 parent 11f987f
commit 1879e5c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 47 deletions.
diff --git a/app/models/authenticator/amazon.rb b/app/models/authenticator/amazon.rb
@@ -130,7 +130,6 @@ def aws_connect(access_key_id, secret_access_key, service = :IAM, proxy_uri = ni
       proxy_uri ||= VMDB::Util.http_proxy_uri
 
       require 'aws-sdk'
-      require 'patches/aws-sdk-core/seahorse_client_net_http_pool_patch'
       Aws.const_get(service)::Resource.new(
         :access_key_id     => access_key_id,
         :secret_access_key => secret_access_key,

diff --git a/app/models/manageiq/providers/amazon/manager_mixin.rb b/app/models/manageiq/providers/amazon/manager_mixin.rb
@@ -50,7 +50,6 @@ module ClassMethods
 
     def raw_connect(access_key_id, secret_access_key, service, region, proxy_uri = nil, validate = false, uri = nil)
       require 'aws-sdk'
-      require 'patches/aws-sdk-core/seahorse_client_net_http_pool_patch'
 
       options = {
         :access_key_id     => access_key_id,
@@ -89,7 +88,6 @@ def connection_rescue_block
 
     def translate_exception(err)
       require 'aws-sdk'
-      require 'patches/aws-sdk-core/seahorse_client_net_http_pool_patch'
       case err
       when Aws::EC2::Errors::SignatureDoesNotMatch
         MiqException::MiqHostError.new "SignatureMismatch - check your AWS Secret Access Key and signing method"

diff --git a/lib/patches/aws-sdk-core/seahorse_client_net_http_pool_patch.rb b/lib/patches/aws-sdk-core/seahorse_client_net_http_pool_patch.rb