fog-google 1.24.1 → 1.26.0

data/lib/fog/bin/google.rb

@@ -4,15 +4,15 @@ module Google
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::Google
+        Fog::Google::Compute
       when :dns
-        Fog::DNS::Google
+        Fog::Google::DNS
       when :monitoring
         Fog::Google::Monitoring
       when :storage
-        Fog::Storage::Google
+        Fog::Google::Storage
       when :storage_json
-        Fog::Storage::Google
+        Fog::Google::Storage
       when :sql
         Fog::Google::SQL
       when :pubsub
@@ -24,25 +24,22 @@ module Google
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-                    when :compute
-                      Fog::Logger.warning("Google[:compute] is not recommended, use Compute[:google] for portability")
-                      Fog::Compute.new(:provider => "Google")
-                    when :dns
-                      Fog::Logger.warning("Google[:dns] is not recommended, use DNS[:google] for portability")
-                      Fog::DNS.new(:provider => "Google")
-                    when :monitoring
-                      Fog::Google::Monitoring.new
-                    when :sql
-                      Fog::Google::SQL.new
-                    when :pubsub
-                      Fog::Google::Pubsub.new
-                    when :storage
-                      Fog::Logger.warning("Google[:storage] is not recommended, use Storage[:google] for portability")
-                      Fog::Storage.new(:provider => "Google")
-                    else
-                      raise ArgumentError, "Unrecognized service: #{key.inspect}"
-                    end
+        case key
+        when :compute
+          hash[key] = Fog::Compute.new(:provider => "Google")
+        when :dns
+          hash[key] = Fog::DNS.new(:provider => "Google")
+        when :monitoring
+          hash[key] = Fog::Google::Monitoring.new
+        when :sql
+          hash[key] = Fog::Google::SQL.new
+        when :pubsub
+          hash[key] = Fog::Google::Pubsub.new
+        when :storage
+          hash[key] = Fog::Storage.new(:provider => "Google")
+        else
+          hash[key] = raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
       end
       @@connections[service]
     end
@@ -74,7 +71,7 @@ module Google
         rescue ArgumentError => e
           Fog::Logger.warning(e.message)
           availability = false
-        rescue => e
+        rescue StandardError => e
           availability = false
         end
       end
@@ -83,7 +80,8 @@ module Google
         services.each do |service|
           class_for(service).collections.each do |collection|
             next if respond_to?(collection)
-            class_eval <<-EOS, __FILE__, __LINE__
+
+            class_eval <<-EOS, __FILE__, __LINE__ + 1
                 def self.#{collection}
                   self[:#{service}].#{collection}
                 end

data/lib/fog/{compute/google → google/compute}/mock.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Mock
         include Fog::Google::Shared
         attr_reader :extra_global_projects, :exclude_projects

data/lib/fog/{compute/google → google/compute}/models/address.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents an Address resource
       #
@@ -37,7 +37,7 @@ module Fog
           requires :identity, :region
 
           data = service.insert_address(identity, region, attributes)
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(service: service)
                       .get(data.name, nil, data.region)
           operation.wait_for { ready? }
@@ -48,7 +48,7 @@ module Fog
           requires :identity, :region
 
           data = service.delete_address(identity, region.split("/")[-1])
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, nil, data.region)
 
@@ -81,14 +81,14 @@ module Fog
         #                             standard primary nic - "nic0"
         # @param [Boolean]  async - whether to run the operation asynchronously
         #
-        # @return [Fog::Compute::Google::Operation]
+        # @return [Fog::Google::Compute::Operation]
         def associate(server, nic_name = "nic0", async = false)
           requires :address
 
           data = service.add_server_access_config(
             server.name, server.zone, nic_name, :nat_ip => address
           )
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -98,7 +98,7 @@ module Fog
         #
         # @param [Boolean]  async - whether to run the operation asynchronously
         #
-        # @return [Fog::Compute::Google::Operation]
+        # @return [Fog::Google::Compute::Operation]
         def disassociate(async = false)
           requires :address
 
@@ -120,7 +120,7 @@ module Fog
             data = service.delete_server_access_config(
               server.name, server.zone, nic[:name], access_config[:name]
             )
-            operation = Fog::Compute::Google::Operations
+            operation = Fog::Google::Compute::Operations
                         .new(:service => service)
                         .get(data.name, data.zone)
             operation.wait_for { ready? } unless async

data/lib/fog/{compute/google → google/compute}/models/addresses.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Addresses < Fog::Collection
-        model Fog::Compute::Google::Address
+        model Fog::Google::Compute::Address
 
         def all(region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil)
           opts = {

data/lib/fog/{compute/google → google/compute}/models/backend_service.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class BackendService < Fog::Model
         identity :name
 
@@ -30,7 +30,7 @@ module Fog
           }
 
           data = service.insert_backend_service(name, **options)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name)
+          operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name)
           operation.wait_for { ready? }
           reload
         end
@@ -39,7 +39,7 @@ module Fog
           requires :name
 
           data = service.delete_backend_service(name)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name)
+          operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name)
           operation.wait_for { ready? } unless async
           operation
         end

data/lib/fog/{compute/google → google/compute}/models/backend_services.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class BackendServices < Fog::Collection
-        model Fog::Compute::Google::BackendService
+        model Fog::Google::Compute::BackendService
 
         def all(_filters = {})
           data = service.list_backend_services.items || []

data/lib/fog/{compute/google → google/compute}/models/disk.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Disk < Fog::Model
         identity :name
 
@@ -52,7 +52,7 @@ module Fog
           # Request needs backward compatibility so source image is specified in
           # method arguments
           data = service.insert_disk(name, zone, options[:source_image], **options)
-          operation = Fog::Compute::Google::Operations.new(service: service)
+          operation = Fog::Google::Compute::Operations.new(service: service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? }
           reload
@@ -62,7 +62,7 @@ module Fog
           requires :name, :zone
 
           data = service.delete_disk(name, zone_name)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
           operation
@@ -142,7 +142,7 @@ module Fog
           raise ArgumentError, "Invalid snapshot name" unless snapshot_name
 
           data = service.create_disk_snapshot(snapshot_name, name, zone_name, snapshot)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? }
           service.snapshots.get(snapshot_name)

data/lib/fog/{compute/google → google/compute}/models/disk_type.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class DiskType < Fog::Model
         identity :name
 

data/lib/fog/{compute/google → google/compute}/models/disk_types.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class DiskTypes < Fog::Collection
-        model Fog::Compute::Google::DiskType
+        model Fog::Google::Compute::DiskType
 
         def all(zone: nil, filter: nil, max_results: nil,
                 order_by: nil, page_token: nil)

data/lib/fog/{compute/google → google/compute}/models/disks.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Disks < Fog::Collection
-        model Fog::Compute::Google::Disk
+        model Fog::Google::Compute::Disk
 
         def all(zone: nil, filter: nil, max_results: nil, order_by: nil,
                 page_token: nil)

data/lib/fog/{compute/google → google/compute}/models/firewall.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents a Firewall resource
       #
@@ -53,7 +53,7 @@ module Fog
 
         def create
           data = service.insert_firewall(identity, attributes)
-          operation = Fog::Compute::Google::Operations.new(service: service)
+          operation = Fog::Google::Compute::Operations.new(service: service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -63,7 +63,7 @@ module Fog
           requires :identity, :allowed, :network
 
           data = service.update_firewall(identity, attributes)
-          operation = Fog::Compute::Google::Operations.new(service: service)
+          operation = Fog::Google::Compute::Operations.new(service: service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -73,7 +73,7 @@ module Fog
           requires :identity
 
           data = service.patch_firewall(identity, diff)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -83,7 +83,7 @@ module Fog
           requires :identity
 
           data = service.delete_firewall(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/firewalls.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Firewalls < Fog::Collection
-        model Fog::Compute::Google::Firewall
+        model Fog::Google::Compute::Firewall
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/forwarding_rule.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class ForwardingRule < Fog::Model
         identity :name
 
@@ -25,7 +25,7 @@ module Fog
           requires :identity, :region
 
           data = service.insert_forwarding_rule(identity, region, attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
           operation.wait_for { ready? }
           reload
@@ -45,7 +45,7 @@ module Fog
         def destroy(async = true)
           requires :identity, :region
           data = service.delete_forwarding_rule(identity, region)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/forwarding_rules.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class ForwardingRules < Fog::Collection
-        model Fog::Compute::Google::ForwardingRule
+        model Fog::Google::Compute::ForwardingRule
 
         def all(region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil)
           opts = {

data/lib/fog/{compute/google → google/compute}/models/global_address.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents an Address resource
       #
@@ -25,7 +25,7 @@ module Fog
           requires :identity
 
           data = service.insert_global_address(identity, attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -35,7 +35,7 @@ module Fog
           requires :identity
 
           data = service.delete_global_address(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/global_addresses.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class GlobalAddresses < Fog::Collection
-        model Fog::Compute::Google::GlobalAddress
+        model Fog::Google::Compute::GlobalAddress
 
         def all(options = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/global_forwarding_rule.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class GlobalForwardingRule < Fog::Model
         identity :name
 
@@ -25,7 +25,7 @@ module Fog
           requires :identity
 
           data = service.insert_global_forwarding_rule(identity, attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
           operation.wait_for { ready? }
           reload
@@ -34,7 +34,7 @@ module Fog
         def destroy(async = true)
           requires :identity
           data = service.delete_global_forwarding_rule(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/global_forwarding_rules.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class GlobalForwardingRules < Fog::Collection
-        model Fog::Compute::Google::GlobalForwardingRule
+        model Fog::Google::Compute::GlobalForwardingRule
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/http_health_check.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class HttpHealthCheck < Fog::Model
         identity :name
 
@@ -51,7 +51,7 @@ module Fog
           requires :name
 
           data = service.insert_http_health_check(name, opts)
-          operation = Fog::Compute::Google::Operations.new(service: service)
+          operation = Fog::Google::Compute::Operations.new(service: service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? }
           reload
@@ -60,7 +60,7 @@ module Fog
         def update(opts)
           requires :name
           data = service.update_http_health_check(name, opts)
-          operation = Fog::Compute::Google::Operations.new(service: service)
+          operation = Fog::Google::Compute::Operations.new(service: service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? }
           reload
@@ -69,7 +69,7 @@ module Fog
         def destroy(async = true)
           requires :name
           data = service.delete_http_health_check(name)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/http_health_checks.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class HttpHealthChecks < Fog::Collection
-        model Fog::Compute::Google::HttpHealthCheck
+        model Fog::Google::Compute::HttpHealthCheck
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/image.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Image < Fog::Model
         identity :name
 
@@ -49,7 +49,7 @@ module Fog
 
         def destroy(async = true)
           data = service.delete_image(name)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation
@@ -66,7 +66,7 @@ module Fog
           requires :name
 
           data = service.insert_image(name, attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload

data/lib/fog/{compute/google → google/compute}/models/images.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Images < Fog::Collection
-        model Fog::Compute::Google::Image
+        model Fog::Google::Compute::Image
 
         # NOTE: some of these operating systems are premium and users will be
         # charged a license fee beyond the base Google Compute Engine VM

data/lib/fog/{compute/google → google/compute}/models/instance_group.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class InstanceGroup < Fog::Model
         identity :name
 

data/lib/fog/{compute/google → google/compute}/models/instance_group_manager.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class InstanceGroupManager < Fog::Model
         identity :name
 
@@ -22,7 +22,7 @@ module Fog
 
           data = service.insert_instance_group_manager(name, zone.split("/")[-1], instance_template, base_instance_name,
           target_size, target_pools, named_ports, description)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name, zone.split("/")[-1])
+          operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name, zone.split("/")[-1])
           operation.wait_for { ready? }
           reload
         end

data/lib/fog/{compute/google → google/compute}/models/instance_group_managers.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class InstanceGroupManagers < Fog::Collection
-        model Fog::Compute::Google::InstanceGroupManager
+        model Fog::Google::Compute::InstanceGroupManager
 
         def all(zone: nil, filter: nil, max_results: nil,
                 order_by: nil, page_token: nil)

data/lib/fog/{compute/google → google/compute}/models/instance_groups.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class InstanceGroups < Fog::Collection
-        model Fog::Compute::Google::InstanceGroup
+        model Fog::Google::Compute::InstanceGroup
 
         def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil)
           opts = {
@@ -51,7 +51,7 @@ module Fog
         # TODO(2.0): To be deprecated
         def add_instance(params)
           Fog::Logger.deprecation(
-            "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]"
+            "#{self.class}.#{__method__} is deprecated, use Fog::Google::Compute::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]"
           )
           params[:instance] = [params[:instance]] unless params[:instance] == Array
           service.add_instance_group_instances(params[:group], params[:zone], params[:instance])
@@ -60,7 +60,7 @@ module Fog
         # TODO(2.0): To be deprecated
         def remove_instance(params)
           Fog::Logger.deprecation(
-            "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]"
+            "#{self.class}.#{__method__} is deprecated, use Fog::Google::Compute::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]"
           )
           params[:instance] = [params[:instance]] unless params[:instance] == Array
           service.remove_instance_group_instances(params[:group], params[:zone], params[:instance])

data/lib/fog/{compute/google → google/compute}/models/instance_template.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class InstanceTemplate < Fog::Model
         identity :name
 
@@ -29,7 +29,7 @@ module Fog
           requires :properties
 
           data = service.insert_instance_template(name, properties, description)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name)
+          operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name)
           operation.wait_for { ready? }
           reload
         end
@@ -37,7 +37,7 @@ module Fog
         def destroy(async = true)
           requires :name
           data = service.delete_instance_template(name)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name)
+          operation = Fog::Google::Compute::Operations.new(:service => service).get(data.name)
           operation.wait_for { ready? } unless async
           operation
         end

data/lib/fog/{compute/google → google/compute}/models/instance_templates.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class InstanceTemplates < Fog::Collection
-        model Fog::Compute::Google::InstanceTemplate
+        model Fog::Google::Compute::InstanceTemplate
 
         def all(opts = {})
           items = []