fog-google 1.27.0 → 1.29.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324898488d484b7d2bf5e875ebe152c545607044090f4786941f8106754b4433
-  data.tar.gz: ae49e89d5e42127efde49e52340e751e1c075f100fe19b03e5bc3c88399a2e99
+  metadata.gz: 70267564198e1bf6559634d7a117abab84f75071dd4924103e5a2d95ffaf726a
+  data.tar.gz: 79ddefe25739fc06bb54752473fd11b9f48014e2d1c9f0eccf8c58e0896505bc
 SHA512:
-  metadata.gz: 56f151cbc7b3b170b90537b26410517f29c769ca6168fbc16bdd9937e89bfc44c315da223cf7dfae916775626c985b67db07c9e15aacfcb8e6a69d8f082a23b3
-  data.tar.gz: 3a44a91f409c99d4caa368bc6d8f30e131f6cb566e66926b9bec27a9a25aa4b453b2bb27a5526f1420553a06caa569520712962fd8011d842f82bc2ab1926201
+  metadata.gz: 24a13db6b1f8577285099248c14bf2a701b7a1995fab782f94d19bf4176ba037ebf02c1e8ada3bcf759b9f47bbfe357540be402141f4379e2a4ed9ee7ad9551b
+  data.tar.gz: a1ebe02f51befe24c8b7df2b9e0d4b2f8f60368353ce450771926b9c0de0b7d595c08ac692aafa402be7014bd5b2123ff48c933c03fd2cbc07e98bb950e50b8b

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

@@ -4,6 +4,36 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 1.29.3
+
+- #656 Fix IAM credentials not setting universe domain properly
+
+## 1.29.2
+
+- #654 Fix missing host attribute and update storage XML driver to support universe domains
+
+## 1.29.1
+
+### User-facing
+
+- #653 Ensure universe domain is applied to all services
+
+## 1.29.0
+
+### User-facing
+
+- #652 Replace google_json_root_url with universe_domain
+
+## 1.28.0
+
+### User-facing
+
+- #650 add support for custom storage endpoints
+
+### Fixed
+
+### Development changes
+
 ## 1.27.0
 
 ### User-facing

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/shared.rb

@@ -88,9 +88,12 @@ module Fog
       # Applies given options to the client instance
       #
       # @param [Google::Apis::Core::BaseService] service API service client instance
-      # @param [Hash] options (all ignored a.t.m., except :google_client_options)
+      # @param [Hash] options (:universe_domain, :google_client_options)
       # @return [void]
       def apply_client_options(service, options = {})
+        universe_domain = universe_domain_from_options(options)
+        service.universe_domain = universe_domain if universe_domain
+
         google_client_options = options[:google_client_options]
         return if google_client_options.nil? || google_client_options.empty?
 
@@ -157,12 +160,22 @@ module Fog
 
       private
 
+      # Helper method to get universe domain from options or environment
+      #
+      # @param [Hash] options - client options hash
+      # @return [String, nil] - universe domain or nil
+      def universe_domain_from_options(options)
+        options[:universe_domain] || ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"]
+      end
+
       # Helper method to process application default authentication
       #
       # @param [Hash]  options - client options hash
       # @return [Google::Auth::DefaultCredentials] - google auth object
       def process_application_default_auth(options)
-        ::Google::Auth.get_application_default(options[:google_api_scope_url])
+        google_options = options.slice(:universe_domain)
+        credentials = ::Google::Auth.get_application_default(options[:google_api_scope_url], google_options)
+        credentials
       end
 
       # Helper method to process fallback authentication
@@ -203,10 +216,14 @@ module Fog
 
         validate_json_credentials(json_key)
 
-        ::Google::Auth::ServiceAccountCredentials.make_creds(
+        credentials = ::Google::Auth::ServiceAccountCredentials.make_creds(
           :json_key_io => StringIO.new(json_key),
           :scope => options[:google_api_scope_url]
         )
+
+        universe_domain = universe_domain_from_options(options)
+        credentials.universe_domain = universe_domain if universe_domain && credentials.respond_to?(:universe_domain=)
+        credentials
       end
 
       # Helper method to sort out deprecated and missing auth options

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

@@ -7,8 +7,16 @@ module Fog
 
         MockClient = Struct.new(:issuer)
 
+        attr_reader :host
+
         def initialize(options = {})
-          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
+          @options = options.dup
+          api_base_url = storage_api_base_url_for_universe(universe_domain)
+          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, api_base_url)
+
+          # Set @host for compatibility with request methods (e.g., get_object_https_url)
+          @host = storage_host_for_universe(universe_domain)
+
           @client = MockClient.new('test')
           @storage_json = MockClient.new('test')
           @iam_service = MockClient.new('test')
@@ -18,9 +26,19 @@ module Fog
           "foo"
         end
 
+        def bucket_base_url
+          storage_base_url_for_universe(universe_domain)
+        end
+
         def google_access_id
           "my-account@project.iam.gserviceaccount"
         end
+
+        private
+
+        def universe_domain
+          universe_domain_from_options(@options)
+        end
       end
     end
   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

@@ -7,14 +7,17 @@ module Fog
         include Utils
         include Fog::Google::Shared
 
-        attr_accessor :client
+        attr_accessor :client, :host
         attr_reader :storage_json
 
         def initialize(options = {})
-          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
           @options = options.dup
+          api_base_url = storage_api_base_url_for_universe(universe_domain)
+          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, api_base_url)
           options[:google_api_scope_url] = GOOGLE_STORAGE_JSON_API_SCOPE_URLS.join(" ")
-          @host = options[:host] || "storage.googleapis.com"
+
+          # Set @host for compatibility with request methods (e.g., get_object_https_url)
+          @host = storage_host_for_universe(universe_domain)
 
           # TODO(temikus): Do we even need this client?
           @client = initialize_google_client(options)
@@ -27,6 +30,10 @@ module Fog
           @storage_json.client_options.send_timeout_sec = options[:send_timeout_sec] if options[:send_timeout_sec]
         end
 
+        def bucket_base_url
+          storage_base_url_for_universe(universe_domain)
+        end
+
         def signature(params)
           string_to_sign = <<-DATA
 #{params[:method]}
@@ -74,6 +81,10 @@ DATA
 
         private
 
+        def universe_domain
+          universe_domain_from_options(@options)
+        end
+
         def google_access_id
           @google_access_id ||= get_google_access_id
         end

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

@@ -19,6 +19,23 @@ module Fog
           https_url(params, expires)
         end
 
+        def storage_api_base_url_for_universe(universe_domain)
+          domain = universe_domain.to_s.strip
+          if !domain.empty? && domain != "googleapis.com"
+            "https://storage.#{domain}/storage/"
+          else
+            Fog::Google::StorageJSON::GOOGLE_STORAGE_JSON_BASE_URL
+          end
+        end
+
+        def storage_host_for_universe(universe_domain)
+          Fog::Google::Storage::Utils.storage_host_for_universe(universe_domain)
+        end
+
+        def storage_base_url_for_universe(universe_domain)
+          "https://#{storage_host_for_universe(universe_domain)}/"
+        end
+
         private
 
         def host_path_query(params, expires)

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,
+        :universe_domain,
         :open_timeout_sec,
         :read_timeout_sec,
         :send_timeout_sec

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

@@ -83,6 +83,7 @@ module Fog
 
         def initialize(options = {})
           @google_storage_access_key_id = options[:google_storage_access_key_id]
+          @host = storage_host_for_universe(options[:universe_domain])
         end
 
         def data
@@ -96,6 +97,8 @@ module Fog
         def signature(_params)
           "foo"
         end
+
+        attr_reader :host
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Fog
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]
           @connection_options = options[:connection_options] || {}
           @hmac = Fog::HMAC.new("sha1", @google_storage_secret_access_key)
-          @host = options[:host] || "storage.googleapis.com"
+          @host = storage_host_for_universe(options[:universe_domain])
           @persistent = options.fetch(:persistent, true)
           @port       = options[:port] || 443
           @scheme     = options[:scheme] || "https"

data/lib/fog/google/storage/storage_xml/utils.rb

@@ -28,6 +28,10 @@ module Fog
           https_url(params, expires)
         end
 
+        def storage_host_for_universe(universe_domain)
+          Fog::Google::Storage::Utils.storage_host_for_universe(universe_domain)
+        end
+
         private
 
         def host_path_query(params, expires)

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

@@ -6,7 +6,7 @@ module Fog
       autoload :Utils, "fog/google/storage/storage_xml/utils"
 
       requires :google_storage_access_key_id, :google_storage_secret_access_key
-      recognizes :host, :port, :scheme, :persistent, :path_style
+      recognizes :port, :scheme, :persistent, :path_style, :universe_domain
 
       model_path "fog/google/storage/storage_xml/models"
       collection :directories

data/lib/fog/google/storage.rb

@@ -1,6 +1,20 @@
 module Fog
   module Google
     class Storage < Fog::Service
+      GOOGLE_STORAGE_HOST = "storage.googleapis.com".freeze
+
+      # Shared utilities for both JSON and XML storage implementations
+      module Utils
+        def self.storage_host_for_universe(universe_domain)
+          domain = universe_domain.to_s.strip
+          if !domain.empty? && domain != "googleapis.com"
+            "storage.#{domain}"
+          else
+            GOOGLE_STORAGE_HOST
+          end
+        end
+      end
+
       def self.new(options = {})
         begin
           fog_creds = Fog.credentials

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.27.0".freeze
+    VERSION = "1.29.3".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.29.3
 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
@@ -789,7 +803,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
 test_files: []