gapic-generator 0.10.1 → 0.11.0

data/lib/google/protobuf/wrappers.pb.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+module Google
+  module Protobuf
+    ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
+
+    ##
+    # Message Classes
+    #
+    class DoubleValue < ::Protobuf::Message; end
+    class FloatValue < ::Protobuf::Message; end
+    class Int64Value < ::Protobuf::Message; end
+    class UInt64Value < ::Protobuf::Message; end
+    class Int32Value < ::Protobuf::Message; end
+    class UInt32Value < ::Protobuf::Message; end
+    class BoolValue < ::Protobuf::Message; end
+    class StringValue < ::Protobuf::Message; end
+    class BytesValue < ::Protobuf::Message; end
+
+
+    ##
+    # File Options
+    #
+    set_option :java_package, "com.google.protobuf"
+    set_option :java_outer_classname, "WrappersProto"
+    set_option :java_multiple_files, true
+    set_option :go_package, "github.com/golang/protobuf/ptypes/wrappers"
+    set_option :cc_enable_arenas, true
+    set_option :objc_class_prefix, "GPB"
+    set_option :csharp_namespace, "Google.Protobuf.WellKnownTypes"
+
+
+    ##
+    # Message Fields
+    #
+    class DoubleValue
+      optional :double, :value, 1
+    end
+
+    class FloatValue
+      optional :float, :value, 1
+    end
+
+    class Int64Value
+      optional :int64, :value, 1
+    end
+
+    class UInt64Value
+      optional :uint64, :value, 1
+    end
+
+    class Int32Value
+      optional :int32, :value, 1
+    end
+
+    class UInt32Value
+      optional :uint32, :value, 1
+    end
+
+    class BoolValue
+      optional :bool, :value, 1
+    end
+
+    class StringValue
+      optional :string, :value, 1
+    end
+
+    class BytesValue
+      optional :bytes, :value, 1
+    end
+
+  end
+
+end
+

data/templates/default/gem/yardopts.erb

@@ -1,6 +1,6 @@
 <%- assert_locals gem -%>
 --no-private
---title=<%= gem.title %>
+--title="<%= gem.title %>"
 --exclude _pb\.rb$
 --markup markdown
 --markup-provider redcarpet

data/templates/default/lib/_package.erb

@@ -10,6 +10,8 @@ require "<%= package.gem.version_require %>"
 ##
 # To load this package, including all its services, and instantiate a <%= package.grpc_client_designation %>:
 #
+# @example
+#
 #     require "<%= package.package_require %>"
 #     client = <%= package.services.first.create_client_call %>
 #
@@ -18,6 +20,8 @@ require "<%= package.gem.version_require %>"
 ##
 # To load this package, including all its services, and instantiate a REST client:
 #
+# @example
+#
 #     require "<%= package.package_require %>"
 #     client = <%= package.services.first.rest.create_client_call %>
 #

data/templates/default/lib/_service.erb

@@ -13,6 +13,9 @@ require "<%= service.credentials_require %>"
 <%- if service.paths? -%>
 require "<%= service.paths_require %>"
 <%- end -%>
+<%- if service.nonstandard_lro_provider? -%>
+require "<%= service.rest.nonstandard_lro_require %>"
+<%- end -%>
 require "<%= service.rest.service_rest_require %>"
 <% end %>
 <%- else -%>
@@ -32,6 +35,9 @@ require "<%= service.paths_require %>"
 <%- if service.lro? -%>
 require "<%= service.operations_require %>"
 <%- end -%>
+<%- if service.nonstandard_lro_provider? -%>
+require "<%= service.nonstandard_lro_require %>"
+<%- end -%>
 require "<%= service.client_require %>"
 <% end %>
 ##

data/templates/default/service/client/_client.erb

@@ -2,6 +2,13 @@
 <% @requires = capture do %>
 <%= render partial: "service/client/requires", locals: { service: service} -%>
 require "<%= service.proto_service_require %>"
+<%- if service.subclients? -%>
+<%- service.subclients.each do |subclient| -%>
+<%- unless subclient.client_class_name == "Operations" -%>
+require "<%= subclient.require_str %>"
+<%- end -%>
+<%- end -%>
+<%- end -%>
 <% end %>
 ##
 # Client for the <%= service.name %> service.
@@ -109,12 +116,15 @@ class <%= service.client_name %>
     @quota_project_id = @config.quota_project
     @quota_project_id ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 
-    <%- if service.lro? -%>
-    <%= service.lro_client_ivar %> = <%= service.operations_name %>.new do |config|
+    <%- if service.subclients? -%>
+    <%- service.subclients.each do |subclient| -%>
+    @<%= subclient.client_var_name %> = <%= subclient.client_class_name %>.new do |config|
       config.credentials = credentials
+      config.quota_project = @quota_project_id
       config.endpoint = @config.endpoint
     end
 
+    <%- end -%>
     <%- end -%>
     @<%= service.stub_name %> = ::Gapic::ServiceStub.new(
       <%= service.proto_service_stub_name_full %>,
@@ -125,20 +135,22 @@ class <%= service.client_name %>
     )
   end
 
-<%- if service.lro? -%>
+  <%- if service.subclients? -%>
+  <%- service.subclients.each do |subclient| -%>
   ##
-  # Get the associated client for long-running operations.
+  # Get the associated client for <%= subclient.service_description %>.
   #
-  # @return [<%= service.operations_name_full %>]
+  # @return [<%= subclient.client_class_docname %>]
   #
-  attr_reader :<%= service.lro_client_var %>
+  attr_reader :<%= subclient.client_var_name %>
 
-<%- end -%>
+  <%- end -%>
+  <%- end -%>
   # Service calls
   <%- service.methods.each do |method| -%>
 
   <%= indent_tail render(partial: "service/client/method/def", locals: { method: method }), 2 %>
-  <%- end %>
+  <%- end -%>
 
   <%= indent_tail render(partial: "service/client/config", locals: { service: service }), 2 %>
 end

data/templates/default/service/client/_nonstandard_lro.erb

@@ -0,0 +1,57 @@
+<%- assert_locals service -%>
+<% @requires = capture do %>
+require "gapic/operation/retry_policy"
+require "gapic/generic_lro/operation"
+<% end %>
+
+# A module containing nonstandard lro helpers
+module <%= service.nonstandard_lro_name %> 
+  class << self
+    ##
+    # Creates a Generic LRO operation object that wraps the nonstandard
+    # long-running operation specific to this service.
+    #
+    # @param operation [Object] The long-running operation object that is returned by the initial method call.
+    #
+    # @param client [<%= service.usable_service_presenter.client_name_full %>] The client that handles the polling for the longrunning operation.
+    #
+    # @param request_values [Map<String, String>] The values that are to be copied from the request that
+    #   triggered the longrunning operation, into the request that polls for the longrunning operation.
+    #   The format is `name of the request field -> value`
+    #
+    # @param options [Gapic::CallOptions] call options for this operation
+    #
+    # @return [Gapic::GenericLRO::Operation] 
+    #
+    def create_operation operation:, client:, request_values:, options:
+      Gapic::GenericLRO::Operation.new(operation,
+        client: client,
+        polling_method_name: "<%= service.nonstandard_lro_polling_method_name %>",
+        request_values: request_values,
+        operation_status_field: "<%= service.nonstandard_lro.operation_status_field %>",
+        <%- if service.nonstandard_lro.operation_name_field -%>
+        operation_name_field: "<%= service.nonstandard_lro.operation_name_field %>",
+        <%- end -%>
+        <%- if service.nonstandard_lro.operation_err_code_field -%>
+        operation_err_code_field: "<%= service.nonstandard_lro.operation_err_code_field %>",
+        <%- end -%>
+        <%- if service.nonstandard_lro.operation_err_msg_field -%>
+        operation_err_msg_field: "<%= service.nonstandard_lro.operation_err_msg_field %>",
+        <%- end -%>
+        <%- if service.nonstandard_lro.operation_response_fields.any? -%>
+        operation_copy_fields: {
+          <%- service.nonstandard_lro.operation_response_fields.each_with_index do |(field_from, field_to), i| -%>
+          <%- if i == service.nonstandard_lro.operation_response_fields.length - 1 -%>
+          "<%= field_to %>" => "<%= field_from %>"
+          <%- else -%>
+          "<%= field_to %>" => "<%= field_from %>",
+          <%- end -%>
+          <%- end -%>
+        },
+        <%- else -%>
+        operation_copy_fields: {},
+        <%- end -%>
+        options: options)
+    end
+  end
+end

data/templates/default/service/client/_self_configure_defaults.erb

@@ -6,7 +6,7 @@
     default_config.timeout = <%= format_number service.grpc_service_config.timeout_seconds %>
   <%- end -%>
   <%- if service.grpc_service_config.retry_policy -%>
-    default_config.retry_policy = <%= indent_tail service.service_config_presenter.retry_policy_fields, 2 %>
+    default_config.retry_policy = <%= indent_tail service.grpc_service_config_presenter.retry_policy_fields, 2 %>
   <%- end -%>
 <%- end -%>
 <%- method_service.methods.each do |method| -%>
@@ -16,7 +16,7 @@
       default_config.rpcs.<%= method.name %>.timeout = <%= format_number method.grpc_service_config.timeout_seconds %>
     <%- end -%>
     <%- if method.grpc_service_config.retry_policy -%>
-      default_config.rpcs.<%= method.name %>.retry_policy =<%= indent_tail method.service_config_presenter.retry_policy_fields, 2 %>
+      default_config.rpcs.<%= method.name %>.retry_policy =<%= indent_tail method.grpc_service_config_presenter.retry_policy_fields, 2 %>
     <%- end -%>
   <%- end -%>
 <%- end -%>

data/templates/default/service/client/method/def/_options_defaults.erb

@@ -12,14 +12,7 @@ metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
 metadata[:"x-goog-user-project"] = @quota_project_id if @quota_project_id
 <%- if method.routing_params? && !method.client_streaming? -%>
 
-header_params = {
-<%- method.routing_params.each_with_index do |routing_param, index| -%>
-  <%- comma = index == method.routing_params.count - 1 ? "" : "," -%>
-  "<%= routing_param %>" => request.<%= routing_param %><%= comma %>
-<%- end -%>
-}
-request_params_header = header_params.map { |k, v| "#{k}=#{v}" }.join("&")
-metadata[:"x-goog-request-params"] ||= request_params_header
+<%= render partial: "service/client/method/def/routing_params", locals: { method: method } -%>
 <%- end -%>
 
 options.apply_defaults timeout:      @config.rpcs.<%= method.name %>.timeout,

data/templates/default/service/client/method/def/_response.erb

@@ -1,6 +1,8 @@
 <%- assert_locals method -%>
 <%- if method.paged? -%>
 <%= render partial: "service/client/method/def/response_paged", locals: { method: method } -%>
+<%- elsif method.rest.nonstandard_lro? -%>
+<%= render partial: "service/client/method/def/response_nonstandard_lro", locals: { method: method } -%>
 <%- else -%>
 <%= render partial: "service/client/method/def/response_normal", locals: { method: method } -%>
 <%- end -%>

data/templates/default/service/client/method/def/_response_nonstandard_lro.erb

@@ -0,0 +1,23 @@
+<%- assert_locals method -%>
+@<%= method.service.stub_name %>.call_rpc :<%= method.name %>, request, options: options do |result, response|
+  result = <%= method.nonstandard_lro_client.helper_type %>.create_operation(
+    operation: result,
+    client: <%= method.nonstandard_lro_client.client_var_name %>,
+    <%- if method.lro.operation_request_fields.any? -%>
+    request_values: {
+      <%- method.lro.operation_request_fields.each_with_index do |(field_from, field_to), i| -%>
+      <%- if i == method.lro.operation_request_fields.length - 1 -%>
+      "<%= field_to %>" => request.<%= field_from %>
+      <%- else -%>
+      "<%= field_to %>" => request.<%= field_from %>,
+      <%- end -%>
+      <%- end -%>
+    },
+    <%- else -%>
+    request_values: {},
+    <%- end -%>
+    options: options
+  )
+  yield result, response if block_given?
+  return result
+end

data/templates/default/service/client/method/def/_routing_params.erb

@@ -0,0 +1,36 @@
+<%- assert_locals method -%>
+header_params = {}
+<%- if method.routing.explicit_params? -%>
+<%- method.routing.explicit_params.each do |key_name, routing_infos| -%>
+<%- routing_infos.each do |routing_info| -%>
+<%- if routing_info.pattern_matching_not_needed? -%>
+if request.<%= routing_info.field.gsub(".", "&.") %> && !request.<%= routing_info.field %>.empty?
+  header_params["<%= key_name %>"] = request.<%= routing_info.field %>
+end
+<%- elsif routing_info.value_is_full_field? -%>
+if request.<%= routing_info.field.gsub(".", "&.") %> &&
+  %r{<%= routing_info.field_regex_str %>}.match?(request.<%= routing_info.field %>)
+  header_params["<%= key_name %>"] = request.<%= routing_info.field %> 
+end
+<%- else -%>
+if request.<%= routing_info.field.gsub(".", "&.") %>
+  regex_match = %r{<%= routing_info.field_full_regex_str %>}.match request.<%= routing_info.field %>
+  if regex_match
+    header_params["<%= key_name %>"] = regex_match["<%= key_name %>".to_s] 
+  end
+end
+<%- end -%>
+<%- end -%>
+<%- end -%>
+
+request_params_header = URI.encode_www_form header_params
+<%- else -%>
+<%- method.routing_params.each_with_index do |routing_param, index| -%>
+if request.<%= routing_param.gsub(".", "&.") %>
+  header_params["<%= routing_param %>"] = request.<%= routing_param %>
+end
+<%- end -%>
+
+request_params_header = header_params.map { |k, v| "#{k}=#{v}" }.join("&")
+<%- end -%>
+metadata[:"x-goog-request-params"] ||= request_params_header

data/templates/default/service/nonstandard_lro.erb

@@ -0,0 +1,6 @@
+<%- assert_locals service -%>
+<%= render partial: "service/client/nonstandard_lro",
+           layout: "layouts/ruby",
+           locals: { service: service,
+                     namespace: service.methods_rest_bindings? ? service.rest.service_name_full : service.service_name_full }
+%>

data/templates/default/service/rest/client/_client.erb

@@ -1,8 +1,15 @@
 <%- assert_locals service -%>
 <% @requires = capture do %>
-  <%= render partial: "service/client/requires", locals: { service: service} -%>
-  require "<%= service.proto_service_require %>"
-  require "<%= service.rest.service_stub_require %>"
+<%= render partial: "service/client/requires", locals: { service: service} -%>
+require "<%= service.proto_service_require %>"
+require "<%= service.rest.service_stub_require %>"
+<%- if service.subclients? -%>
+<%- service.subclients.each do |subclient| -%>
+<%- unless subclient.client_class_name == "Operations" -%>
+require "<%= subclient.require_str %>"
+<%- end -%>
+<%- end -%>
+<%- end -%>
 <% end %>
 ##
 # REST client for the <%= service.name %> service.
@@ -14,8 +21,8 @@
 class <%= service.rest.client_name %>
 <%- if service.paths? -%>
   include <%= service.paths_name %>
-<%- end -%>
 
+<%- end -%>
   # @private
   attr_reader :<%= service.stub_name %>
 
@@ -93,14 +100,34 @@ class <%= service.rest.client_name %>
     end
     <%- end -%>
     
+    <%- if service.subclients? -%>
+    <%- service.subclients.each do |subclient| -%>
+    @<%= subclient.client_var_name %> = <%= subclient.client_class_name %>.new do |config|
+      config.credentials = credentials
+      config.endpoint = @config.endpoint
+    end
+
+    <%- end -%>
+    <%- end -%>
     @<%= service.stub_name %> = <%= service.rest.service_stub_name_full %>.new endpoint: @config.endpoint, credentials: credentials
   end
 
+  <%- if service.subclients? -%>
+  <%- service.subclients.each do |subclient| -%>
+  ##
+  # Get the associated client for <%= subclient.service_description %>.
+  #
+  # @return [<%= subclient.client_class_docname %>]
+  #
+  attr_reader :<%= subclient.client_var_name %>
+
+  <%- end -%>
+  <%- end -%>
   # Service calls
   <%- service.methods.each do |method| -%>
 
   <%= indent_tail render(partial: "service/rest/client/method/def", locals: { method: method }), 2 %>
-  <%- end %>
+  <%- end -%>
 
   <%= indent_tail render(partial: "service/rest/client/config", locals: { service: service }), 2 %>
 end

data/templates/default/service/rest/client/method/def/_response.erb

@@ -1,8 +1,8 @@
 <%- assert_locals method -%>
 <%- if method.rest.paged? -%>
 <%= render partial: "service/rest/client/method/def/response_paged", locals: { method: method } -%>
-<%- elsif method.rest.lro? -%>
-<%= render partial: "service/rest/client/method/def/response_lro", locals: { method: method } -%>
+<%- elsif method.rest.nonstandard_lro? -%>
+<%= render partial: "service/rest/client/method/def/response_nonstandard_lro", locals: { method: method } -%>
 <%- else -%>
 <%= render partial: "service/rest/client/method/def/response_normal", locals: { method: method } -%>
 <%- end -%>

data/templates/default/service/rest/client/method/def/_response_nonstandard_lro.erb

@@ -0,0 +1,23 @@
+<%- assert_locals method -%>
+@<%= method.service.stub_name %>.<%= method.name %> request, options do |result, response|
+  result = <%= method.nonstandard_lro_client.helper_type %>.create_operation(
+    operation: result,
+    client: <%= method.nonstandard_lro_client.client_var_name %>,
+    <%- if method.lro.operation_request_fields.any? -%>
+    request_values: {
+      <%- method.lro.operation_request_fields.each_with_index do |(field_from, field_to), i| -%>
+      <%- if i == method.lro.operation_request_fields.length - 1 -%>
+      "<%= field_to %>" => request.<%= field_from %>
+      <%- else -%>
+      "<%= field_to %>" => request.<%= field_from %>,
+      <%- end -%>
+      <%- end -%>
+    },
+    <%- else -%>
+    request_values: {},
+    <%- end -%>
+    options: options
+  )
+  yield result, response if block_given?
+  return result
+end

data/templates/default/service/test/method/_assert_response.erb

@@ -5,6 +5,9 @@ assert_equal grpc_response, response.response
 <%- elsif method.lro? %>
 assert_kind_of Gapic::Operation, response
 assert_equal grpc_response, response.grpc_op
+<%- elsif method.nonstandard_lro? %>
+assert_kind_of Gapic::GenericLRO::Operation, response
+assert_equal grpc_response, response.operation
 <%- else -%>
 assert_equal grpc_response, response
 <%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.41.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.41.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -197,13 +211,20 @@ files:
 - lib/gapic/generators/base_generator.rb
 - lib/gapic/generators/default_generator.rb
 - lib/gapic/generators/default_generator_parameters.rb
+- lib/gapic/grpc_service_config/config.rb
 - lib/gapic/grpc_service_config/method_config.rb
 - lib/gapic/grpc_service_config/parser.rb
 - lib/gapic/grpc_service_config/parsing_error.rb
 - lib/gapic/grpc_service_config/retry_policy.rb
-- lib/gapic/grpc_service_config/service_config.rb
 - lib/gapic/helpers/filepath_helper.rb
 - lib/gapic/helpers/namespace_helper.rb
+- lib/gapic/model.rb
+- lib/gapic/model/method/http_annotation.rb
+- lib/gapic/model/method/lro.rb
+- lib/gapic/model/method/routing.rb
+- lib/gapic/model/mixins.rb
+- lib/gapic/model/model_error.rb
+- lib/gapic/model/service/nonstandard_lro_provider.rb
 - lib/gapic/path_pattern.rb
 - lib/gapic/path_pattern/parser.rb
 - lib/gapic/path_pattern/pattern.rb
@@ -214,6 +235,7 @@ files:
 - lib/gapic/presenters/field_presenter.rb
 - lib/gapic/presenters/file_presenter.rb
 - lib/gapic/presenters/gem_presenter.rb
+- lib/gapic/presenters/grpc_service_config_presenter.rb
 - lib/gapic/presenters/message_presenter.rb
 - lib/gapic/presenters/method/rest_pagination_info.rb
 - lib/gapic/presenters/method_presenter.rb
@@ -221,7 +243,7 @@ files:
 - lib/gapic/presenters/package_presenter.rb
 - lib/gapic/presenters/resource_presenter.rb
 - lib/gapic/presenters/sample_presenter.rb
-- lib/gapic/presenters/service_config_presenter.rb
+- lib/gapic/presenters/service/lro_client_presenter.rb
 - lib/gapic/presenters/service_presenter.rb
 - lib/gapic/presenters/service_rest_presenter.rb
 - lib/gapic/presenters/snippet_presenter.rb
@@ -234,19 +256,47 @@ files:
 - lib/gapic/schema/parameter_schema.rb
 - lib/gapic/schema/request_param_parser.rb
 - lib/gapic/schema/request_parameter.rb
+- lib/gapic/schema/service_config_parser.rb
 - lib/gapic/schema/wrappers.rb
 - lib/gapic/uri_template.rb
 - lib/gapic/uri_template/parser.rb
 - lib/google/api/annotations.pb.rb
+- lib/google/api/auth.pb.rb
+- lib/google/api/backend.pb.rb
+- lib/google/api/billing.pb.rb
 - lib/google/api/client.pb.rb
+- lib/google/api/context.pb.rb
+- lib/google/api/control.pb.rb
+- lib/google/api/documentation.pb.rb
+- lib/google/api/endpoint.pb.rb
 - lib/google/api/field_behavior.pb.rb
 - lib/google/api/http.pb.rb
+- lib/google/api/label.pb.rb
+- lib/google/api/launch_stage.pb.rb
+- lib/google/api/log.pb.rb
+- lib/google/api/logging.pb.rb
+- lib/google/api/metric.pb.rb
+- lib/google/api/monitored_resource.pb.rb
+- lib/google/api/monitoring.pb.rb
+- lib/google/api/quota.pb.rb
 - lib/google/api/resource.pb.rb
+- lib/google/api/routing.pb.rb
+- lib/google/api/service.pb.rb
+- lib/google/api/source_info.pb.rb
+- lib/google/api/system_parameter.pb.rb
+- lib/google/api/usage.pb.rb
+- lib/google/cloud/extended_operations.pb.rb
 - lib/google/longrunning/operations.pb.rb
 - lib/google/protobuf/any.pb.rb
+- lib/google/protobuf/api.pb.rb
 - lib/google/protobuf/compiler/plugin.pb.rb
 - lib/google/protobuf/descriptor.pb.rb
+- lib/google/protobuf/duration.pb.rb
 - lib/google/protobuf/empty.pb.rb
+- lib/google/protobuf/source_context.pb.rb
+- lib/google/protobuf/struct.pb.rb
+- lib/google/protobuf/type.pb.rb
+- lib/google/protobuf/wrappers.pb.rb
 - lib/google/rpc/status.pb.rb
 - templates/default/gem/_version.erb
 - templates/default/gem/changelog.erb
@@ -281,6 +331,7 @@ files:
 - templates/default/service/client/_client.erb
 - templates/default/service/client/_config.erb
 - templates/default/service/client/_credentials.erb
+- templates/default/service/client/_nonstandard_lro.erb
 - templates/default/service/client/_operations.erb
 - templates/default/service/client/_paths.erb
 - templates/default/service/client/_requires.erb
@@ -294,8 +345,10 @@ files:
 - templates/default/service/client/method/def/_request_streaming.erb
 - templates/default/service/client/method/def/_rescue.erb
 - templates/default/service/client/method/def/_response.erb
+- templates/default/service/client/method/def/_response_nonstandard_lro.erb
 - templates/default/service/client/method/def/_response_normal.erb
 - templates/default/service/client/method/def/_response_paged.erb
+- templates/default/service/client/method/def/_routing_params.erb
 - templates/default/service/client/method/docs/_deprecated.erb
 - templates/default/service/client/method/docs/_error.erb
 - templates/default/service/client/method/docs/_request.erb
@@ -319,6 +372,7 @@ files:
 - templates/default/service/client/resource/_multi.erb
 - templates/default/service/client/resource/_single.erb
 - templates/default/service/credentials.erb
+- templates/default/service/nonstandard_lro.erb
 - templates/default/service/operations.erb
 - templates/default/service/paths.erb
 - templates/default/service/rest.erb
@@ -329,7 +383,7 @@ files:
 - templates/default/service/rest/client/method/def/_options_defaults.erb
 - templates/default/service/rest/client/method/def/_rescue.erb
 - templates/default/service/rest/client/method/def/_response.erb
-- templates/default/service/rest/client/method/def/_response_lro.erb
+- templates/default/service/rest/client/method/def/_response_nonstandard_lro.erb
 - templates/default/service/rest/client/method/def/_response_normal.erb
 - templates/default/service/rest/client/method/def/_response_paged.erb
 - templates/default/service/rest/client/method/docs/_error.erb

data/templates/default/service/rest/client/method/def/_response_lro.erb

@@ -1,7 +0,0 @@
-<%- assert_locals method -%>
-
-@<%= method.service.stub_name %>.<%= method.name %> request, options do |result, response|
-  result = ::Gapic::Rest::BaseOperation.new result
-  yield result, response if block_given?
-  return result
-end