fog-google 1.22.0 → 1.24.0

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)

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

@@ -4,9 +4,18 @@ module Fog
       class Regions < Fog::Collection
         model Fog::Compute::Google::Region
 
-        def all
-          data = service.list_regions.to_h
-          load(data[:items] || [])
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_regions(**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/routes.rb

@@ -4,9 +4,18 @@ module Fog
       class Routes < Fog::Collection
         model Fog::Compute::Google::Route
 
-        def all
-          data = service.list_routes.to_h
-          load(data[:items] || [])
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_routes(**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/server.rb

@@ -279,7 +279,7 @@ module Fog
           if disk.is_a? Disk
             disk_obj = disk.get_attached_disk
           elsif disk.is_a? String
-            disk_obj = service.disks.attached_disk_obj(disk, attached_disk_options)
+            disk_obj = service.disks.attached_disk_obj(disk, **attached_disk_options)
           end
 
           data = service.attach_disk(identity, zone_name, disk_obj)
@@ -339,10 +339,10 @@ module Fog
           operation
         end
 
-        def stop(async = true)
+        def stop(async = true, discard_local_ssd=false)
           requires :identity, :zone
 
-          data = service.stop_server(identity, zone_name)
+          data = service.stop_server(identity, zone_name, discard_local_ssd)
           operation = Fog::Compute::Google::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)

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

@@ -13,17 +13,31 @@ module Fog
             :page_token => page_token
           }
 
-          if zone
-            data = service.list_servers(zone, **opts).to_h[:items] || []
-          else
-            data = []
-            service.list_aggregated_servers(**opts).items.each_value do |scoped_lst|
-              if scoped_lst && scoped_lst.instances
-                data.concat(scoped_lst.instances.map(&:to_h))
+          items = []
+          next_page_token = nil
+
+          loop do
+            if zone
+              data = service.list_servers(zone, **opts)
+              next_items = data.to_h[:items] || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_servers(**opts)
+              data.items.each_value do |scoped_lst|
+                if scoped_lst && scoped_lst.instances
+                  items.concat(scoped_lst.instances.map(&:to_h))
+                end
               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)
+
+          load(items)
         end
 
         # TODO: This method needs to take self_links as well as names

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

@@ -14,9 +14,18 @@ module Fog
           nil
         end
 
-        def all(_filters = {})
-          data = service.list_ssl_certificates.to_h[:items] || []
-          load(data)
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_ssl_certificates(**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
       end
     end

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

@@ -11,16 +11,24 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-
-          if region
-            data = service.list_subnetworks(region, **filters).to_h[:items] || []
-          else
-            data = []
-            service.list_aggregated_subnetworks(**filters).to_h[:items].each_value do |region_obj|
-              data.concat(region_obj[:subnetworks]) if region_obj[:subnetworks]
+          items = []
+          next_page_token = nil
+          loop do
+            if region
+              data = service.list_subnetworks(region, **filters)
+              next_items = data.items || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_subnetworks(**filters)
+              data.items.each_value do |region_obj|
+                items.concat(region_obj.subnetworks) if region_obj && region_obj.subnetworks
+              end
             end
+            break if next_page_token.nil? || next_page_token.empty?
+            filters[:page_token] = next_page_token
           end
-          load(data)
+          load(items.map(&:to_h))
         end
 
         def get(identity, region = nil)

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

@@ -4,9 +4,18 @@ module Fog
       class TargetHttpProxies < Fog::Collection
         model Fog::Compute::Google::TargetHttpProxy
 
-        def all(_filters = {})
-          data = service.list_target_http_proxies.to_h[:items] || []
-          load(data)
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_target_http_proxies(*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/target_https_proxies.rb

@@ -4,9 +4,18 @@ module Fog
       class TargetHttpsProxies < Fog::Collection
         model Fog::Compute::Google::TargetHttpsProxy
 
-        def all(_filters = {})
-          data = service.list_target_https_proxies.to_h[:items] || []
-          load(data)
+        def all(opts = {})
+          items = []
+          next_page_token = nil
+          loop do
+            data = service.list_target_https_proxies(**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/target_instances.rb

@@ -13,17 +13,25 @@ module Fog
             :page_token => page_token
           }
 
-          if zone
-            data = service.list_target_instances(zone, **opts).to_h[:items] || []
-          else
-            data = []
-            service.list_aggregated_target_instances(**opts).items.each_value do |scoped_list|
-              unless scoped_list.nil? || scoped_list.target_instances.nil?
-                data += scoped_list.target_instances.map(&:to_h)
+          items = []
+          next_page_token = nil
+          loop do
+            if zone
+              data = service.list_target_instances(zone, **opts)
+              next_items = data.to_h[:items] || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
+            else
+              data = service.list_aggregated_target_instances(**opts)
+              data.items.each_value do |scoped_list|
+                items.concat(scoped_list.target_instances.map(&:to_h)) if scoped_list && scoped_list.target_instances
               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)
+          load(items)
         end
 
         def get(identity, zone = nil)