Merge branch 'master' into dependabot/bundler/fog-core-lt-2.5

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

@@ -2,15 +2,15 @@
 # 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:
     branches: [ master ]
   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,14 +22,23 @@ 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: [ '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:

.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,10 +22,19 @@ 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: [ '3.0', '3.1', '3.2' ]

.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,10 +22,19 @@ 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: [ '3.0', '3.1', '3.2' ]

.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,10 +22,18 @@ 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: [ '3.0', '3.1', '3.2' ]

.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,10 +23,18 @@ 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: [ '3.0', '3.1', '3.2' ]

.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,10 +23,18 @@ 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: [ '3.0', '3.1', '3.2' ]

.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,10 +23,18 @@ 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: [ '3.0', '3.1', '3.2' ]

.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,10 +24,18 @@ 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: [ '3.0', '3.1', '3.2' ]

.github/workflows/unit.yml

@@ -6,6 +6,11 @@ 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

.ruby-version

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

fog-google.gemspec

@@ -32,7 +32,7 @@ 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"
 

test/integration/storage/test_objects.rb

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