gapic-generator 0.45.2 → 0.45.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f2a5263485263873c059ce342f1cd26c800bab3349b7b191132b57f79d986ea
-  data.tar.gz: eda4ecd48fe183ffd4f98927f80c6500fc7b1d578fd8a45f4d539c5e0cecc9bd
+  metadata.gz: 271aec2d05b52adb5498c05c65461142789397a22d3b9a99d1d09f1559e8cf4f
+  data.tar.gz: 16e8bbbf90f2c0eb2174939cc7972fa37552cb807cfd24ecc0d74c9ed252a642
 SHA512:
-  metadata.gz: a49ad3a37ed0d730ef3bed251a2d58f06a4f9686d9fb4d65bcc163e1074ff76d427396798e3e9223a9b2d0d4d82be27c712f9c079f3379f573fe7026bfebbd29
-  data.tar.gz: 84dd1fd882a77ff2c659d3d17e56722bb0f80240dc8a644c282290c321a090352ff315c415d4f0e74172830560868f143b9e48fe0b319ae8a56a36680b0f5089
+  metadata.gz: e46aeb79a605c9395704b0cc14d4b8b540c34c119c9ee7d33178fc8d1a384d91fecfc42e92311e7197e36f9cec7cf21cb85e3a29850256643d348eae6571e8d2
+  data.tar.gz: 9f953a7d82a33f19a6309b6ca6abdf5da4b0f5bec294f6f1da8b0aadec47466f335a4df091c8021dd87a9596b0a310bdfa006fd617f03af8e167067a76712d47

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History for gapic-generator
 
+### 0.45.3 / 2025-06-21
+
+* Fix: correct pagination heuristic for Compute
+* Fix: add libyaml to checks and configure for the prebuilt binary
+* Fix: update Ruby prebuilt binary (version 3.4.3)
+
 ### 0.45.2 / 2025-06-04
 
 * Fix: update Ruby prebuilt binary, version 3.4.3

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.45.2"
+    VERSION = "0.45.3"
   end
 end

data/lib/gapic/model/api_metadata.rb

@@ -160,7 +160,7 @@ module Gapic
           selector = setting[SELECTOR]
           methods = service_config.apis.filter_map do |api|
             # Removes API prefix and trailing period.
-            selector[api.name.length + 1..].downcase if selector.start_with? api.name
+            selector[(api.name.length + 1)..].downcase if selector.start_with? api.name
           end
           if !methods.nil? && setting.key?(AUTO_POPULATED_FIELDS)
             @auto_populated_fields_by_method_name[methods.first] = setting[AUTO_POPULATED_FIELDS]

data/lib/gapic/presenters/method/compute_pagination_info.rb

@@ -14,20 +14,80 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "gapic/model/model_error"
+
 module Gapic
   module Presenters
     module Method
       ##
-      # Pagination info determined from the proto method
+      # Compute-specific pagination info determined from the proto method
+      #
+      # This implements the Compute-specific pagination heuristic
+      #
+      # The following steps are followed for this heuristic:
+      # 1. The method should not be server-streamed
+      # 2. The request should have a page token and page size fields
+      # 3. The response should have a next page token and contain a valid results field
+      #
+      # Now determining the valid results field is its own complicated sub-heuristic that should be run last.
+      # This sub-heuristic cannot end in "not paginated". It should either determine the results field or throw an error
+      #
+      # The following steps are followed for this sub-heuristic:
+      # 0. Check the exception dictionary. If the method is there as a key, use the value as the results field.
+      # 1. If there is exactly one map field, that field is the results field.
+      #
+      # NB: at this point the response contains either 0 or 2+ map fields
+      #
+      # 2. If there are no repeated fields there is no results field and we shall throw an error
+      # 3. If there is exactly one repeated field, that field is the results field.
+      # 4. If there are exactly 2 repeated fields, one is of message type, and the other is of type
+      #    "String", the field of message type is the results field.
+      #
+      # At this point there are either 2 repeated fields in wrong configuration, or 3 or more repeated
+      # fields. The method should have been in the exception dictionary (see step 0).
+      # Since the method is NOT in the exception dictionary we should throw an error to prevent
+      # accidentally releasing a Compute library with incorrect pagination.
       #
       class ComputePaginationInfo
         include Gapic::Helpers::NamespaceHelper
+
+        # @private Field name for Pagination Request page token
+        PAGE_TOKEN_NAME = "page_token"
+        private_constant :PAGE_TOKEN_NAME
+        # @private Field type for Pagination Request page token
+        PAGE_TOKEN_TYPE = :TYPE_STRING
+        private_constant :PAGE_TOKEN_TYPE
+
+        # @private Field names for Pagination Request page size
+        PAGE_SIZE_NAMES = ["page_size", "max_results"].freeze
+        private_constant :PAGE_SIZE_NAMES
+        # @private Field types for Pagination Request page size
+        PAGE_SIZE_TYPES = [:TYPE_UINT32, :TYPE_INT32].freeze
+        private_constant :PAGE_SIZE_TYPES
+
+        # @private Field name for Pagination Response next page token
+        NEXT_PAGE_TOKEN_NAME = "next_page_token"
+        private_constant :NEXT_PAGE_TOKEN_NAME
+        # @private Field type for Pagination Response next page token
+        NEXT_PAGE_TOKEN_TYPE = :TYPE_STRING
+        private_constant :NEXT_PAGE_TOKEN_TYPE
+
+        # @private A dictionary of special response messages of paginated methods and their repeated fields
+        # Curently contains only UsableSubnetworksAggregatedList which is a paginated field with 3 repeated fields,
+        #   2 of which are message-typed fields
+        REPEATED_FIELD_SPECIAL_DICTIONARY = {
+          "google.cloud.compute.v1.UsableSubnetworksAggregatedList" => "items",
+          "google.cloud.compute.v1beta.UsableSubnetworksAggregatedList" => "items"
+        }.freeze
+        private_constant :REPEATED_FIELD_SPECIAL_DICTIONARY
+
         ##
         # @param proto_method [Gapic::Schema::Method] the method to derive pagination info from
         # @param api [Gapic::Schema::Api]
         #
         def initialize proto_method, api
           @api = api
+          @method_full_name = proto_method.full_name
           @request = proto_method.input
           @response = proto_method.output
           @server_streaming = proto_method.server_streaming
@@ -38,7 +98,10 @@ module Gapic
         #
         # @return [Boolean]
         def paged?
-          !server_streaming? && paged_request? && paged_response?
+          paged_candidate = !server_streaming? && paged_request? && paged_response_candidate?
+
+          # `paged_response?` can raise and should be evaluated last
+          paged_candidate && paged_response?
         end
 
         ##
@@ -111,7 +174,7 @@ module Gapic
         def request_page_token_field
           # Has a String page_token field which specifies the actual (next) page to retrieve.
           @request_page_token_field ||= @request.fields.find do |f|
-            f.name == "page_token" && f.type == :TYPE_STRING
+            f.name == PAGE_TOKEN_NAME && f.type == PAGE_TOKEN_TYPE
           end
         end
 
@@ -123,14 +186,8 @@ module Gapic
         def request_page_size_field
           @request_page_size_field ||=
             begin
-              page_size_names = ["page_size", "max_results"]
-
-              # Has the int32 page_size or int32 max_results field
-              # which defines the maximum number of paginated resources to return in the response.
-              page_size_types = [:TYPE_UINT32, :TYPE_INT32]
-
               field = @request.fields.find do |f|
-                page_size_names.include?(f.name) && page_size_types.include?(f.type)
+                PAGE_SIZE_NAMES.include?(f.name) && PAGE_SIZE_TYPES.include?(f.type)
               end
 
               field
@@ -143,9 +200,23 @@ module Gapic
         #
         # @return [Boolean]
         def paged_response?
-          # Has the string next_page_token field to be used in the next request as page_token to retrieve the next page.
-          # Has only one repeated or map<string, ?> field containing a list of paginated resources.
-          !response_next_page_token_field.nil? && !response_results_field.nil?
+          # Has the string next_page_token field to be used in the next request as
+          # page_token to retrieve the next page.
+          # Passes the heuristic for paginated response
+          # Order is important here, since paginated response heuristic can raise and should be evaluated last
+          paged_response_candidate? && !response_results_field.nil?
+        end
+
+        ##
+        # Whether the response message for the REGAPIC rpc satisfies the criteria
+        # to be a candidate for pagination. This is intentinally split from evaluating
+        # the paged response heuristic since that heuristic can raise.
+        #
+        # @return [Boolean]
+        def paged_response_candidate?
+          # Has the string next_page_token field to be used in the next request as
+          # page_token to retrieve the next page.
+          !response_next_page_token_field.nil?
         end
 
         ##
@@ -153,38 +224,102 @@ module Gapic
         #
         # @return [Gapic::Schema::Field, nil]
         def response_next_page_token_field
-          # Has the string next_page_token field to be used in the next request as page_token to retrieve the next page.
+          # Has the string next_page_token field to be used in the next request as
+          # page_token to retrieve the next page.
           @response_next_page_token_field ||= @response.fields.find do |f|
-            f.name == "next_page_token" && f.type == :TYPE_STRING
+            f.name == NEXT_PAGE_TOKEN_NAME && f.type == NEXT_PAGE_TOKEN_TYPE
           end
         end
 
+
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # The heuristic in `response_results_field` would be more confusing if spread across several methods
+
         ##
         # The field in the response that holds the results
-        # For Regapic can be either a vanilla repeated field or a map
+        # For Compute Regapic can be either a vanilla repeated field or a map
         #
         # @return [Gapic::Schema::Field, nil]
         def response_results_field
+          # This sub-heuristic cannot end in "not paginated".
+          # It should either determine the results field or throw an error.
           @response_results_field ||= begin
             map_fields = @response.fields.find_all(&:map?)
             repeated_fields = @response.fields.find_all do |f|
               !f.map? && f.label == :LABEL_REPEATED
             end
 
-            if map_fields.count == 1
-              # If the response message has only one map<string, ?> field
-              # treat it as the one with paginated resources (i.e. ignore the repeated fields if any).
+            # The following steps are followed for this sub-heuristic:
+            # 0. Check the exception dictionary. If the method is there as key, use the value as the results field.
+            if REPEATED_FIELD_SPECIAL_DICTIONARY.key? @response.full_name
+              field_name = REPEATED_FIELD_SPECIAL_DICTIONARY[@response.full_name]
+              field = map_fields.find do |f|
+                f.name == field_name
+              end || repeated_fields.find do |f|
+                f.name == field_name
+              end
+
+              unless field
+                error_text = "A field of name \"#{field_name}\" is included in the special dictionary for " \
+                             "the response type \"#{@response.full_name}\". However this field is not a map " \
+                             "or repeated field. Failing, as the generator cannot continue."
+
+                raise ::Gapic::Model::ModelError, error_text
+              end
+
+              field
+            elsif map_fields.count == 1
+              # 1. If there is exactly one map field, that field is the results field.
               map_fields.first
-            elsif repeated_fields.count == 1 && map_fields.empty?
-              # If the response message contains only one repeated field,
-              # treat that field as the one containing the paginated resources.
+            # NB: at this point the response contains either 0 or 2 map fields.
+            elsif repeated_fields.count.zero?
+              # 2. If there are no repeated fields there is no results field and we shall throw an error
+              error_text = "A response message \"#{@response.full_name}\" has a next page token field and " \
+                           "is being evaluated as a candidate for pagination. However it has " \
+                           "#{map_fields.count} (!= 1) map fields and no repeated fields.  " \
+                           "Failing, as the generator should not continue."
+
+              raise ::Gapic::Model::ModelError, error_text
+            elsif repeated_fields.count == 1
+              # 3. If there is exactly one repeated field, that field is the results field.
               repeated_fields.first
+            elsif repeated_fields.count == 2
+              # 4. If there are exactly 2 repeated fields, one is of message type, and the other is of type
+              #    "String", the field of message type is the results field.
+              pagination_field = repeated_fields.find(&:message?)
+              string_field = repeated_fields.find { |f| f.type == :TYPE_STRING }
+
+              unless pagination_field && string_field
+                # At this point if there are 2 repeated fields of different configuration, or 3 or more repeated
+                # fields the method should have been in the exception dictionary (see step 0).
+                error_text = "A response message \"#{@response.full_name}\" has a next page token " \
+                             "field and is being evaluated as a candidate for pagination. However it should have " \
+                             "a configuration of exactly 2 repeated fields, one is of message type, and the other " \
+                             "of type \"String\". Failing, as the generator cannot continue. \n" \
+                             "As a developer, please evaluate the message that fails this heuristic and either " \
+                             "change the heuristic or add the message to the special dictionary."
+
+                raise ::Gapic::Model::ModelError, error_text
+              end
+
+              pagination_field
+            else
+              # At this point there are 3 or more repeated fields, and the method should have been in the
+              # exception dictionary (see step 0).
+              error_text = "A response message \"#{@response.full_name}\" has a next page token " \
+                           "field and is being evaluated as a candidate for pagination. However it has  " \
+                           "#{repeated_fields.count} (>= 3) repeated fields, and not in the special dictionary " \
+                           "for exceptions. Failing, as the generator cannot continue. \n" \
+                           "As a developer, please evaluate the message that fails this heuristic and either " \
+                           "change the heuristic or add the message to the special dictionary."
+
+              raise ::Gapic::Model::ModelError, error_text
             end
-            # If the response message contains more than one repeated field or does not have repeated fields at all
-            # but has more than one map<string, ?> field, do not generate any paginated methods for such rpc.
           end
         end
 
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
         # @private
         FIELD_TYPE_MAPPING = {
           TYPE_DOUBLE: "::Float",

data/templates/default/gem/gemfile.text.erb

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "google-style", "~> 1.31.0"
+gem "google-style", "~> 1.31.1"
 gem "minitest", "~> 5.22"
 gem "minitest-focus", "~> 1.4"
 gem "minitest-rg", "~> 5.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.45.2
+  version: 0.45.3
 platform: ruby
 authors:
 - Ernest Landrito
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.31.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.31.1
 email:
 - landrito@google.com
 - quartzmo@gmail.com