fog-google 1.22.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e49aa08d9838df47172778f5e6564e4fe9c9c81d77d024815c4cb9152b3d1fa
-  data.tar.gz: 39ae0f71215fe16c34d92a01722eff57a299bbeb03f132aff7057515b25a54cc
+  metadata.gz: 419c2fcd50b3c90ffe65c7a284bfc75479b1da059e0ea01b187a9f8f03721784
+  data.tar.gz: 470db0019a0de386752a1ca9c1a8cdb092e34037ef3e53a6a456a1ea033e6033
 SHA512:
-  metadata.gz: 98c43a20f68c38596e455fea9c58fb2db26916a71c89da10773424d8a74a58819354e66e0a8f68f1eb7c571dd5cf6ae3f4e1cc6a2204504260451d7a12a3e43b
-  data.tar.gz: 6e1996d144177a3fca9e582d4eb113e54e60016af45483dc9e8be0bc48370ba0f786dd4d811f862cd07775ef08d248e65f8e7504c5dc763b96ed863a7ec2dfcc
+  metadata.gz: af159d5054ca5ceb4e391f8bbc019ad813c1e9163f11eeeb67dd3f57ccdfb157497d39451303210a7aa3e7b01f7295be937d445e97552f4fd8c9f1f42ca98c84
+  data.tar.gz: 00eb0b6200ad0fd56ea680e2dd1824548fe34d67da6e7469a872e27462281cf335f3aa23ede4956cea95433efa3e382c85c0ad60a732c0c96965b3830fac56f0

data/.github/workflows/integration-compute-core.yml

@@ -2,7 +2,7 @@
 # is no need to run them if SQL code or deps haven't changed and you cannot
 # trigger jobs based on file changes in the same workflow.
 # See: https://github.com/actions/runner/issues/456
-name: integration-tests-compute-instance_groups
+name: integration-tests-compute-core
 
 on:
   push:
@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/compute/**'
@@ -22,18 +22,27 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-compute-core.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
   test-compute:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
+      # TODO(fog-google#626): remove this once cleanup is fixed
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-instance_groups.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/compute/**'
@@ -22,18 +22,27 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-compute-instance_groups.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-loadbalancing.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/compute/**'
@@ -22,18 +22,27 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-compute-loadbalancing.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-networking.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/compute/**'
@@ -22,18 +22,26 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-compute-networking.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-monitoring.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/google/monitoring.rb'
@@ -23,18 +23,26 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-monitoring.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-pubsub.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/google/pubsub.rb'
@@ -23,18 +23,26 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-pubsub.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-sql.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/google/sql.rb'
@@ -23,18 +23,26 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-sql.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-storage.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
     branches: [ master ]
     types: [ assigned, opened, synchronize, reopened, labeled ]
-    # Only run SQL integration tests if SQL code or deps have changed
+    # Only run integration tests if relevant code or deps have changed
     paths:
       # Module-specific paths
       - 'lib/fog/google/storage.rb'
@@ -24,18 +24,26 @@ on:
       - 'lib/fog/google.rb'
       # Trigger workflow on version upgrade
       - 'lib/fog/google/version.rb'
+      # Trigger when workflow itself is updated
+      - '.github/workflows/integration-storage.yml'
+
+# Setting hard concurrency limit for the project due to cleanup
+# TODO(fog-google#626): remove this once cleanup is fixed
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '2.7', '3.0', '3.1' ]
+        ruby-version: [ '3.0', '3.1', '3.2' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v7
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 360

data/.github/workflows/unit.yml

@@ -6,15 +6,20 @@ on:
   pull_request:
     branches: [ master ]
 
+# Cancel in-progress jobs of the same ref or run_id
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   test-unit:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', 'head', 'truffleruby-head']
+        ruby-version: [ '3.0', '3.1', '3.2', 'head', 'truffleruby-head']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/CHANGELOG.md

@@ -6,6 +6,47 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Next
 
+
+### User-facing
+
+#### Added
+
+- #613 Spruce up attaching and detaching disks on running servers [rchekaluk]
+- #621 Added support for discard_local_ssd when stopping an instance [rchekaluk]
+
+### Development changes
+
+### Added
+
+- #618 Deprecated Ruby-2.0 support [temikus]
+- #624 Migrated the Integration tests to new ARC runners [temikus]
+- #625 Fixed 'Ostruct' errors in storage tests [temikus]
+- #627 Added concurrency groups to integration test workfows [temikus]
+
+#### Fixed
+
+- #604 Updated pry requirement from = 0.13.0 to = 0.14.2 [dependabot]
+- #619 Updated google-cloud-env requirement from ~> 1.2 to >= 1.2, < 3.0 [dependabot]
+- #620 Bump actions/stale from 8 to 9 [dependabot]
+- #622 Updated fog-core requirement from < 2.3 to < 2.5 [dependabot]
+
+## 1.23.0
+
+### User-facing
+
+#### Fixed
+
+- #609 Fixed missing paging on all models [agrare]
+- #608 Fixed `Fog::Compute::Google::Servers#all` paging [agrare]
+
+### Development changes
+
+#### Fixed
+
+- #606 Use `Minitest::Test` instead of `MiniTest::Test` [chubchenko]
+- #605 Bump actions/checkout from 3 to 4 [dependabot]
+- #602 Bump actions/stale from 6 to 8 [dependabot]
+
 ## 1.22.0
 
 ### User-facing

data/README.md

@@ -1,6 +1,6 @@
 # Fog::Google
 
-[![Gem Version](https://badge.fury.io/rb/fog-google.svg)](http://badge.fury.io/rb/fog-google) [![Build Status](https://github.com/fog/fog-google/actions/workflows/ruby.yml/badge.svg)](https://github.com/fog/fog-google/actions/workflows/ruby.yml) [![codecov](https://codecov.io/gh/fog/fog-google/branch/master/graph/badge.svg)](https://codecov.io/gh/fog/fog-google) ![Dependabot Status](https://flat.badgen.net/github/dependabot/fog/fog-google) [![Doc coverage](https://inch-ci.org/github/fog/fog-google.svg?branch=master)](https://inch-ci.org/github/fog/fog-google)
+[![Gem Version](https://badge.fury.io/rb/fog-google.svg)](http://badge.fury.io/rb/fog-google) [![Build Status](https://github.com/fog/fog-google/actions/workflows/unit.yml/badge.svg)](https://github.com/fog/fog-google/actions/workflows/unit.yml) [![codecov](https://codecov.io/gh/fog/fog-google/branch/master/graph/badge.svg)](https://codecov.io/gh/fog/fog-google) ![Dependabot Status](https://flat.badgen.net/github/dependabot/fog/fog-google) [![Doc coverage](https://inch-ci.org/github/fog/fog-google.svg?branch=master)](https://inch-ci.org/github/fog/fog-google)
 
 The main maintainers for the Google sections are @icco, @Temikus and @plribeiro3000. Please send pull requests to them.
 
@@ -175,7 +175,7 @@ $ bundle exec pry
 
 ## Supported Ruby Versions
 
-Fog-google is currently supported on Ruby 2.7+.
+Fog-google is currently supported on Ruby 3.0+.
 
 In general we support (and run our CI) for Ruby versions that are actively supported
 by Ruby Core - that is, Ruby versions that are not end of life. Older versions of

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/fog-google.gemspec

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