fog-google 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e4868fbdd7a60000ea6a349ce4f693c39bd62c
-  data.tar.gz: 92c1d9a1f79427c290e499896a8d454eb9d78556
+  metadata.gz: 10a8ac12072ce29979f949f17a52e6abe869066a
+  data.tar.gz: 2b605bd25340566ef987a53dd4630af3d04cddb0
 SHA512:
-  metadata.gz: 8d14851bab45918fec8f0d4cbb48ad6768b6ddeb298e0241f4b09b7ba918615251758ec22ef2636e1d481ee84ffae8bef4952107242a722523953141b1e2f799
-  data.tar.gz: 4236f7940f9f9d86362cd18ea0e0eccf466768f9ebcb3ae7a54d7c48bbbdfbff8139f06107f69837593cfb3a1684f5529b2c2e59b252fc1ea5f4040760d1c6cd
+  metadata.gz: a01b577b14ecf8c6393a2736f846e1057adefebbdae28ce999ca50868a03d2edd71d7e2363ec7c9dca30b137a64926eb3686bd9ad9c939385d27b9e1c81d4884
+  data.tar.gz: e3945cdfa27edeff1badc22cf32cb43dd68fbeb159673e83684e4dc539dd6a4af2f3aeca453b5fb64741c0903b18d40854dfc6b05c9c4eab348e2684dba64461

data/.fog.example

@@ -0,0 +1,27 @@
+##################################################################
+# This is configuration snippet to configure Google Cloud Platform
+# for fog library.
+#
+# 1. Copy this file into your home dir: "~/.fog":
+#
+#    $ cat .fog.example >> ~/.fog
+#
+# 2. Follow instructions to generate a private key: 
+#    https://cloud.google.com/storage/docs/authentication#generating-a-private-key
+#
+# 3. Edit the new file accordingly.
+#
+##################################################################
+# START GOOGLE CONFIG
+my_google_credentials:
+    google_project: my-project-id
+    google_client_email: xxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@developer.gserviceaccount.com
+    google_json_key_location: /path/to/my-project-xxxxxxxxxxxx.json
+    # You can also provide service account credentials with `google_json_key_string` or 
+    # with `google_key_location` and `google_key_string` for P12 private keys.
+    # If so, uncomment the two following lines.
+    # HMAC credentials follow a similar format:
+	#google_storage_access_key_id: GOOGXXXXXXXXXXXXXXXX
+	#google_storage_secret_access_key: XXXX+XXX/XXXXXXXX+XXXXXXXXXXXXXXXXXXXXX
+# /END GOOGLE CONFIG
+#################################################################

data/.rubocop.yml

@@ -2,12 +2,22 @@
 Metrics/LineLength:
   Enabled: false
 
+Style/ConditionalAssignment:
+  SingleLineConditionsOnly: true
+
 Style/Encoding:
   EnforcedStyle: when_needed
 
 Style/FormatString:
   Enabled: false
 
+Style/RegexpLiteral:
+  Enabled: false
+
+#TODO: this needs to be adressed not through the linter
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 

data/.travis.yml

@@ -1,17 +1,18 @@
 language: ruby
 cache: bundler
 sudo: false
+dist: trusty
 matrix:
   fast_finish: true
   include:
     - rvm: 2.1
     - rvm: 2.2
-    - rvm: 2.3.0
-    - rvm: 2.3.1
+    - rvm: 2.3
     - rvm: 2.4.0
+    - rvm: 2.4.1
     - rvm: jruby-head
   allow_failures:
     - rvm: jruby-head
-    - rvm: 2.4.0
+    - rvm: 2.4.1
 notifications:
   email: false

data/README.md

@@ -67,24 +67,12 @@ $ gem install fog-google
 
 #### Credentials
 
-Follow the [instructions to generate a private key](https://cloud.google.com/storage/docs/authentication#generating-a-private-key).  You can then create a fog credentials file at `~/.fog`, which will look something like this:
+Follow the [instructions to generate a private key](https://cloud.google.com/storage/docs/authentication#generating-a-private-key). A sample credentials file can be found in `.fog.example` in this directory:
 
-```
-my_credential:
-    google_project: my-project
-    google_client_email: xxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@developer.gserviceaccount.com
-    google_json_key_location: /path/to/my-project-xxxxxxxxxxxx.json
-```
-
-You can also provide service account credentials with `google_json_key_string` or with `google_key_location` and `google_key_string` for P12 private keys.
+    cat .fog.example >> ~/.fog # appends the sample configuration
+    vim ~/.fog                 # edit file with yout config
+    
 
-HMAC credentials follow a similar format:
-
-```
-my_credentials:
-	google_storage_access_key_id: GOOGXXXXXXXXXXXXXXXX
-	google_storage_secret_access_key: XXXX+XXX/XXXXXXXX+XXXXXXXXXXXXXXXXXXXXX
-```	
 
 #### SSH-ing into instances
 
@@ -94,7 +82,7 @@ If you want to be able to bootstrap SSH-able instances, (using `servers.bootstra
 
 Once you've specified your credentials, you should be good to go!
 ```
-λ bundle exec pry
+$ bundle exec pry
 [1] pry(main)> require 'fog/google'
 => true
 [2] pry(main)> connection = Fog::Compute::Google.new
@@ -106,4 +94,4 @@ Once you've specified your credentials, you should be good to go!
 
 ## Contributing
 
-See `CONTRIBUTING.md` in this repository.
+See `CONTRIBUTING.md` in this repository.

data/examples/bootstrap.rb

@@ -10,7 +10,6 @@ def test
   connection = Fog::Compute.new(:provider => "Google")
 
   server = connection.servers.bootstrap
-  server.wait_for { sshable? }
 
   raise "Could not bootstrap sshable server." unless server.ssh("whoami")
   raise "Could not delete server." unless server.destroy

data/examples/network.rb

@@ -1,11 +1,25 @@
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
+
+require "bundler"
+Bundler.require(:default, :development)
+# Uncomment this if you want to make real requests to GCE (you _will_ be billed!)
+# WebMock.disable!
+
 def test
   connection = Fog::Compute.new(:provider => "Google")
 
-  # we create a new private network
-  connection.insert_network("my-private-network", "10.240.0.0/16")
+  puts "Creating a new private network..."
+  puts "---------------------------------"
+  network = connection.networks.create(
+    :name => "test-private-network",
+    :ipv4_range => "10.240.0.0/16"
+  )
 
   name = "fog-smoke-test-#{Time.now.to_i}"
 
+  puts "Creating a disk for an instance..."
+  puts "---------------------------------"
   disk = connection.disks.create(
     :name => name,
     :size_gb => 10,
@@ -15,6 +29,8 @@ def test
 
   disk.wait_for { disk.ready? }
 
+  puts "Spinning up an instance with private network config..."
+  puts "------------------------------------------------------"
   server = connection.servers.create(
     :name => name,
     :disks => [disk],
@@ -22,14 +38,18 @@ def test
     :zone_name => "us-central1-a",
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),
     :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
-    :network => "my-private-network",
+    :network => network,
     :external_ip => false,
-    :user => ENV["USER"])
+    :username => ENV["USER"]
+  )
 
   # The network won't have any firewall rules, so we won't be able to ssh in.
   server.wait_for { ready? }
 
   raise "Could not delete server." unless server.destroy
+  raise "Could not delete network." unless network.destroy
 rescue StandardError => e
   p e.message
 end
+
+test

data/examples/precreated_client.rb

@@ -1,3 +1,14 @@
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
+
+require "bundler"
+Bundler.require(:default, :development)
+# Uncomment this if you want to make real requests to GCE (you _will_ be billed!)
+# WebMock.disable!
+
+# This example shows how to work with fog using a pre-created Google API client
+# with specific parameters, should you want to for any reason.
+
 def test
   client = Google::APIClient.new(:application_name => "supress")
   connection = Fog::Compute.new(:provider => "Google", :google_client => client)
@@ -9,3 +20,5 @@ def test
     p e.message
   end
 end
+
+test

data/lib/fog/compute/google.rb

@@ -5,8 +5,18 @@ module Fog
       autoload :Real, File.expand_path("../google/real", __FILE__)
 
       requires :google_project
-      recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_key_string,
-                 :google_client, :google_json_key_location, :google_json_key_string, :google_extra_global_projects
+      recognizes(
+        :app_name,
+        :app_version,
+        :google_client,
+        :google_client_email,
+        :google_client_options,
+        :google_extra_global_projects,
+        :google_key_location,
+        :google_key_string,
+        :google_json_key_location,
+        :google_json_key_string
+      )
 
       GOOGLE_COMPUTE_API_VERSION     = "v1"
       GOOGLE_COMPUTE_BASE_URL        = "https://www.googleapis.com/compute/"
@@ -16,6 +26,7 @@ module Fog
                                           https://www.googleapis.com/auth/cloud-platform)
       GOOGLE_COMPUTE_DEFAULT_NETWORK = "default"
       RUNNING = "RUNNING".freeze
+      PROVISIONING = "PROVISIONING".freeze
 
       request_path "fog/compute/google/requests"
       request :add_backend_service_backends
@@ -90,6 +101,7 @@ module Fog
       request :insert_backend_service
       request :insert_disk
       request :insert_firewall
+      request :update_firewall
       request :insert_forwarding_rule
       request :insert_global_forwarding_rule
       request :insert_http_health_check

data/lib/fog/compute/google/models/firewall.rb

@@ -28,6 +28,15 @@ module Fog
           reload
         end
 
+        def update
+          requires :identity, :allowed, :network
+
+          data = service.update_firewall(identity, allowed, network, attributes)
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"])
+          operation.wait_for { !pending? }
+          reload
+        end
+
         def destroy(async = true)
           requires :identity
 

data/lib/fog/compute/google/models/instance_group.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :fingerprint
         attribute :namedPorts
         attribute :network
+        attribute :subnetwork
         attribute :self_link, :aliases => "selfLink"
         attribute :size
         attribute :zone, :aliases => :zone_name
@@ -18,7 +19,12 @@ module Fog
         def save
           requires :name, :zone
 
-          service.insert_instance_group(name, zone)
+          options = {
+            "network" => network_name,
+            "subnetwork" => subnetwork_name
+          }
+
+          service.insert_instance_group(name, zone, options)
         end
 
         def destroy(_async = true)
@@ -60,6 +66,14 @@ module Fog
           zone.nil? ? nil : zone.split("/")[-1]
         end
 
+        def network_name
+          network.nil? ? nil : network.split("/")[-1]
+        end
+
+        def subnetwork_name
+          subnetwork.nil? ? nil : subnetwork.split("/")[-1]
+        end
+
         private
 
         def format_instance_list(instance_list)

data/lib/fog/compute/google/models/network.rb

@@ -21,7 +21,9 @@ module Fog
 
           data = service.insert_network(identity, ipv4_range, attributes)
           operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"])
-          operation.wait_for { !pending? }
+          # Since network has no "state" we can query, we have to wait for the operation to finish
+          # TODO: change back to async when there's a proper state API
+          operation.wait_for { ready? }
           reload
         end
 
@@ -33,6 +35,13 @@ module Fog
           operation.wait_for { ready? } unless async
           operation
         end
+
+        # Returns a ready API structure for insert_instance, used in insert_server request.
+        def get_as_interface_config(access_config = nil)
+          network_interface = { "network" => self_link }
+          network_interface["accessConfigs"] = [access_config] if access_config
+          network_interface
+        end
       end
     end
   end

data/lib/fog/compute/google/models/server.rb

@@ -26,6 +26,7 @@ module Fog
         # These attributes are not available in the representation of an 'instance' returned by the GCE API.
         # They are useful only for the create process
         attribute :network, :aliases => "network"
+        attribute :subnetwork, :aliases => "subnetwork"
         attribute :external_ip, :aliases => "externalIP"
         attribute :auto_restart
         attribute :on_host_maintenance
@@ -198,6 +199,10 @@ module Fog
           Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"], data.body["zone"])
         end
 
+        def provisioning?
+          state == PROVISIONING
+        end
+
         def ready?
           state == RUNNING
         end
@@ -251,6 +256,7 @@ module Fog
             "machineType" => machine_type,
             "networkInterfaces" => network_interfaces,
             "network" => network,
+            "subnetwork" => subnetwork,
             "externalIp" => external_ip,
             "disks" => disks,
             "metadata" => metadata,

data/lib/fog/compute/google/models/snapshots.rb

@@ -5,9 +5,15 @@ module Fog
         model Fog::Compute::Google::Snapshot
 
         def all
-          data = service.list_snapshots
-          snapshots = data.body["items"] || []
-          load(snapshots)
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_snapshots(nil, next_page_token)
+            items.concat(data.body["items"])
+            next_page_token = data.body["nextPageToken"]
+            break if next_page_token.nil? || next_page_token.empty?
+          end
+          load(items)
         end
 
         def get(snap_id)

data/lib/fog/compute/google/models/subnetwork.rb

@@ -36,6 +36,11 @@ module Fog
           operation
         end
 
+        def update_interface_config(network_interface)
+          network_interface["subnetwork"] = self_link if network_interface
+          network_interface
+        end
+
         def reload
           requires :identity, :region
 

data/lib/fog/compute/google/requests/insert_instance_group.rb

@@ -18,10 +18,17 @@ module Fog
           id = Fog::Mock.random_numbers(19).to_s
 
           body = {
-            "name" => group_name,
-            "network" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/networks/default"
+            "name" => group_name
           }
+
           body["description"] = options["description"] if options["description"]
+          network_name = options["network"] ? options["network"].split("/")[-1] : GOOGLE_COMPUTE_DEFAULT_NETWORK
+          body["network"] = "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/networks/#{network_name}"
+
+          unless options["subnetwork"].nil?
+            subnetwork_name = options["subnetwork"].split("/")[-1]
+            body["subnetwork"] = "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{@region}/subnetworks/#{subnetwork_name}"
+          end
 
           request(api_method, parameters, body)
         end

data/lib/fog/compute/google/requests/insert_server.rb

@@ -110,6 +110,44 @@ module Fog
           disks
         end
 
+        def handle_networks(options, region_name)
+          # Only one access config, ONE_TO_ONE_NAT, is supported per instance.
+          # If there are no accessConfigs specified, then this instance will have no external internet access.
+          access_config = { "type" => "ONE_TO_ONE_NAT", "name" => "External NAT" }
+          # If natIP is undefined VM will get an IP from a shared ephemeral IP address pool
+          if options.key? "externalIp"
+            access_config["natIP"] = options.delete "externalIp"
+            # If :external_ip is set to 'false', do not allow _any_ external networking
+            access_config = nil if access_config["natIP"] == false
+          end
+
+          # If no networking options are specified, assume default network
+          if options.key? "network"
+            network = options.delete "network"
+          else
+            network = GOOGLE_COMPUTE_DEFAULT_NETWORK
+          end
+
+          # Objectify the network if needed
+          unless network.is_a?(Network)
+            network = networks.get(network)
+          end
+
+          network_interfaces = network.get_as_interface_config(access_config)
+
+          if options.key? "subnetwork"
+            subnetwork = options.delete "subnetwork"
+            # Objectify the subnetwork if needed
+            unless subnetwork.is_a?(Subnetwork)
+              subnetwork = subnetworks.get(subnetwork, region_name)
+            end
+            network_interfaces = subnetwork.update_interface_config(network_interfaces)
+          end
+
+          # Return a networkInterfaces array
+          [network_interfaces]
+        end
+
         def format_metadata(metadata)
           { "items" => metadata.map { |k, v| { "key" => k, "value" => v } } }
         end
@@ -170,7 +208,7 @@ module Fog
         #   more information.
         # @return [Excon::Response] response object that represents the result.
         def insert_server(server_name, zone_name, options = {}, *deprecated_args)
-          if deprecated_args.length > 0 || !options.is_a?(Hash)
+          if !deprecated_args.empty? || !options.is_a?(Hash)
             raise ArgumentError.new "Too many parameters specified. This may be the cause of code written for an outdated"\
                 " version of fog. Usage: server_name, zone_name, [options]"
           end
@@ -182,28 +220,6 @@ module Fog
           body_object = { :name => server_name }
 
           body_object["machineType"] = @api_url + @project + "/zones/#{zone_name}/machineTypes/#{options.delete 'machineType'}"
-          network = nil
-          if options.key? "network"
-            network = options.delete "network"
-          else
-            network = GOOGLE_COMPUTE_DEFAULT_NETWORK
-          end
-
-          # ExternalIP is default value for server creation
-          access_config = { "type" => "ONE_TO_ONE_NAT", "name" => "External NAT" }
-          # leave natIP undefined to use an IP from a shared ephemeral IP address pool
-          if options.key? "externalIp"
-            access_config["natIP"] = options.delete "externalIp"
-            # If set to 'false', that would mean user does no want to allocate an external IP
-            access_config = nil if access_config["natIP"] == false
-          end
-
-          networkInterfaces = []
-          unless network.nil?
-            networkInterface = { "network" => @api_url + @project + "/global/networks/#{network}" }
-            networkInterface["accessConfigs"] = [access_config] if access_config
-            networkInterfaces << networkInterface
-          end
 
           scheduling = {
             "automaticRestart" => false,
@@ -235,7 +251,7 @@ module Fog
           end
 
           # TODO: add other networks
-          body_object["networkInterfaces"] = networkInterfaces
+          body_object["networkInterfaces"] = handle_networks(options, get_zone(zone_name).body["region"].split("/")[-1])
 
           if options["disks"].nil? || options["disks"].empty?
             raise ArgumentError.new "Empty value for field 'disks'. Boot disk must be specified"

data/lib/fog/compute/google/requests/list_snapshots.rb

@@ -8,11 +8,12 @@ module Fog
       end
 
       class Real
-        def list_snapshots(project = nil)
+        def list_snapshots(project = nil, next_page_token = nil)
           api_method = @compute.snapshots.list
           project = @project if project.nil?
           parameters = {
-            "project" => project
+            "project" => project,
+            "pageToken" => next_page_token
           }
 
           request(api_method, parameters)

data/lib/fog/compute/google/requests/update_firewall.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def update_firewall(_firewall_name, _allowed, _network = GOOGLE_COMPUTE_DEFAULT_NETWORK, _options = {})
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def update_firewall(firewall_name, allowed, network = GOOGLE_COMPUTE_DEFAULT_NETWORK, options = {})
+          unless network.start_with? "http"
+            network = "#{@api_url}#{@project}/global/networks/#{network}"
+          end
+
+          api_method = @compute.firewalls.update
+          parameters = {
+            "project" => @project,
+            "firewall" => firewall_name
+          }
+          body_object = {
+            "allowed" => allowed,
+            "network" => network
+          }
+          unless options[:description].nil?
+            body_object["description"] = options[:description]
+          end
+          unless options[:source_ranges].nil? || options[:source_ranges].empty?
+            body_object["sourceRanges"] = options[:source_ranges]
+          end
+          unless options[:source_tags].nil? || options[:source_tags].empty?
+            body_object["sourceTags"] = options[:source_tags]
+          end
+          unless options[:target_tags].nil? || options[:target_tags].empty?
+            body_object["targetTags"] = options[:target_tags]
+          end
+
+          request(api_method, parameters, body_object)
+        end
+      end
+    end
+  end
+end

data/lib/fog/dns/google.rb

@@ -5,8 +5,17 @@ module Fog
       autoload :Real, File.expand_path("../google/real", __FILE__)
 
       requires :google_project
-      recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_key_string,
-                 :google_client, :google_json_key_location, :google_json_key_string
+      recognizes(
+        :app_name,
+        :app_version,
+        :google_client,
+        :google_client_email,
+        :google_client_options,
+        :google_key_location,
+        :google_key_string,
+        :google_json_key_location,
+        :google_json_key_string
+      )
 
       GOOGLE_DNS_API_VERSION     = "v1"
       GOOGLE_DNS_BASE_URL        = "https://www.googleapis.com/dns/"

data/lib/fog/google/monitoring.rb

@@ -5,8 +5,17 @@ module Fog
       autoload :Real, File.expand_path("../monitoring/real", __FILE__)
 
       requires :google_project
-      recognizes :google_client_email, :google_key_location, :google_key_string, :google_client,
-                 :app_name, :app_version, :google_json_key_location, :google_json_key_string
+      recognizes(
+        :app_name,
+        :app_version,
+        :google_client,
+        :google_client_email,
+        :google_client_options,
+        :google_key_location,
+        :google_key_string,
+        :google_json_key_location,
+        :google_json_key_string
+      )
 
       GOOGLE_MONITORING_API_VERSION    = "v2beta2".freeze
       GOOGLE_MONITORING_BASE_URL       = "https://www.googleapis.com/cloudmonitoring/"

data/lib/fog/google/pubsub.rb

@@ -5,8 +5,17 @@ module Fog
       autoload :Real, File.expand_path("../pubsub/real", __FILE__)
 
       requires :google_project
-      recognizes :google_client_email, :google_key_location, :google_key_string, :google_client,
-                 :app_name, :app_version, :google_json_key_location, :google_json_key_string
+      recognizes(
+        :app_name,
+        :app_version,
+        :google_client,
+        :google_client_email,
+        :google_client_options,
+        :google_json_key_location,
+        :google_json_key_string,
+        :google_key_location,
+        :google_key_string
+      )
 
       GOOGLE_PUBSUB_API_VERSION    = "v1".freeze
       GOOGLE_PUBSUB_BASE_URL       = "https://www.googleapis.com/pubsub".freeze

data/lib/fog/google/requests/pubsub/create_subscription.rb

@@ -26,7 +26,7 @@ module Fog
             "topic" => (topic.is_a?(Topic) ? topic.name : topic.to_s)
           }
 
-          unless push_config.empty?
+          if push_config && push_config.any?
             body["pushConfig"] = push_config
           end
 

data/lib/fog/google/sql.rb

@@ -5,8 +5,17 @@ module Fog
       autoload :Real, File.expand_path("../sql/real", __FILE__)
 
       requires :google_project
-      recognizes :google_client_email, :google_key_location, :google_key_string, :google_client,
-                 :app_name, :app_version, :google_json_key_location, :google_json_key_string
+      recognizes(
+        :app_name,
+        :app_version,
+        :google_client,
+        :google_client_email,
+        :google_client_options,
+        :google_key_location,
+        :google_key_string,
+        :google_json_key_location,
+        :google_json_key_string
+      )
 
       GOOGLE_SQL_API_VERSION    = "v1beta3"
       GOOGLE_SQL_BASE_URL       = "https://www.googleapis.com/sql/"

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.5.2".freeze
+    VERSION = "0.5.3".freeze
   end
 end

data/lib/fog/storage/google_json.rb

@@ -6,8 +6,17 @@ module Fog
       autoload :Utils, File.expand_path("../google_json/utils", __FILE__)
 
       requires :google_project
-      recognizes :google_client_email, :google_key_location, :google_key_string, :google_client,
-                 :app_name, :app_version, :google_json_key_location, :google_json_key_string
+      recognizes(
+        :app_name,
+        :app_version,
+        :google_client,
+        :google_client_email,
+        :google_client_options,
+        :google_key_location,
+        :google_key_string,
+        :google_json_key_location,
+        :google_json_key_string
+      )
 
       # https://cloud.google.com/storage/docs/json_api/v1/
       GOOGLE_STORAGE_JSON_API_VERSION = "v1"

data/lib/fog/storage/google_json/models/files.rb

@@ -28,10 +28,6 @@ module Fog
             subset = dup.all
 
             subset.each_file_this_page { |f| yield f }
-            while subset.is_truncated
-              subset = subset.all(:marker => subset.last.key)
-              subset.each_file_this_page { |f| yield f }
-            end
 
             self
           end

data/lib/fog/storage/google_json/requests/get_bucket.rb

@@ -61,13 +61,11 @@ module Fog
               response.body = {
                 "CommonPrefixes"  => [],
                 "Contents"        => truncated_contents,
-                "IsTruncated"     => truncated_contents.size != contents.size,
                 "Marker"          => options["marker"],
                 "Name"            => bucket["Name"],
                 "Prefix"          => options["prefix"]
               }
               if options["max-keys"] && options["max-keys"] < response.body["Contents"].length
-                response.body["IsTruncated"] = true
                 response.body["Contents"] = response.body["Contents"][0...options["max-keys"]]
               end
             else

data/tasks/console.rake

@@ -5,6 +5,13 @@ desc "Project IRB console"
 task :console do
   require "bundler"
   Bundler.require(:default, :development)
+
+  # Reload helper to avoid resetting the environment when debugging
+  def reload!
+    files = $LOADED_FEATURES.select { |feat| feat =~ /\/fog-google\// }
+    files.each { |file| load file }
+  end
+
   ARGV.clear
   Pry.start
 end

data/tasks/test.rake

@@ -3,6 +3,7 @@ require "rake/testtask"
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = File.join("test", "**", "test_*.rb")
+  t.warning = false
 end
 
 namespace :test do

data/test/integration/compute/test_compute_addresses_collection.rb

@@ -50,7 +50,7 @@ class TestComputeAddressesCollection < FogIntegrationTest
       ],
       :external_ip => my_address.address
     )
-    my_server.wait_for { my_server.state != "PROVISIONING" }
+    my_server.wait_for { provisioning? }
 
     # And verify that it's correctly assigned
     assert_equal(

data/test/integration/compute/test_compute_networks_collection.rb

@@ -0,0 +1,78 @@
+require "helpers/integration_test_helper"
+require "securerandom"
+
+class TestComputeNetworksCollection < FogIntegrationTest
+  DEFAULT_REGION = "us-central1".freeze
+  DEFAULT_ZONE = "us-central1-b".freeze
+  RESOURCE_PREFIX = "fog-test-networkscol".freeze
+
+  # Ensure we clean up any created resources
+  Minitest.after_run do
+    client = Fog::Compute::Google.new
+    client.networks.each { |a| a.destroy if a.name.start_with?(RESOURCE_PREFIX) }
+    client.servers.each { |s| s.destroy if s.name.start_with?(RESOURCE_PREFIX) }
+  end
+
+  def test_network_workflow
+    client = Fog::Compute::Google.new
+
+    my_network_name = new_resource_name
+    # An address can be created by specifying a name and a region
+    my_network = client.networks.create(
+      :name => my_network_name,
+      :ipv4_range => "10.240.#{rand(255)}.0/24"
+    )
+
+    assert_equal(my_network_name, my_network.name, "My network should have the provided name")
+
+    # It should also be visible when listing addresses
+    assert_includes(client.networks.all.map(&:name), my_network_name)
+
+    # Be aware that although the address resource is created, it might not yet
+    # have an ip address. You can poll until the address has been assigned.
+    my_network.wait_for { !my_network.ipv4_range.nil? }
+    assert_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d{1,2}/,
+                 my_network.ipv4_range,
+                 "My address's address should have a valid ipv4 address")
+
+    # Now that we have an address, we can create a server using the static ip
+    my_server = client.servers.create(
+      :name => new_resource_name,
+      :machine_type => "f1-micro",
+      :zone_name => DEFAULT_ZONE,
+      :disks => [
+        :boot => true,
+        :autoDelete => true,
+        :initializeParams => {
+          :sourceImage => "projects/debian-cloud/global/images/family/debian-8"
+        }
+      ],
+      :network => my_network
+    )
+    my_server.wait_for { provisioning? }
+
+    # We need to verify that the network has been correctly assigned
+    assert_equal(
+      my_network.self_link,
+      my_server.network_interfaces[0]["network"],
+      "My created server should have the network specified as the network"
+    )
+
+    # Access config needs to be correctly populated
+    assert_equal(
+      "ONE_TO_ONE_NAT",
+      my_server.network_interfaces[0]["accessConfigs"][0]["type"],
+      "Access config type matches the correct default"
+    )
+
+    assert_equal(
+      "External NAT",
+      my_server.network_interfaces[0]["accessConfigs"][0]["name"],
+      "Access config name matches the correct default"
+    )
+  end
+
+  def new_resource_name
+    "#{RESOURCE_PREFIX}-#{SecureRandom.uuid}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Nat Welch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -208,6 +208,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".fog.example"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -440,6 +441,7 @@ files:
 - lib/fog/compute/google/requests/set_target_http_proxy_url_map.rb
 - lib/fog/compute/google/requests/start_server.rb
 - lib/fog/compute/google/requests/stop_server.rb
+- lib/fog/compute/google/requests/update_firewall.rb
 - lib/fog/compute/google/requests/update_url_map.rb
 - lib/fog/compute/google/requests/validate_url_map.rb
 - lib/fog/dns/google.rb
@@ -598,7 +600,6 @@ files:
 - tasks/bundler.rake
 - tasks/console.rake
 - tasks/lint.rake
-- tasks/smoke.rake
 - tasks/test.rake
 - test/helpers/client_helper.rb
 - test/helpers/integration_test_helper.rb
@@ -607,6 +608,7 @@ files:
 - test/integration/compute/requests/test_compute_address_requests.rb
 - test/integration/compute/test_backend_services.rb
 - test/integration/compute/test_compute_addresses_collection.rb
+- test/integration/compute/test_compute_networks_collection.rb
 - test/integration/compute/test_disk_types.rb
 - test/integration/compute/test_disks.rb
 - test/integration/compute/test_forwarding_rules.rb
@@ -725,7 +727,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
@@ -737,6 +739,7 @@ test_files:
 - test/integration/compute/requests/test_compute_address_requests.rb
 - test/integration/compute/test_backend_services.rb
 - test/integration/compute/test_compute_addresses_collection.rb
+- test/integration/compute/test_compute_networks_collection.rb
 - test/integration/compute/test_disk_types.rb
 - test/integration/compute/test_disks.rb
 - test/integration/compute/test_forwarding_rules.rb

data/tasks/smoke.rake

@@ -1,15 +0,0 @@
-desc "Run smoke tests from examples directory"
-namespace :google do
-  namespace :smoke do
-    desc "Smoke tests for Google Compute Engine."
-    task :compute do
-      puts "These smoke tests assume you have a file at ~/.fog which has your credentials for connecting to GCE."
-
-      Dir.glob("./examples/*.rb").each do |file|
-        puts "Running #{file}:"
-        require file
-        test
-      end
-    end
-  end
-end