From a9c271157313314f01e8a93655d316e4c98c9d6d Mon Sep 17 00:00:00 2001
From: Oleg Barenboim <chessbyte@gmail.com>
Date: Thu, 1 Jun 2017 19:05:47 -0400
Subject: [PATCH] Remove needless requires of fog/google

---
 .../manageiq/providers/google/cloud_manager/refresh_parser.rb  | 2 --
 app/models/manageiq/providers/google/manager_mixin.rb          | 2 --
 .../providers/google/network_manager/refresh_parser.rb         | 1 -
 .../providers/google/cloud_manager/metrics_capture_spec.rb     | 3 +--
 .../manageiq/providers/google/cloud_manager/refresher_spec.rb  | 2 --
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/models/manageiq/providers/google/cloud_manager/refresh_parser.rb b/app/models/manageiq/providers/google/cloud_manager/refresh_parser.rb
index a4e20b44..07f900da 100644
--- a/app/models/manageiq/providers/google/cloud_manager/refresh_parser.rb
+++ b/app/models/manageiq/providers/google/cloud_manager/refresh_parser.rb
@@ -1,5 +1,3 @@
-require 'fog/google'
-
 module ManageIQ::Providers
   module Google
     class CloudManager::RefreshParser < ManageIQ::Providers::CloudManager::RefreshParser
diff --git a/app/models/manageiq/providers/google/manager_mixin.rb b/app/models/manageiq/providers/google/manager_mixin.rb
index 73d3ba89..0068367b 100644
--- a/app/models/manageiq/providers/google/manager_mixin.rb
+++ b/app/models/manageiq/providers/google/manager_mixin.rb
@@ -21,8 +21,6 @@ def verify_credentials(auth_type = nil, options = {})
   end
 
   def connect(options = {})
-    require 'fog/google'
-
     raise MiqException::MiqHostError, "No credentials defined" if missing_credentials?(options[:auth_type])
 
     auth_token = authentication_token(options[:auth_type])
diff --git a/app/models/manageiq/providers/google/network_manager/refresh_parser.rb b/app/models/manageiq/providers/google/network_manager/refresh_parser.rb
index ee046906..92ea25e4 100644
--- a/app/models/manageiq/providers/google/network_manager/refresh_parser.rb
+++ b/app/models/manageiq/providers/google/network_manager/refresh_parser.rb
@@ -1,5 +1,4 @@
 require 'digest'
-require 'fog/google'
 
 module ManageIQ::Providers
   module Google
diff --git a/spec/models/manageiq/providers/google/cloud_manager/metrics_capture_spec.rb b/spec/models/manageiq/providers/google/cloud_manager/metrics_capture_spec.rb
index f6ef52f8..a98f8bc2 100644
--- a/spec/models/manageiq/providers/google/cloud_manager/metrics_capture_spec.rb
+++ b/spec/models/manageiq/providers/google/cloud_manager/metrics_capture_spec.rb
@@ -1,5 +1,3 @@
-require 'fog/google'
-
 describe ManageIQ::Providers::Google::CloudManager::MetricsCapture do
   let(:ems) { FactoryGirl.create(:ems_google) }
   let(:vm) { FactoryGirl.build(:vm_google, :ext_management_system => ems, :ems_ref => "my_ems_ref") }
@@ -198,6 +196,7 @@ def stage_metrics(metrics)
     end
 
     # Create a monitoring double and ensure it gets used instead of the real client
+    require 'fog/google'
     monitoring = double("::Fog::Google::Monitoring")
     allow(monitoring).to receive(:timeseries_collection) { timeseries_collection }
     allow(::Fog::Google::Monitoring).to receive(:new) { monitoring }
diff --git a/spec/models/manageiq/providers/google/cloud_manager/refresher_spec.rb b/spec/models/manageiq/providers/google/cloud_manager/refresher_spec.rb
index 2664b26d..b6bb8a86 100644
--- a/spec/models/manageiq/providers/google/cloud_manager/refresher_spec.rb
+++ b/spec/models/manageiq/providers/google/cloud_manager/refresher_spec.rb
@@ -1,5 +1,3 @@
-require 'fog/google'
-
 describe ManageIQ::Providers::Google::CloudManager::Refresher do
   before(:each) do
     _guid, _server, zone = EvmSpecHelper.create_guid_miq_server_zone