fog-google 1.19.0 → 1.24.1

data/test/integration/monitoring/test_timeseries.rb

@@ -46,12 +46,18 @@ class TestMetricDescriptors < FogIntegrationTest
     }
 
     expected = _some_timeseries(start_time, metric_type, labels)
-    resp = @client.create_timeseries(:timeseries => [expected])
+    # Retrying since this is prone to errors in test environment due to
+    # constant creation/deletion of resources
+    resp = retry_on(Google::Apis::ServerError) do
+      @client.create_timeseries(:timeseries => [expected])
+    end
     assert_empty(resp.to_h)
 
-    # Wait for metric to be created
-    retry_on(Google::Apis::ClientError) do
-      @client.list_timeseries(
+    # Wait for TimeSeries to be created
+    # Google Monitoring backend is not exactly designed for synchronous retrieval so this retry is necessary
+    Fog.wait_for(30) do
+      begin
+        test_ts = @client.list_timeseries(
           :filter => "metric.type = \"#{metric_type}\"",
           :interval => {
             # Subtracting one second because timeSeries.list API
@@ -60,7 +66,11 @@ class TestMetricDescriptors < FogIntegrationTest
             :start_time => (start_time - 1).to_datetime.rfc3339,
             :end_time => Time.now.to_datetime.rfc3339
           }
-      ).time_series
+        ).time_series
+        return !test_ts.nil?
+      rescue
+        return false
+      end
     end
 
     series = retry_on(Google::Apis::ClientError) do
@@ -109,6 +119,8 @@ class TestMetricDescriptors < FogIntegrationTest
       _some_timeseries(start_time, metric_type, labels)
     end
 
+    # Retrying since this is prone to errors in test environment due to
+    # constant creation/deletion of resources
     retry_on(Google::Apis::ServerError) do
       @client.create_timeseries(:timeseries => timeseries)
     end
@@ -120,15 +132,18 @@ class TestMetricDescriptors < FogIntegrationTest
       :end_time => Time.now.to_datetime.rfc3339
     }
 
-
-    # Wait for metric to be created
-    # Retriable is used instead of wait_for due to API client returning Google::Apis::ClientError: badRequest if the
-    # metric hasn't yet been created
-    retry_on(Google::Apis::ClientError) do
-      @client.list_timeseries(
-        :filter => "metric.type = \"#{metric_type}\"",
-        :interval => interval
-      ).time_series
+    # Wait for TimeSeries to be created
+    # Google Monitoring backend is not exactly designed for synchronous retrieval so this retry is necessary
+    Fog.wait_for(30) do
+      begin
+        test_ts = @client.list_timeseries(
+          :filter => "metric.type = \"#{metric_type}\"",
+          :interval => interval
+        ).time_series
+        return !test_ts.nil?
+      rescue
+        return false
+      end
     end
 
     # Test page size

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",
@@ -49,4 +49,12 @@ class UnitTestJsonRequests < MiniTest::Test
     assert_match(/a\/b\/c/, url,
                  "slashes should not be escaped with '%2F'")
   end
+
+  def test_unescaped_pluses_in_url
+    url = @client.get_object_https_url("bucket",
+                                      "a+c.ext",
+                                      Time.now + 2 * 60)
+    assert_match(/a\+c/, url,
+                 "pluses should not be escaped with '%2B'")
+  end
 end

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.19.0
+  version: 1.24.1
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2024-04-12 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
@@ -57,128 +57,154 @@ dependencies:
   name: google-apis-storage_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: google-apis-iamcredentials_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: google-apis-compute_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.53'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.53'
 - !ruby/object:Gem::Dependency
   name: google-apis-monitoring_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.37'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: google-apis-dns_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: google-apis-pubsub_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: google-apis-sqladmin_v1beta4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.38'
 - !ruby/object:Gem::Dependency
   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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     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
@@ -291,13 +317,21 @@ files:
 - ".fog.example"
 - ".github/dependabot.yml"
 - ".github/scripts/setup_creds.sh"
-- ".github/workflows/integration.yml"
+- ".github/workflows/integration-compute-core.yml"
+- ".github/workflows/integration-compute-instance_groups.yml"
+- ".github/workflows/integration-compute-loadbalancing.yml"
+- ".github/workflows/integration-compute-networking.yml"
+- ".github/workflows/integration-monitoring.yml"
+- ".github/workflows/integration-pubsub.yml"
+- ".github/workflows/integration-sql.yml"
+- ".github/workflows/integration-storage.yml"
 - ".github/workflows/stale.yml"
 - ".github/workflows/unit.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -310,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
@@ -824,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
@@ -852,7 +888,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
@@ -943,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