google-apis-core 0.11.3 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f085e1d76ff530d5ad81f7971fc851fe8e2f65bc5c4f618ae4cd4d4a83ebb791
-  data.tar.gz: a6257b235ec0141d76a40ef7e04f9c77da805ca67a7445c34ce54aaf1aac16b0
+  metadata.gz: c3c57ca24b4836ea6e800df3a184b040c9c51c64149d743d4d3335d6ac76094d
+  data.tar.gz: 42a724598b2ff3656cac8df432bae7428e5a4a53bede1366ee92080d0738d5c7
 SHA512:
-  metadata.gz: 8f4e051906ec4aa5ceb984e962d96b7eb07ed23782e7b56bc5ae24423993357b36af896de75d35d54374355e09fa93de3e1aa467f3e907a02a546665b33e6012
-  data.tar.gz: 66b09b1c8f9fcaa8751815f9967d4a409c5cef642482cf4b5695ed719e9043ae0d9249f203e2804f4586549fe4d1a9dde6156e3ddfc3b9b4cf65da384c431904
+  metadata.gz: 28b3c7e49fde2eab1cd10bb5a1e898b5c99f1ee14930b4f8a2b7d66d6ac77731eb6bdfd5e7fa0940f044d58c5ceb8205b460ffc56ea9331f7e166da88504c808
+  data.tar.gz: 95cedbafcc1a7d1dd7a8dc8ce63090bba5a1c4c96b8cb247ae0c4dc1851e98b78afcd3a162aeca50c94a6a8a37fa0c8cf7afcdb6f838a5f3fc73858898bf82a8

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Release History
 
+### 0.14.1 (2024-03-13)
+
+#### Bug Fixes
+
+* fixes uninitialized Pathname issue ([#18480](https://github.com/googleapis/google-api-ruby-client/issues/18480)) 
+
+### 0.14.0 (2024-02-23)
+
+#### Features
+
+* Update minimum Ruby version to 2.7 ([#17896](https://github.com/googleapis/google-api-ruby-client/issues/17896)) 
+#### Bug Fixes
+
+* allow BaseService#root_url to be an Addressable::URI ([#17895](https://github.com/googleapis/google-api-ruby-client/issues/17895)) 
+
+### 0.13.0 (2024-01-26)
+
+#### Features
+
+* Verify credential universe domain against configured universe domain ([#17569](https://github.com/googleapis/google-api-ruby-client/issues/17569)) 
+
+### 0.12.0 (2024-01-22)
+
+#### Features
+
+* Support for universe_domain ([#17131](https://github.com/googleapis/google-api-ruby-client/issues/17131)) 
+
 ### 0.11.3 (2024-01-17)
 
 #### Bug Fixes

data/lib/google/apis/core/base_service.rb

@@ -93,11 +93,49 @@ module Google
       # Base service for all APIs. Not to be used directly.
       #
       class BaseService
+        ##
+        # A substitution string for the universe domain in an endpoint template
+        # @return [String]
+        #
+        ENDPOINT_SUBSTITUTION = "$UNIVERSE_DOMAIN$".freeze
+
         include Logging
 
+        # Universe domain
+        # @return [String]
+        attr_reader :universe_domain
+
+        # Set the universe domain.
+        # If the root URL was set with a universe domain substitution, it is
+        # updated to reflect the new universe domain.
+        #
+        # @param new_ud [String,nil] The new universe domain, or nil to use the Google Default Universe
+        def universe_domain= new_ud
+          new_ud ||= ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"] || "googleapis.com"
+          if @root_url_template
+            @root_url = @root_url_template.gsub ENDPOINT_SUBSTITUTION, new_ud
+          end
+          @universe_domain = new_ud
+        end
+
         # Root URL (host/port) for the API
-        # @return [Addressable::URI]
-        attr_accessor :root_url
+        # @return [Addressable::URI, String]
+        attr_reader :root_url
+
+        # Set the root URL.
+        # If the given url includes a universe domain substitution, it is
+        # resolved in the current universe domain
+        #
+        # @param url_or_template [Addressable::URI, String] The URL, which can include a universe domain substitution
+        def root_url= url_or_template
+          if url_or_template.is_a?(String) && url_or_template.include?(ENDPOINT_SUBSTITUTION)
+            @root_url_template = url_or_template
+            @root_url = url_or_template.gsub ENDPOINT_SUBSTITUTION, universe_domain
+          else
+            @root_url_template = nil
+            @root_url = url_or_template
+          end
+        end
 
         # Additional path prefix for all API methods
         # @return [Addressable::URI]
@@ -136,7 +174,9 @@ module Google
         # @param [String,Addressable::URI] base_path
         #   Additional path prefix for all API methods
         # @api private
-        def initialize(root_url, base_path, client_name: nil, client_version: nil)
+        def initialize(root_url, base_path, client_name: nil, client_version: nil, universe_domain: nil)
+          @root_url_template = nil
+          self.universe_domain = universe_domain
           self.root_url = root_url
           self.base_path = base_path
           self.client_name = client_name || 'google-api-ruby-client'
@@ -279,7 +319,7 @@ module Google
         #   Name of the field in the result containing the items. Defaults to :items
         # @param [Boolean] cache
         #  True (default) if results should be cached so multiple iterations can be used.
-        # @return [Enumerble]
+        # @return [Enumerable]
         # @yield [token, service]
         #   Current page token & service instance
         # @yieldparam [String] token
@@ -296,6 +336,20 @@ module Google
           return PagedResults.new(self, max: max, items: items, cache: cache, response_page_token: response_page_token, &block)
         end
 
+        # Verify that the universe domain setting matches the universe domain
+        # in the credentials, if present.
+        #
+        # @raise [Google::Apis::UniverseDomainError] if there is a mismatch
+        def verify_universe_domain!
+          auth = authorization
+          auth_universe_domain = auth.universe_domain if auth.respond_to? :universe_domain
+          if auth_universe_domain && auth_universe_domain != universe_domain
+            raise UniverseDomainError,
+                  "Universe domain is #{universe_domain} but credentials are in #{auth_universe_domain}"
+          end
+          true
+        end
+
         protected
 
         # Create a new upload command.
@@ -308,6 +362,7 @@ module Google
         #  Request-specific options
         # @return [Google::Apis::Core::UploadCommand]
         def make_upload_command(method, path, options)
+          verify_universe_domain!
           template = Addressable::Template.new(root_url + upload_path + path)
           if batch?
             command = MultipartUploadCommand.new(method, template, client_version: client_version)
@@ -332,6 +387,7 @@ module Google
         #  Request-specific options
         # @return [Google::Apis::Core::StorageUploadCommand]
         def make_storage_upload_command(method, path, options)
+          verify_universe_domain!
           template = Addressable::Template.new(root_url + upload_path + path)
           command = StorageUploadCommand.new(method, template, client_version: client_version)
           command.options = request_options.merge(options)
@@ -349,6 +405,7 @@ module Google
         #  Request-specific options
         # @return [Google::Apis::Core::DownloadCommand]
         def make_download_command(method, path, options)
+          verify_universe_domain!
           template = Addressable::Template.new(root_url + base_path + path)
           command = DownloadCommand.new(method, template, client_version: client_version)
           command.options = request_options.merge(options)
@@ -368,6 +425,7 @@ module Google
         #  Request-specific options
         # @return [Google::Apis::Core::StorageDownloadCommand]
         def make_storage_download_command(method, path, options)
+          verify_universe_domain!
           template = Addressable::Template.new(root_url + base_path + path)
           command = StorageDownloadCommand.new(method, template, client_version: client_version)
           command.options = request_options.merge(options)
@@ -386,6 +444,7 @@ module Google
         #  Request-specific options
         # @return [Google::Apis::Core::DownloadCommand]
         def make_simple_command(method, path, options)
+          verify_universe_domain!
           full_path =
             if path.start_with? "/"
               path[1..-1]

data/lib/google/apis/core/download.rb

@@ -15,6 +15,7 @@
 require 'google/apis/core/api_command'
 require 'google/apis/errors'
 require 'addressable/uri'
+require 'pathname'
 
 module Google
   module Apis

data/lib/google/apis/core/storage_download.rb

@@ -25,7 +25,7 @@ module Google
 
         # Execute the upload request once. Overrides the default implementation to handle streaming/chunking
         # of file content.
-        # Note: This method is overriden from DownloadCommand in order to respond back with 
+        # Note: This method is overridden from DownloadCommand in order to respond back with 
         # http header. All changes made to `execute_once` of DownloadCommand, should be made 
         # here too.
         #

data/lib/google/apis/core/version.rb

@@ -16,7 +16,7 @@ module Google
   module Apis
     module Core
       # Core version
-      VERSION = "0.11.3".freeze
+      VERSION = "0.14.1".freeze
     end
   end
 end

data/lib/google/apis/errors.rb

@@ -89,5 +89,9 @@ module Google
     # Error class for problems in batch requests.
     class BatchError < Error
     end
+
+    # Error class for universe domain issues
+    class UniverseDomainError < Error
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-apis-core
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.14.1
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -82,22 +82,16 @@ dependencies:
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +166,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/googleapis/google-api-ruby-client/issues
   changelog_uri: https://github.com/googleapis/google-api-ruby-client/tree/main/google-apis-core/CHANGELOG.md
-  documentation_uri: https://googleapis.dev/ruby/google-apis-core/v0.11.3
+  documentation_uri: https://googleapis.dev/ruby/google-apis-core/v0.14.1
   source_code_uri: https://github.com/googleapis/google-api-ruby-client/tree/main/google-apis-core
 post_install_message: 
 rdoc_options: []
@@ -182,14 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: Common utility and base classes for legacy Google REST clients