fog-google 1.27.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324898488d484b7d2bf5e875ebe152c545607044090f4786941f8106754b4433
-  data.tar.gz: ae49e89d5e42127efde49e52340e751e1c075f100fe19b03e5bc3c88399a2e99
+  metadata.gz: 95b0e848747f0ed4dd7665ba1523d660f267c7ede2810bfbe30190b53114c3ad
+  data.tar.gz: 90dfb38e1c8aea6c4b1de0d1aa51d1c99d1f6e815fdf09dd5a1b038ff03285aa
 SHA512:
-  metadata.gz: 56f151cbc7b3b170b90537b26410517f29c769ca6168fbc16bdd9937e89bfc44c315da223cf7dfae916775626c985b67db07c9e15aacfcb8e6a69d8f082a23b3
-  data.tar.gz: 3a44a91f409c99d4caa368bc6d8f30e131f6cb566e66926b9bec27a9a25aa4b453b2bb27a5526f1420553a06caa569520712962fd8011d842f82bc2ab1926201
+  metadata.gz: 70382c3cace88299b0680f2af237772be7f52b2635ef2393af6bff26efe2c1bf5fe70d9b47a1e090e497982115908acf8de83ff517ced7e008993f305461dbb9
+  data.tar.gz: cdb4dfda4e275c2b693a5b370cdb2b4d1171ee0217c90832e243111a56106ff7300856eee404aba46c2047c278600e2a3cc5f6c5b2f80f0a4f0fce5ae5960de6

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

@@ -36,7 +36,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # 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

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

@@ -37,7 +37,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 

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

@@ -37,7 +37,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 

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

@@ -36,7 +36,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 

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

@@ -37,7 +37,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 

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

@@ -37,7 +37,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 

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

@@ -37,7 +37,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 

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

@@ -38,7 +38,7 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 

data/.github/workflows/unit.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4', 'head', 'truffleruby-head']
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0', 'head', 'truffleruby-head']
 
     steps:
       - uses: actions/checkout@v6

data/CHANGELOG.md

@@ -8,6 +8,16 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### User-facing
 
+- #650 add support for custom storage endpoints
+
+### Fixed
+
+### Development changes
+
+## 1.27.0
+
+### User-facing
+
 ### Fixed
 
 - #648 raise exception if disk quota exceeded [rchekaluk]

data/fog-google.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "retriable"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-mock"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "shindo"
   spec.add_development_dependency "vcr"

data/lib/fog/google/storage/storage_json/mock.rb

@@ -9,6 +9,7 @@ module Fog
 
         def initialize(options = {})
           shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
+          @options = options.dup
           @client = MockClient.new('test')
           @storage_json = MockClient.new('test')
           @iam_service = MockClient.new('test')
@@ -18,6 +19,14 @@ module Fog
           "foo"
         end
 
+        def bucket_base_url
+          if @options[:google_json_root_url]
+            @options[:google_json_root_url]
+          else
+            GOOGLE_STORAGE_BUCKET_BASE_URL
+          end
+        end
+
         def google_access_id
           "my-account@project.iam.gserviceaccount"
         end

data/lib/fog/google/storage/storage_json/models/directory.rb

@@ -47,7 +47,7 @@ module Fog
 
         def public_url
           requires :key
-          "#{GOOGLE_STORAGE_BUCKET_BASE_URL}#{key}"
+          "#{service.bucket_base_url}#{key}"
         end
 
         def save

data/lib/fog/google/storage/storage_json/models/file.rb

@@ -97,7 +97,7 @@ module Fog
 
         def public_url
           requires :directory, :key
-          "https://storage.googleapis.com/#{directory.key}/#{key}"
+          "#{service.bucket_base_url}#{directory.key}/#{key}"
         end
 
         FILE_INSERTABLE_FIELDS = %i(

data/lib/fog/google/storage/storage_json/real.rb

@@ -11,15 +11,16 @@ module Fog
         attr_reader :storage_json
 
         def initialize(options = {})
-          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
+          base_url = options[:google_json_root_url] || GOOGLE_STORAGE_JSON_BASE_URL
+          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, base_url)
           @options = options.dup
           options[:google_api_scope_url] = GOOGLE_STORAGE_JSON_API_SCOPE_URLS.join(" ")
-          @host = options[:host] || "storage.googleapis.com"
 
           # TODO(temikus): Do we even need this client?
           @client = initialize_google_client(options)
 
           @storage_json = ::Google::Apis::StorageV1::StorageService.new
+          @storage_json.root_url = base_url if options[:google_json_root_url]
           apply_client_options(@storage_json, options)
 
           @storage_json.client_options.open_timeout_sec = options[:open_timeout_sec] if options[:open_timeout_sec]
@@ -27,6 +28,14 @@ module Fog
           @storage_json.client_options.send_timeout_sec = options[:send_timeout_sec] if options[:send_timeout_sec]
         end
 
+        def bucket_base_url
+          if @options[:google_json_root_url]
+            @options[:google_json_root_url]
+          else
+            GOOGLE_STORAGE_BUCKET_BASE_URL
+          end
+        end
+
         def signature(params)
           string_to_sign = <<-DATA
 #{params[:method]}

data/lib/fog/google/storage/storage_json.rb

@@ -17,6 +17,7 @@ module Fog
         :google_key_string,
         :google_json_key_location,
         :google_json_key_string,
+        :google_json_root_url,
         :open_timeout_sec,
         :read_timeout_sec,
         :send_timeout_sec

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.27.0".freeze
+    VERSION = "1.28.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.0
 platform: ruby
 authors:
 - Nat Welch
@@ -246,6 +246,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement