fog-google 1.19.0 → 1.24.1

data/examples/create_instance_and_attach_disk_later.rb

@@ -0,0 +1,86 @@
+# 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)
+
+ZONE = "us-central1-f"
+PROJECT = Fog.credentials[:google_project]
+
+def example
+  p "Connecting to Google API"
+  connection = Fog::Compute.new(:provider => "Google")
+
+  p "Creating disk"
+  disk = connection.disks.create(
+    :name => "fog-smoke-test-#{Time.now.to_i}",
+    :size_gb => 10,
+    :zone => ZONE,
+    :source_image => "debian-11-bullseye-v20220920"
+  )
+
+  p "Creating a second disk"
+  attached_disk = connection.disks.create(
+    :name => "fog-smoke-test-#{Time.now.to_i}",
+    :size_gb => 10,
+    :zone => ZONE
+  )
+
+  p "Waiting for disks to be ready"
+  disk.wait_for { ready? }
+  attached_disk.wait_for { ready? }
+
+  p "Creating a server"
+  server = connection.servers.create(
+    :name => "fog-smoke-test-#{Time.now.to_i}",
+    :disks => [disk.attached_disk_obj(boot: true, auto_delete: true)],
+    :machine_type => "n1-standard-1",
+    :private_key_path => File.expand_path("~/.ssh/id_rsa"),
+    :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
+    :zone => ZONE,
+    # Will be simplified, see https://github.com/fog/fog-google/issues/360
+    :network_interfaces => [{ :network => "global/networks/default",
+                              :access_configs => [{
+                                :name => "External NAT",
+                                :type => "ONE_TO_ONE_NAT"
+                              }] }],
+    :username => ENV["USER"]
+  )
+
+  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
+  config_hash = {
+    :device_name => device_name,
+    :source => "https://www.googleapis.com/compute/v1/projects/#{PROJECT}/zones/#{ZONE}/disks/#{attached_disk.name}"
+  }
+  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 != []}
+
+  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 == []}
+
+  p "Deleting server"
+  raise "Could not delete server." unless server.destroy
+
+  p "Destroying second disk"
+  raise "Could not delete second disk." unless attached_disk.destroy
+
+  p "Waiting for second disk to be destroyed"
+  begin
+    rc = attached_disk.wait_for { status.nil? || status == 'DELETING' }
+
+  rescue => e
+    if e.message !~ /not found/ && e.message !~ /notFound/
+      raise e
+    end
+  end
+end
+
+example

data/examples/create_instance_with_attached_disk.rb

@@ -13,7 +13,7 @@ def example
     :name => "fog-smoke-test-#{Time.now.to_i}",
     :size_gb => 10,
     :zone => "us-central1-f",
-    :source_image => "debian-9-stretch-v20180611"
+    :source_image => "debian-11-bullseye-v20220920"
   )
 
   p "Creating a second disk"

data/examples/get_list_images.rb

@@ -23,7 +23,7 @@ def test
 
   puts "Fetching a single image from a global project..."
   puts "------------------------------------------------"
-  img = connection.images.get("debian-9-stretch-v20180611")
+  img = connection.images.get("debian-11-bullseye-v20220920")
   raise "Could not GET the image" unless img
   puts img.inspect
 

data/examples/load-balance.rb

@@ -24,7 +24,7 @@ def test
         :name => "#{name}-#{i}",
         :size_gb => 10,
         :zone_name => zone,
-        :source_image => "debian-9-stretch-v20180611"
+        :source_image => "debian-11-bullseye-v20220920"
       )
       disk.wait_for { disk.ready? }
     rescue

data/examples/metadata.rb

@@ -15,7 +15,7 @@ def test
     :name => name,
     :size_gb => 10,
     :zone_name => "us-central1-f",
-    :source_image => "debian-9-stretch-v20180611"
+    :source_image => "debian-11-bullseye-v20220920"
   )
 
   disk.wait_for { disk.ready? }

data/examples/network.rb

@@ -24,7 +24,7 @@ def test
     :name => name,
     :size_gb => 10,
     :zone_name => "us-central1-a",
-    :source_image => "debian-9-stretch-v20180611"
+    :source_image => "debian-11-bullseye-v20220920"
   )
 
   disk.wait_for { disk.ready? }

data/fog-google.gemspec

@@ -20,24 +20,26 @@ Gem::Specification.new do |spec|
   # As of 0.1.1
   spec.required_ruby_version = ">= 2.0"
 
-  spec.add_dependency "fog-core", "< 2.3"
+  spec.add_dependency "fog-core", "< 2.5"
   spec.add_dependency "fog-json", "~> 1.2"
   spec.add_dependency "fog-xml", "~> 0.1.0"
 
-  spec.add_dependency "google-apis-storage_v1", "~> 0.6"
-  spec.add_dependency "google-apis-iamcredentials_v1", "~> 0.6"
-  spec.add_dependency "google-apis-compute_v1", "~> 0.14"
-  spec.add_dependency "google-apis-monitoring_v3", "~> 0.12"
-  spec.add_dependency "google-apis-dns_v1", "~> 0.12"
-  spec.add_dependency "google-apis-pubsub_v1", "~> 0.7"
-  spec.add_dependency "google-apis-sqladmin_v1beta4", "~> 0.13"
+  spec.add_dependency "google-apis-storage_v1", [">= 0.19", "< 1"]
+  spec.add_dependency "google-apis-iamcredentials_v1", "~> 0.15"
+  spec.add_dependency "google-apis-compute_v1", "~> 0.53"
+  spec.add_dependency "google-apis-monitoring_v3", "~> 0.37"
+  spec.add_dependency "google-apis-dns_v1", "~> 0.28"
+  spec.add_dependency "google-apis-pubsub_v1", "~> 0.30"
+  spec.add_dependency "google-apis-sqladmin_v1beta4", "~> 0.38"
 
-  spec.add_dependency "google-cloud-env", "~> 1.2"
+  spec.add_dependency "google-cloud-env", ">= 1.2", "< 3.0"
+
+  spec.add_dependency "addressable", ">= 2.7.0"
 
   # Debugger
   # Locked because pry-byebug is broken with 13+
   # see: https://github.com/deivid-rodriguez/pry-byebug/issues/343
-  spec.add_development_dependency "pry", "= 0.13.0"
+  spec.add_development_dependency "pry", "= 0.14.2"
 
   # Testing gems
   spec.add_development_dependency "retriable"

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

@@ -11,16 +11,25 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-
-          if region
-            data = service.list_addresses(region, **opts).items || []
-          else
-            data = []
-            service.list_aggregated_addresses(**opts).items.each_value do |scoped_list|
-              data.concat(scoped_list.addresses) if scoped_list && scoped_list.addresses
+          items = []
+          next_page_token = nil
+          loop do
+            if region
+              data = service.list_addresses(region, **opts)
+              next_items = data.items || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_addresses(**opts)
+              data.items.each_value do |scoped_list|
+                items.concat(scoped_list.addresses) if scoped_list && scoped_list.addresses
+              end
+              next_page_token = data.next_page_token
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
-          load(data.map(&:to_h))
+          load(items.map(&:to_h))
         end
 
         def get(identity, region = nil)

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

@@ -12,15 +12,25 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-          if zone
-            data = service.list_disk_types(zone, **opts).items
-          else
-            data = []
-            service.list_aggregated_disk_types(**opts).items.each_value do |scoped_lst|
-              data.concat(scoped_lst.disk_types) if scoped_lst && scoped_lst.disk_types
+          items = []
+          next_page_token = nil
+          loop do
+            if zone
+              data = service.list_disk_types(zone, **opts)
+              next_items = data.items || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_disk_types(**opts)
+              data.items.each_value do |scoped_lst|
+                items.concat(scoped_lst.disk_types) if scoped_lst && scoped_lst.disk_types
+              end
+              next_page_token = data.next_page_token
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
-          load(data.map(&:to_h))
+          load(items.map(&:to_h))
         end
 
         def get(identity, zone = nil)

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

@@ -12,20 +12,34 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-          if zone
-            data = service.list_disks(zone, **opts).items || []
-          else
-            data = []
-            service.list_aggregated_disks(**opts).items.each_value do |scoped_list|
-              data.concat(scoped_list.disks) if scoped_list.disks
+          items = []
+          next_page_token = nil
+          loop do
+            if zone
+              data = service.list_disks(zone, **opts)
+              next_items = data.items || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_disks(**opts)
+              data.items.each_value do |scoped_list|
+                items.concat(scoped_list.disks) if scoped_list && scoped_list.disks
+              end
+              next_page_token = data.next_page_token
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
-          load(data.map(&:to_h))
+          load(items.map(&:to_h))
         end
 
         def get(identity, zone = nil)
           if zone
             disk = service.get_disk(identity, zone).to_h
+
+            # Force the hash to contain a :users key so that it will override any :users key in the existing object
+            disk[:users] = nil unless disk.include?(:users)
+
             return new(disk)
           elsif identity
             response = all(:filter => "name eq #{identity}",
@@ -35,7 +49,8 @@ module Fog
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
-          nil
+          # Return an empty object so that wait_for processes the block
+          return new({:status => nil})
         end
 
         # Returns an attached disk configuration hash.

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

@@ -5,8 +5,17 @@ module Fog
         model Fog::Compute::Google::Firewall
 
         def all(opts = {})
-          data = service.list_firewalls(**opts).to_h[:items]
-          load(data || [])
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_firewalls(**opts)
+            next_items = data.to_h[:items] || []
+            items.concat(next_items)
+            next_page_token = data.next_page_token
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
+          end
+          load(items)
         end
 
         def get(identity)

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

@@ -11,19 +11,25 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-
-          if region
-            data = service.list_forwarding_rules(region, **opts).items || []
-          else
-            data = []
-            service.list_aggregated_forwarding_rules(**opts).items
-                   .each_value do |scoped_list|
-              if scoped_list && scoped_list.forwarding_rules
-                data.concat(scoped_list.forwarding_rules)
+          items = []
+          next_page_token = nil
+          loop do
+            if region
+              data = service.list_forwarding_rules(region, **opts)
+              next_items = data.items || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_forwarding_rules(**opts)
+              data.items.each_value do |scoped_list|
+                items.concat(scoped_list.forwarding_rules) if scoped_list && scoped_list.forwarding_rules
               end
+              next_page_token = data.next_page_token
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
-          load(data.map(&:to_h))
+          load(items.map(&:to_h))
         end
 
         def get(identity, region = nil)

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

@@ -5,8 +5,17 @@ module Fog
         model Fog::Compute::Google::GlobalAddress
 
         def all(options = {})
-          data = service.list_global_addresses(**options).to_h[:items] || []
-          load(data)
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_global_addresses(**options)
+            next_items = data.to_h[:items] || []
+            items.concat(next_items)
+            next_page_token = data.next_page_token
+            break if next_page_token.nil? || next_page_token.empty?
+            options[:page_token] = next_page_token
+          end
+          load(items)
         end
 
         def get(identity)

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

@@ -5,8 +5,17 @@ module Fog
         model Fog::Compute::Google::GlobalForwardingRule
 
         def all(opts = {})
-          data = service.list_global_forwarding_rules(**opts).to_h[:items] || []
-          load(data)
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_global_forwarding_rules(**opts)
+            next_items = data.to_h[:items] || []
+            items.concat(next_items)
+            next_page_token = data.next_page_token
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
+          end
+          load(items)
         end
 
         def get(identity)

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

@@ -4,9 +4,18 @@ module Fog
       class HttpHealthChecks < Fog::Collection
         model Fog::Compute::Google::HttpHealthCheck
 
-        def all(_filters = {})
-          data = service.list_http_health_checks.to_h[:items] || []
-          load(data)
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_http_health_checks(**opts)
+            next_items = data.to_h[:items] || []
+            items.concat(next_items)
+            next_page_token = data.next_page_token
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
+          end
+          load(items)
         end
 
         def get(identity)

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

@@ -24,12 +24,21 @@ module Fog
           windows-sql-cloud
         ).freeze
 
-        def all
-          data = all_projects.map do |project|
+        def all(opts = {})
+          items = []
+          all_projects.each do |project|
             begin
-              images = service.list_images(project).items || []
-              # Keep track of the project in which we found the image(s)
-              images.map { |img| img.to_h.merge(:project => project) }
+              next_page_token = nil
+              loop do
+                opts[:page_token] = next_page_token
+                data = service.list_images(project, **opts)
+                images = data.items&.map(&:to_h) || []
+                # Keep track of the project in which we found the image(s)
+                images.each { |img| img.merge!(:project => project) }
+                items.concat(images)
+                next_page_token = data.next_page_token
+                break if next_page_token.nil? || next_page_token.empty?
+              end
             rescue ::Google::Apis::ClientError => e
               raise e unless e.status_code == 404
               # Not everyone has access to every Global Project. Requests
@@ -37,9 +46,7 @@ module Fog
               next
             end
           end
-          data = data.flatten
-
-          load(data)
+          load(items)
         end
 
         # Only return the non-deprecated list of images

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

@@ -12,17 +12,25 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-
-          if zone
-            data = service.list_instance_group_managers(zone, **opts).items || []
-          else
-            data = []
-            service.list_aggregated_instance_group_managers(**opts).items.each_value do |group|
-              data.concat(group.instance_group_managers) if group.instance_group_managers
+          items = []
+          next_page_token = nil
+          loop do
+            if zone
+              data = service.list_instance_group_managers(zone, **opts)
+              next_items = data.items || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_instance_group_managers(**opts)
+              data.items.each_value do |group|
+                items.concat(group.instance_group_managers) if group && group.instance_group_managers
+              end
+              next_page_token = data.next_page_token
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
-
-          load(data.map(&:to_h))
+          load(items.map(&:to_h))
         end
 
         def get(identity, zone = nil)

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

@@ -11,17 +11,25 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-
-          if zone
-            data = service.list_instance_groups(zone).items || []
-          else
-            data = []
-            service.list_aggregated_instance_groups(opts).items.each_value do |group|
-              data.concat(group.instance_groups) if group && group.instance_groups
+          items = []
+          next_page_token = nil
+          loop do
+            if zone
+              data = service.list_instance_groups(zone)
+              next_items = data.items || []
+              items.concat(next_items)
+            else
+              data = service.list_aggregated_instance_groups(opts)
+              data.items.each_value do |group|
+                items.concat(group.instance_groups) if group && group.instance_groups
+              end
+              next_page_token = data.next_page_token
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
 
-          load(data.map(&:to_h))
+          load(items.map(&:to_h))
         end
 
         def get(identity, zone = nil)

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

@@ -4,9 +4,18 @@ module Fog
       class InstanceTemplates < Fog::Collection
         model Fog::Compute::Google::InstanceTemplate
 
-        def all
-          data = service.list_instance_templates.items || []
-          load(data.map(&:to_h))
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_instance_templates(**opts)
+            next_items = data.items || []
+            items.concat(next_items)
+            next_page_token = data.next_page_token
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
+          end
+          load(items.map(&:to_h))
         end
 
         def get(identity)

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

@@ -11,16 +11,25 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-
-          if zone
-            data = service.list_machine_types(zone, **opts).items
-          else
-            data = []
-            service.list_aggregated_machine_types(**opts).items.each_value do |scoped_list|
-              data.concat(scoped_list.machine_types) if scoped_list && scoped_list.machine_types
+          items = []
+          next_page_token = nil
+          loop do
+            if zone
+              data = service.list_machine_types(zone, **opts)
+              next_items = data.items || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_machine_types(**opts)
+              data.items.each_value do |scoped_list|
+                items.concat(scoped_list.machine_types) if scoped_list && scoped_list.machine_types
+              end
+              next_page_token = data.next_page_token
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
-          load(data.map(&:to_h) || [])
+          load(items.map(&:to_h) || [])
         end
 
         def get(identity, zone = nil)

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

@@ -4,9 +4,18 @@ module Fog
       class Networks < Fog::Collection
         model Fog::Compute::Google::Network
 
-        def all
-          data = service.list_networks.to_h[:items]
-          load(data || [])
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_networks(**opts)
+            next_items = data.to_h[:items] || []
+            items.concat(next_items)
+            next_page_token = data.next_page_token
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
+          end
+          load(items)
         end
 
         def get(identity)

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

@@ -12,16 +12,30 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-
-          if zone
-            data = service.list_zone_operations(zone, **opts).to_h[:items]
-          elsif region
-            data = service.list_region_operations(region, **opts).to_h[:items]
-          else
-            data = service.list_global_operations(**opts).to_h[:items]
+          items = []
+          next_page_token = nil
+          loop do
+            if zone
+              data = service.list_zone_operations(zone, **opts)
+              next_items = data.to_h[:items] || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            elsif region
+              data = service.list_region_operations(region, **opts)
+              next_items = data.to_h[:items] || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_global_operations(**opts)
+              next_items = data.to_h[:items] || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            end
+            break if next_page_token.nil? || next_page_token.empty?
+            opts[:page_token] = next_page_token
           end
 
-          load(data || [])
+          load(items)
         end
 
         def get(identity, zone = nil, region = nil)