fog-google 1.24.1 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32fba42f750f2248b67a52b9c90e4ad74afeee359c7b8eec325de6e61e958e3d
-  data.tar.gz: 6b34cbc9704516e06f9dbff7a6cb37eb403acaefd06e5be5361bcad5e065ebc3
+  metadata.gz: 87a715866f44c0d1a77d6a2d9eb1c86b9eb1b2ad1926b48ca8f33bff6729f038
+  data.tar.gz: 9d0af9d669834f9859b2a5c1d0b12a377fdc11cc8bcdad1d14a58068f00f1c35
 SHA512:
-  metadata.gz: 06b4ca2279ada450d5036ed62e54187bdb82172fb48873446929dd409b8c45ab1e2fb59f63bfdd1498e1d8917e7276ebc69a718ae7a6c188c8279fffe4eb36a1
-  data.tar.gz: 3f2201ff0d673c300b89d69ee228301afd660bc59bfdde91dcc1da48894798f9c64a6e9847c0818c8c32dcca1097ad33646966d484988c0959a7a0dd91b35678
+  metadata.gz: 556ef7cd9ca3e7c33308c9fd8e668f98284fdf7aecbd17c1ceeef2a317b324c2f4cd8e6cd6201fd95507c9a74960d2318dbbf6c6d173cf246d8491367a578523
+  data.tar.gz: 7c00ced8d78888a448c83ee5582580fe10c970aab34dd7d84e52961b8fb796e8d6cf1a776ca704542cd6618b5fdbb591c12bff42014e4389862522da08311db3

data/CHANGELOG.md

@@ -6,6 +6,18 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Next
 
+### User-facing
+
+## 1.25.0
+
+### User-facing
+
+fog-core v2.2 and up now requires `Fog::Google:<service>` instead of `Fog::<service>::Google`.
+There are shims in place that will provide backwards compatibility for the latter with
+a deprecation warning, but you should update your code accordingly. The next major release
+will drop support of the old format.
+
+- #636 Support fog-core 2.5 and up [stanhu]
 
 ## 1.24.1
 

data/CONTRIBUTING.md

@@ -1,9 +1,9 @@
 # Getting Involved
 
-New contributors are always welcome, and when in doubt please ask questions! 
+New contributors are always welcome, and when in doubt please ask questions!
 We strive to be an open and welcoming community. Please be nice to one another.
 
-We recommend heading over to fog's [CONTRIBUTING](https://github.com/fog/fog/blob/master/CONTRIBUTING.md) 
+We recommend heading over to fog's [CONTRIBUTING](https://github.com/fog/fog/blob/master/CONTRIBUTING.md)
 and having a look around as well.  It has information and context about the state of the `fog` project as a whole.
 
 ### Coding
@@ -62,7 +62,7 @@ $ rake console
 ### Documentation
 
 Code should be documented using [YARDoc](https://yardoc.org/) syntax.
-We use [inch](https://github.com/rrrene/inch) to keep track of overall doc 
+We use [inch](https://github.com/rrrene/inch) to keep track of overall doc
 coverage and [inch-ci](https://inch-ci.org/) to keep track of changes over time.
 
 You can view a doc coverage report by running:
@@ -72,19 +72,19 @@ $ inch
 
 Or view suggestions on a specific method:
 ```
-$ inch show Fog::Compute::Google::Server#set_metadata
+$ inch show Fog::Google::Compute::Server#set_metadata
 ```
 
 ### Testing
 
-This module is tested with [Minitest](https://github.com/seattlerb/minitest).  
+This module is tested with [Minitest](https://github.com/seattlerb/minitest).
 
 #### Integration tests
 
-Live integration tests can be found in `test/integration/`.  
+Live integration tests can be found in `test/integration/`.
 
 Most of the library functionality is currently covered with them. To simplify things for contributors we have a
-CI system that runs all integration tests in parallel against all pull requests marked with `integrate` label 
+CI system that runs all integration tests in parallel against all pull requests marked with `integrate` label
 that anyone in `fog-google` team can set. Read [CI section](https://github.com/fog/fog-google/blob/master/CONTRIBUTING.md#continuous-integration)
 for more info.
 
@@ -137,7 +137,7 @@ We're in progress of extending the library with more unit tests and contribution
 
 #### The transition from `shindo` to Minitest
 
-Previously, [shindo](https://github.com/geemus/shindo) was the primary testing framework. 
+Previously, [shindo](https://github.com/geemus/shindo) was the primary testing framework.
 We've moved away from it, and to Minitest, but some artifacts may remain.
 
 For more information on transition, read [#50](https://github.com/fog/fog-google/issues/50).
@@ -158,10 +158,10 @@ and contains the standard tests to run for all resources, (e.g. `test_lifecycle`
 It also calls `cleanup` on the resource's factory during teardown, to make sure
 that resources are getting destroyed before the next test run.
 - The **factory**, (e.g. `ServersFactory`, in `test/integration/factories/servers_factory.rb`,)
-automates the creation of resources and/or supplies parameters for explicit 
+automates the creation of resources and/or supplies parameters for explicit
 creation of resources.  For example, `ServersFactory` initializes a `DisksFactory`
 to supply disks in order to create servers, and implements the `params` method
-so that tests can create servers with unique names, correct zones and machine 
+so that tests can create servers with unique names, correct zones and machine
 types, and automatically-created disks.  `ServersFactory` inherits the `create`
 method from `CollectionFactory`, which allows tests to create servers on-demand.
 - The **main test**, (e.g. `TestServers`, in `test/integration/compute/test_servers.rb`,)
@@ -170,6 +170,6 @@ method from `CollectionFactory`, which allows tests to create servers on-demand.
  it initializes a `ServersFactory`, and it includes any other tests specific to
  this collection, (e.g. `test_bootstrap_ssh_destroy`).
 
-If you want to create another resource, you should add live integration tests; 
+If you want to create another resource, you should add live integration tests;
 all you need to do is create a factory in `test/integration/factories/my_resource_factory.rb`
 and a main test in `test/integration/compute/test_my_resource.rb` that mixes in `TestCollection`.

data/README.md

@@ -24,7 +24,7 @@ We're proud to be sponsored by MeisterLabs who are generously funding our CI sta
 
 ## Storage
 
-There are two ways to access [Google Cloud Storage](https://cloud.google.com/storage/). The old S3 API and the new JSON API. `Fog::Storage::Google` will automatically direct you to the appropriate API based on the credentials you provide it.
+There are two ways to access [Google Cloud Storage](https://cloud.google.com/storage/). The old S3 API and the new JSON API. `Fog::Google::Storage` will automatically direct you to the appropriate API based on the credentials you provide it.
 
  * The [XML API](https://cloud.google.com/storage/docs/xml-api-overview/) is almost identical to S3. Use [Google's interoperability keys](https://cloud.google.com/storage/docs/migrating#keys) to access it.
  * The new [JSON API](https://cloud.google.com/storage/docs/json_api/) is faster and uses auth similarly to the rest of the Google Cloud APIs using a [service account private key](https://developers.google.com/identity/protocols/OAuth2ServiceAccount).
@@ -33,7 +33,7 @@ There are two ways to access [Google Cloud Storage](https://cloud.google.com/sto
 
 Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1](https://cloud.google.com/compute/docs/reference/v1/) of the GCE API.
 
-As of 2017-12-15, we are still working on making Fog for Google Compute engine (`Fog::Compute::Google`) feature complete. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like.
+As of 2017-12-15, we are still working on making Fog for Google Compute engine (`Fog::Google::Compute`) feature complete. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like.
 
 ## SQL
 
@@ -112,10 +112,10 @@ Example workflow for a GCE instance with [service account scopes](https://cloud.
 defined:
 
 ```
-> connection = Fog::Compute::Google.new(:google_project => "my-project", :google_application_default => true)
-=> #<Fog::Compute::Google::Real:32157700...
+> connection = Fog::Google::Compute.new(:google_project => "my-project", :google_application_default => true)
+=> #<Fog::Google::Compute::Real:32157700...
 > connection.servers
-=> [  <Fog::Compute::Google::Server ...  ]
+=> [  <Fog::Google::Compute::Server ...  ]
 ```
 
 #### CarrierWave integration
@@ -166,9 +166,9 @@ Once you've specified your credentials, you should be good to go!
 $ bundle exec pry
 [1] pry(main)> require 'fog/google'
 => true
-[2] pry(main)> connection = Fog::Compute::Google.new
+[2] pry(main)> connection = Fog::Google::Compute.new
 [3] pry(main)> connection.servers
-=> [  <Fog::Compute::Google::Server
+=> [  <Fog::Google::Compute::Server
     name="xxxxxxx",
     kind="compute#instance",
 ```

data/examples/create_instance_and_attach_disk_later.rb

@@ -49,8 +49,8 @@ def example
 
   p "Attach second disk to the running server"
   device_name = "fog-smoke-test-device-#{Time.now.to_i}"
-  # See https://github.com/fog/fog-google/blob/master/lib/fog/compute/google/models/disk.rb#L75-L107
-  # See https://github.com/fog/fog-google/blob/master/lib/fog/compute/google/models/server.rb#L35-L50
+  # See https://github.com/fog/fog-google/blob/master/lib/fog/google/compute/models/disk.rb#L75-L107
+  # See https://github.com/fog/fog-google/blob/master/lib/fog/google/compute/models/server.rb#L35-L50
   config_hash = {
     :device_name => device_name,
     :source => "https://www.googleapis.com/compute/v1/projects/#{PROJECT}/zones/#{ZONE}/disks/#{attached_disk.name}"
@@ -58,13 +58,13 @@ def example
   raise "Could not attach second disk" unless connection.attach_disk(server.name, ZONE, config_hash)
 
   p "Waiting for disk to be attached"
-  attached_disk.wait_for { ! users.nil? && users != []}
+  attached_disk.wait_for { !users.nil? && users != [] }
 
   p "Detach second disk"
   raise "Could not detach second disk" unless connection.detach_disk(server.name, ZONE, device_name)
 
   p "Waiting for second disk to be detached"
-  attached_disk.wait_for { users.nil? || users == []}
+  attached_disk.wait_for { users.nil? || users == [] }
 
   p "Deleting server"
   raise "Could not delete server." unless server.destroy
@@ -74,9 +74,8 @@ def example
 
   p "Waiting for second disk to be destroyed"
   begin
-    rc = attached_disk.wait_for { status.nil? || status == 'DELETING' }
-
-  rescue => e
+    rc = attached_disk.wait_for { status.nil? || status == "DELETING" }
+  rescue StandardError => e
     if e.message !~ /not found/ && e.message !~ /notFound/
       raise e
     end

data/examples/dns/project.rb

@@ -1,5 +1,5 @@
 def test
-  connection = Fog::DNS::Google.new
+  connection = Fog::Google::DNS.new
 
   puts "Get the Project limits..."
   puts "-------------------------"

data/examples/dns/zones.rb

@@ -1,5 +1,5 @@
 def test
-  connection = Fog::DNS::Google.new
+  connection = Fog::Google::DNS.new
 
   puts "Create a Zone..."
   puts "----------------"

data/examples/storage.rb

@@ -11,7 +11,7 @@ Bundler.require(:default, :development)
 # Storage -> Storage -> Settings -> "Interoperability" tab -> "Create a new key"
 
 def test
-  connection = Fog::Storage::Google.new
+  connection = Fog::Google::Storage.new
 
   puts "Put a bucket..."
   puts "----------------"

data/examples/storage_json.rb

@@ -11,7 +11,7 @@ Bundler.require(:default, :development)
 # Storage -> Storage -> Settings -> "Interoperability" tab -> "Create a new key"
 
 def test
-  connection = Fog::Storage::Google.new
+  connection = Fog::Google::Storage.new
 
   puts "Put a bucket..."
   puts "----------------"

data/fog-google.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   # As of 0.1.1
   spec.required_ruby_version = ">= 2.0"
 
-  spec.add_dependency "fog-core", "< 2.5"
+  spec.add_dependency "fog-core", "~> 2.5"
   spec.add_dependency "fog-json", "~> 1.2"
   spec.add_dependency "fog-xml", "~> 0.1.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 = []