better approach to avoid 'invalid configuration option' error

ManageIQ · Oct 10, 2018 · 0ad8451 · 0ad8451
1 parent e5e5eb2
commit 0ad8451
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/app/models/authenticator/amazon.rb b/app/models/authenticator/amazon.rb
@@ -128,8 +128,8 @@ def verify_credentials(access_key_id, secret_access_key)
     def aws_connect(access_key_id, secret_access_key, service = :IAM, proxy_uri = nil)
       service   ||= :EC2
       proxy_uri ||= VMDB::Util.http_proxy_uri
+      require "aws-sdk-#{service.to_s.downcase}"
 
-      require 'aws-sdk'
       Aws.const_get(service)::Resource.new(
         :access_key_id     => access_key_id,
         :secret_access_key => secret_access_key,

diff --git a/spec/models/manageiq/providers/amazon/aws_helper.rb b/spec/models/manageiq/providers/amazon/aws_helper.rb
@@ -1,10 +1,13 @@
-require 'aws-sdk'
+# frozen_string_literal: true
 
 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

diff --git a/spec/models/manageiq/providers/amazon/cloud_manager/event_catcher/stream_spec.rb b/spec/models/manageiq/providers/amazon/cloud_manager/event_catcher/stream_spec.rb
@@ -1,8 +1,5 @@
 require_relative "../../aws_helper"
 
-require 'aws-sdk-sqs'
-require 'aws-sdk-sns'
-
 describe ManageIQ::Providers::Amazon::CloudManager::EventCatcher::Stream do
   subject do
     ems = FactoryGirl.create(:ems_amazon_with_authentication)

diff --git a/spec/models/manageiq/providers/amazon/cloud_manager/specific_stubbed_refresher_spec.rb b/spec/models/manageiq/providers/amazon/cloud_manager/specific_stubbed_refresher_spec.rb
@@ -2,8 +2,6 @@
 require_relative '../aws_stubs'
 require_relative '../aws_refresher_spec_common'
 
-require 'aws-sdk-cloudformation'
-
 describe ManageIQ::Providers::Amazon::NetworkManager::Refresher do
   include AwsRefresherSpecCommon
   include AwsStubs

diff --git a/spec/models/manageiq/providers/amazon/network_manager/stubbed_refresher_spec.rb b/spec/models/manageiq/providers/amazon/network_manager/stubbed_refresher_spec.rb
@@ -2,8 +2,6 @@
 require_relative '../aws_stubs'
 require_relative '../aws_refresher_spec_common'
 
-require 'aws-sdk-elasticloadbalancing'
-
 describe ManageIQ::Providers::Amazon::NetworkManager::Refresher do
   include AwsRefresherSpecCommon
   include AwsStubs