fog-google 1.22.0 → 1.24.0

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

@@ -11,17 +11,25 @@ module Fog
             :order_by => order_by,
             :page_token => page_token
           }
-          if region.nil?
-            data = []
-            service.list_aggregated_target_pools(**opts).items.each_value do |lst|
-              unless lst.nil? || lst.target_pools.nil?
-                data += lst.to_h[:target_pools]
+          items = []
+          next_page_token = nil
+          loop do
+            if region.nil?
+              data = service.list_aggregated_target_pools(**opts)
+              data.items.each_value do |lst|
+                items.concat(lst.to_h[:target_pools]) if lst && lst.target_pools
               end
+              next_page_token = data.next_page_token
+            else
+              data = service.list_target_pools(region, **opts)
+              next_items = data.to_h[:items] || []
+              items.concat(next_items)
+              next_page_token = data.next_page_token
             end
-          else
-            data = service.list_target_pools(region, **opts).to_h[:items]
+            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, region = nil)

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

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

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

@@ -10,8 +10,8 @@ module Fog
       end
 
       class Real
-        def stop_server(identity, zone)
-          @compute.stop_instance(@project, zone.split("/")[-1], identity)
+        def stop_server(identity, zone, discard_local_ssd=false)
+          @compute.stop_instance(@project, zone.split("/")[-1], identity, discard_local_ssd: discard_local_ssd)
         end
       end
     end

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.22.0".freeze
+    VERSION = "1.24.0".freeze
   end
 end

data/test/helpers/integration_test_helper.rb

@@ -93,7 +93,7 @@ KEY
 RETRIABLE_TRIES = 3
 RETRIABLE_BASE_INTERVAL = 50
 
-class FogIntegrationTest < MiniTest::Test
+class FogIntegrationTest < Minitest::Test
   def namespaced_name
     "#{self.class}_#{name}"
   end

data/test/integration/compute/core_compute/test_servers.rb

@@ -132,6 +132,92 @@ class TestServers < FogIntegrationTest
     assert server.ready?
   end
 
+  def test_start_stop_discard_local_ssd
+    server = @factory.create
+
+    async = true
+    discard_local_ssd = true
+
+    server.stop(async, discard_local_ssd)
+    server.wait_for { stopped? }
+
+    assert server.stopped?
+  end
+
+  def test_attach_disk
+    # Creating server
+    server = @factory.create
+    server.wait_for { ready? }
+
+    disk_name = "fog-test-1-testservers-test-attach-disk-attachable"  # suffix forces disk name to differ from the existing disk
+    # Creating disk #{disk_name}
+    disk = @disks.create(
+      :name => disk_name,
+      :source_image => TEST_IMAGE,
+      :size_gb => 64
+    )
+    device_name = "#{disk.name}-device"
+
+    # Attaching disk #{disk.name} as device #{device_name}
+    self_link = "https://www.googleapis.com/compute/v1/projects/#{TEST_PROJECT}/zones/#{TEST_ZONE}/disks/#{disk.name}"
+    server.attach_disk(self_link, true, device_name: device_name)
+
+    # Waiting for attachment
+    disk.wait_for { ! users.nil? && users != []}
+
+    assert_equal "https://www.googleapis.com/compute/v1/projects/#{TEST_PROJECT}/zones/#{TEST_ZONE}/instances/#{server.name}", disk.users[0]
+
+    server.reload
+    server_attached_disk = server.disks.select{|d| d[:boot] == false}[0]
+    assert_equal device_name, server_attached_disk[:device_name]
+  end
+
+  def test_detach_disk
+    # Creating server
+    server = @factory.create
+    server.wait_for { ready? }
+
+    disk_name = "fog-test-1-testservers-test-detach-attachable"  # suffix forces disk name to differ from the existing disk
+    # Creating disk #{disk_name}
+    disk = @disks.create(
+      :name => disk_name,
+      :source_image => TEST_IMAGE,
+      :size_gb => 64
+    )
+    device_name = "#{disk.name}-device"
+
+    # Attaching disk #{disk.name} as device #{device_name}
+    self_link = "https://www.googleapis.com/compute/v1/projects/#{TEST_PROJECT}/zones/#{TEST_ZONE}/disks/#{disk.name}"
+    server.attach_disk(self_link, true, device_name: device_name)
+    disk.wait_for { ! users.nil? && users != []}
+
+    server.reload
+    server_attached_disk = server.disks.select{|d| d[:boot] == false}[0]
+    assert_equal device_name, server_attached_disk[:device_name]
+
+    # Detaching (synchronous) disk #{disk.name}
+    server.detach_disk(device_name, false)
+
+    disk.reload
+    assert disk.users.nil? || disk.users == []
+
+    # Re-attaching disk #{disk.name} as device #{device_name}
+    server.attach_disk(self_link, true, device_name: device_name)
+    disk.wait_for { ! users.nil? && users != []}
+
+    server.reload
+    server_attached_disk = server.disks.select{|d| d[:boot] == false}[0]
+    assert_equal device_name, server_attached_disk[:device_name]
+
+    # Detaching (async) disk #{disk.name}
+    server.detach_disk(device_name, true)
+
+    # Waiting for detachment
+    disk.wait_for { users.nil? || users == []}
+
+    assert disk.users.nil? || disk.users == []
+  end
+
   def test_reset_windows_password
     win_disk = @disks.create(
       :name => "fog-test-1-testservers-test-reset-windows-password-2",

data/test/integration/storage/test_objects.rb

@@ -4,6 +4,7 @@ require "securerandom"
 require "base64"
 require "tempfile"
 require "net/http"
+require "ostruct"
 
 class TestStorageRequests < StorageShared
   def test_put_object_string

data/test/unit/compute/test_common_collections.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestCollections < MiniTest::Test
+class UnitTestCollections < Minitest::Test
   def setup
     Fog.mock!
 

data/test/unit/compute/test_common_models.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestModels < MiniTest::Test
+class UnitTestModels < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Compute.new(provider: "google",

data/test/unit/compute/test_disk.rb

@@ -0,0 +1,26 @@
+require "helpers/test_helper"
+
+class UnitTestDisk < Minitest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::Compute.new(provider: "google",
+                               google_project: "foo")
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  def test_new_disk
+    disk = Fog::Compute::Google::Disk.new(
+      :name         => "fog-1",
+      :size_gb      => 10,
+      :zone         => "us-central1-a",
+      :source_image => "debian-7-wheezy-v20131120"
+    )
+    assert_equal("fog-1",                     disk.name,         "Fog::Compute::Google::Disk name is incorrect: #{disk.name}")
+    assert_equal(10,                          disk.size_gb,      "Fog::Compute::Google::Disk size_gb is incorrect: #{disk.size_gb}")
+    assert_equal("us-central1-a",             disk.zone,         "Fog::Compute::Google::Disk zone is incorrect: #{disk.zone}")
+    assert_equal("debian-7-wheezy-v20131120", disk.source_image, "Fog::Compute::Google::Disk source_image is incorrect: #{disk.source_image}")
+  end
+end

data/test/unit/compute/test_server.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestServer < MiniTest::Test
+class UnitTestServer < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Compute.new(provider: "google",

data/test/unit/dns/test_common_collections.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestDNSCollections < MiniTest::Test
+class UnitTestDNSCollections < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::DNS.new(provider: "google",

data/test/unit/monitoring/test_comon_collections.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestMonitoringCollections < MiniTest::Test
+class UnitTestMonitoringCollections < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Monitoring.new(provider: "google",

data/test/unit/pubsub/test_common_collections.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestPubsubCollections < MiniTest::Test
+class UnitTestPubsubCollections < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Google::Pubsub.new(google_project: "foo")

data/test/unit/sql/test_common_collections.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestSQLCollections < MiniTest::Test
+class UnitTestSQLCollections < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Google::SQL.new(google_project: "foo")

data/test/unit/storage/test_common_json_collections.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestStorageJSONCollections < MiniTest::Test
+class UnitTestStorageJSONCollections < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Storage.new(provider: "google",

data/test/unit/storage/test_common_xml_collections.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestStorageXMLCollections < MiniTest::Test
+class UnitTestStorageXMLCollections < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Storage.new(provider: "google",

data/test/unit/storage/test_json_requests.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestJsonRequests < MiniTest::Test
+class UnitTestJsonRequests < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Storage.new(provider: "google",

data/test/unit/storage/test_xml_requests.rb

@@ -1,6 +1,6 @@
 require "helpers/test_helper"
 
-class UnitTestXMLRequests < MiniTest::Test
+class UnitTestXMLRequests < Minitest::Test
   def setup
     Fog.mock!
     @client = Fog::Storage.new(provider: "google",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.24.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
@@ -161,16 +161,22 @@ dependencies:
   name: google-cloud-env
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -191,14 +197,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -325,6 +331,7 @@ files:
 - ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -337,6 +344,7 @@ files:
 - examples/backend_services.rb
 - examples/bootstrap.rb
 - examples/create_instance.rb
+- examples/create_instance_and_attach_disk_later.rb
 - examples/create_instance_with_attached_disk.rb
 - examples/dns/project.rb
 - examples/dns/zones.rb
@@ -851,6 +859,7 @@ files:
 - test/integration/test_authentication.rb
 - test/unit/compute/test_common_collections.rb
 - test/unit/compute/test_common_models.rb
+- test/unit/compute/test_disk.rb
 - test/unit/compute/test_server.rb
 - test/unit/dns/test_common_collections.rb
 - test/unit/monitoring/test_comon_collections.rb
@@ -879,7 +888,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
@@ -970,6 +979,7 @@ test_files:
 - test/integration/test_authentication.rb
 - test/unit/compute/test_common_collections.rb
 - test/unit/compute/test_common_models.rb
+- test/unit/compute/test_disk.rb
 - test/unit/compute/test_server.rb
 - test/unit/dns/test_common_collections.rb
 - test/unit/monitoring/test_comon_collections.rb