Merge pull request #276 from agrare/update_fog_google

Update to fog-google v1.25.0

Author: Fryguy

app/models/manageiq/providers/google/inventory/collector.rb

@@ -76,7 +76,7 @@ def cloud_subnets
       # For a backwards compatibility, old GCE networks were created without subnet. It's not possible now, but
       # GCE haven't migrated to new format. We will create a fake subnet for each network without subnets.
       @subnetworks += compute.networks.select { |x| x.ipv4_range.present? }.map do |x|
-        Fog::Compute::Google::Subnetwork.new(
+        Fog::Google::Compute::Subnetwork.new(
           :name               => x.name,
           :gateway_address    => x.gateway_i_pv4,
           :ip_cidr_range      => x.i_pv4_range,

app/models/manageiq/providers/google/inventory/parser.rb

@@ -237,7 +237,7 @@ def auth_key_pairs
   end
 
   # @param persister_vm [InventoryObject<ManageIQ::Providers::Google::CloudManager::Vm>]
-  # @param instance [Fog::Compute::Google::Server]
+  # @param instance [Fog::Google::Compute::Server]
   def instance_key_pairs(persister_vm, instance)
     # Add project common ssh-keys with keys specific to this instance
     instance_ssh_keys = project_key_pairs | parse_compute_metadata_ssh_keys(instance.metadata)
@@ -266,7 +266,7 @@ def instance_hardware(persister_vm, instance, series)
   end
 
   # @param persister_vm [InventoryObject<ManageIQ::Providers::Google::CloudManager::Vm>]
-  # @param instance [Fog::Compute::Google::Server]
+  # @param instance [Fog::Google::Compute::Server]
   def instance_advanced_settings(persister_vm, instance)
     persister.vms_and_templates_advanced_settings.build(
       :resource     => persister_vm, # manager_ref
@@ -280,7 +280,7 @@ def instance_advanced_settings(persister_vm, instance)
   end
 
   # @param persister_template [InventoryObject<ManageIQ::Providers::Google::CloudManager::Template]
-  # @param image [Fog::Compute::Google::Snapshot, Fog::Compute::Google::Image]
+  # @param image [Fog::Google::Compute::Snapshot, Fog::Google::Compute::Image]
   def image_os(persister_template, image)
     persister.operating_systems.build(
       :vm_or_template => persister_template, # manager_ref
@@ -305,7 +305,7 @@ def instance_os(persister_vm, parent_image_uid)
   end
 
   # @param persister_hardware [InventoryObject<Hardware>]
-  # @param instance [Fog::Compute::Google::Server]
+  # @param instance [Fog::Google::Compute::Server]
   def hardware_disks(persister_hardware, instance)
     return if instance.disks.blank?
 
@@ -412,7 +412,7 @@ def cloud_networks
   end
 
   # @param persister_cloud_network [InventoryObject<ManageIQ::Providers::Google::NetworkManager::CloudNetwork>]
-  # @param network [Fog::Compute::Google::Network]
+  # @param network [Fog::Google::Compute::Network]
   def cloud_subnets(persister_cloud_network, network)
     @subnets_by_network_link ||= collector.cloud_subnets.each_with_object({}) { |x, subnets| (subnets[x.network] ||= []) << x }
     @subnets_by_network_link[network.self_link]&.each do |cloud_subnet|
@@ -505,7 +505,7 @@ def security_group(persister_cloud_network)
   end
 
   # @param persister_security_group [InventoryObject<ManageIQ::Providers::Google::NetworkManager::SecurityGroup>]
-  # @param firewalls [Array<Fog::Compute::Google::Firewall>]
+  # @param firewalls [Array<Fog::Google::Compute::Firewall>]
   def firewall_rules(persister_security_group, firewalls)
     firewalls.each do |firewall|
       name = firewall.name
@@ -560,7 +560,7 @@ def forwarding_rules
     end
   end
 
-  # @param forwarding_rule [Fog::Compute::Google::ForwardingRule]
+  # @param forwarding_rule [Fog::Google::Compute::ForwardingRule]
   def load_balancer_listener(forwarding_rule)
     # Only TCP/UDP/SCTP forwarding rules have ports
     has_ports = %w(TCP UDP SCTP).include?(forwarding_rule.ip_protocol)
@@ -580,7 +580,7 @@ def load_balancer_listener(forwarding_rule)
   end
 
   # @param persister_lb_listener [InventoryObject<ManageIQ::Providers::google::NetworkManager::LoadBalancerListener]
-  # @param forwarding_rule [Fog::Compute::Google::ForwardingRule]
+  # @param forwarding_rule [Fog::Google::Compute::ForwardingRule]
   def load_balancer_listener_pool(persister_lb_listener, forwarding_rule)
     persister_lb_listener_pool = persister.load_balancer_listener_pools.build(
       :load_balancer_listener => persister_lb_listener,
@@ -606,7 +606,7 @@ def load_balancer_pools
   end
 
   # @param persister_lb_pool [InventoryObject<ManageIQ::Providers::Google::NetworkManager::LoadBalancerPool>]
-  # @param target_pool [Fog::Compute::Google::TargetPool]
+  # @param target_pool [Fog::Google::Compute::TargetPool]
   def load_balancer_pool_members(persister_lb_pool, target_pool)
     target_pool.instances.to_a.each do |member_link|
       persister_lb_pool_member = persister.load_balancer_pool_members.find(Digest::MD5.base64digest(member_link))
@@ -626,7 +626,7 @@ def load_balancer_pool_members(persister_lb_pool, target_pool)
     end
   end
 
-  # @param target_pool [Fog::Compute::Google::TargetPool]
+  # @param target_pool [Fog::Google::Compute::TargetPool]
   def load_balancer_health_check(target_pool)
     # Target pools aren't required to have health checks
     return if target_pool.health_checks.blank?
@@ -668,7 +668,7 @@ def load_balancer_health_check(target_pool)
   end
 
   # @param persister_lb_health_check [InventoryObject<ManageIQ::Providers::Google::NetworkManager::LoadBalancerHealthCheck>]
-  # @param target_pool [Fog::Compute::Google::TargetPool]
+  # @param target_pool [Fog::Google::Compute::TargetPool]
   def load_balancer_health_check_members(persister_lb_health_check, target_pool)
     return if target_pool.instances.blank?
     # First attempt to get the health of the instance

manageiq-providers-google.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fog-google", "~> 1.23"
+  spec.add_dependency "fog-google", "~> 1.25"
   spec.add_dependency "rbnacl",     ">= 3.2", "< 5.0"
 
   spec.add_development_dependency "manageiq-style"

spec/models/manageiq/providers/google/cloud_manager_spec.rb

@@ -90,7 +90,7 @@
         }
 
         require 'fog/google'
-        expect(Fog::Compute::Google).to receive(:new) do |options|
+        expect(Fog::Google::Compute).to receive(:new) do |options|
           expect(options.fetch_path(:google_client_options, :proxy_url).to_s)
             .to eq("http://my_user:[email protected]:1234")
         end