fog-google 1.28.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b0e848747f0ed4dd7665ba1523d660f267c7ede2810bfbe30190b53114c3ad
-  data.tar.gz: 90dfb38e1c8aea6c4b1de0d1aa51d1c99d1f6e815fdf09dd5a1b038ff03285aa
+  metadata.gz: 2823e91b65c126736ad10ba861bcbdb0ca74115e6b7fe323f47167810a39b2e4
+  data.tar.gz: f72382617a827ecbab25342f02e16447ebc22691cdeead4b08702f6f57cfcd7d
 SHA512:
-  metadata.gz: 70382c3cace88299b0680f2af237772be7f52b2635ef2393af6bff26efe2c1bf5fe70d9b47a1e090e497982115908acf8de83ff517ced7e008993f305461dbb9
-  data.tar.gz: cdb4dfda4e275c2b693a5b370cdb2b4d1171ee0217c90832e243111a56106ff7300856eee404aba46c2047c278600e2a3cc5f6c5b2f80f0a4f0fce5ae5960de6
+  metadata.gz: 158e366dd84994ff4bcb71b75c226cc27d93ced775b88ce32985cc037a5de942694d5e487a2febcad280fc440baacd6ddde832cbd8ecd9b1be565c72f1aa5928
+  data.tar.gz: db4b3bb11d68344ae3ebde04ef841ce93e8f9590921c42f30932fd9bf968a693e26cf0258da6491e60fbd53b23fe5889fbbbd86c89596f5e8b4329f03f99835e

data/CHANGELOG.md

@@ -4,7 +4,13 @@ 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.27.0
+## 1.29.0
+
+### User-facing
+
+- #652 Replace google_json_root_url with universe_domain
+
+## 1.28.0
 
 ### User-facing
 

data/lib/fog/google/shared.rb

@@ -157,12 +157,23 @@ 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])
+        credentials = ::Google::Auth.get_application_default(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 process fallback authentication
@@ -203,10 +214,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

@@ -8,8 +8,9 @@ module Fog
         MockClient = Struct.new(:issuer)
 
         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)
           @client = MockClient.new('test')
           @storage_json = MockClient.new('test')
           @iam_service = MockClient.new('test')
@@ -20,16 +21,18 @@ module Fog
         end
 
         def bucket_base_url
-          if @options[:google_json_root_url]
-            @options[:google_json_root_url]
-          else
-            GOOGLE_STORAGE_BUCKET_BASE_URL
-          end
+          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/real.rb

@@ -11,16 +11,16 @@ module Fog
         attr_reader :storage_json
 
         def initialize(options = {})
-          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
+          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(" ")
 
           # 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]
+          @storage_json.universe_domain = universe_domain if universe_domain
           apply_client_options(@storage_json, options)
 
           @storage_json.client_options.open_timeout_sec = options[:open_timeout_sec] if options[:open_timeout_sec]
@@ -29,11 +29,7 @@ module Fog
         end
 
         def bucket_base_url
-          if @options[:google_json_root_url]
-            @options[:google_json_root_url]
-          else
-            GOOGLE_STORAGE_BUCKET_BASE_URL
-          end
+          storage_base_url_for_universe(universe_domain)
         end
 
         def signature(params)
@@ -83,6 +79,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,24 @@ 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_base_url_for_universe(universe_domain)
+          domain = universe_domain.to_s.strip
+          if !domain.empty?
+            "https://storage.#{universe_domain}/"
+          else
+            Fog::Google::StorageJSON::GOOGLE_STORAGE_BUCKET_BASE_URL
+          end
+        end
+
         private
 
         def host_path_query(params, expires)

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

@@ -17,7 +17,7 @@ module Fog
         :google_key_string,
         :google_json_key_location,
         :google_json_key_string,
-        :google_json_root_url,
+        :universe_domain,
         :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.28.0".freeze
+    VERSION = "1.29.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.0
 platform: ruby
 authors:
 - Nat Welch
@@ -803,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: []