gapic-generator 0.10.1 → 0.45.1

data/templates/default/lib/package/_self_configure_defaults.text.erb

@@ -0,0 +1,13 @@
+<%- assert_locals package -%>
+<%- package.first_service_with_rest.rest.mixin_presenters.each do |subclient| -%>
+<%- subclient.bindings_override.each do |method, bindings| -%>
+default_config.bindings_override["<%= method %>"] = [
+
+<%- last_binding_index = bindings.count - 1 -%>
+<%- bindings.each_with_index do |http_binding, index| -%>
+  <%- comma = last_binding_index == index ? "" : "," -%>
+  <%= indent render(partial: "lib/package/self_configure/binding_default", locals: { http_binding: http_binding }), 4 %><%= comma %>
+<%- end -%>
+]
+<%- end -%>
+<%- end -%>

data/templates/default/lib/package/self_configure/_binding_default.text.erb

@@ -0,0 +1,15 @@
+<%- assert_locals http_binding -%>
+Gapic::Rest::GrpcTranscoder::HttpBinding.create_with_validation(
+  uri_method: :<%= http_binding.verb %>,
+  uri_template: "<%= http_binding.uri_for_transcoding %>",
+  matches: [
+  <%- http_binding.routing_params_transcoder_matches_strings.each do |match_str| -%>
+    <%= match_str %>
+  <%- end -%>
+  ],
+  <%- if http_binding.body? -%>
+  body: "<%= http_binding.body %>"
+  <%- else -%>
+  body: nil
+  <%- end -%>
+)

data/templates/default/lib/rest/_rest.text.erb

@@ -0,0 +1,46 @@
+<%- assert_locals service -%>
+<% @requires = capture do %>
+require "gapic/rest"
+require "gapic/config"
+require "gapic/config/method"
+
+require "<%= service.gem.version_require %>"
+<%- if service.package.mixin_binding_overrides? -%>
+require "<%= service.package.mixin_binding_overrides_require %>"
+<%- end -%>
+
+<%- unless service.generic_endpoint? -%>
+require "<%= service.credentials_require %>"
+<%- end -%>
+<%- if service.paths? -%>
+require "<%= service.paths_require %>"
+<%- end -%>
+<%- if service.lro? -%>
+require "<%= service.rest.operations_require %>"
+<%- end -%>
+<%- if service.nonstandard_lro_provider? -%>
+require "<%= service.rest.nonstandard_lro_require %>"
+<%- end -%>
+require "<%= service.rest.client_require %>"
+<% end %>
+##
+<%- if service.doc_description -%>
+<%= indent service.doc_description, "# " %>
+#
+<%- end -%>
+# To load this service and instantiate a REST client:
+#
+#     require "<%= service.rest.service_require %>"
+#     client = <%= service.rest.create_client_call %>
+#
+module <%= service.module_name %>
+  # Client for the REST transport
+  module Rest
+  end
+end
+
+
+
+<% @footer = capture do %>
+<%= render partial: "service/helpers", locals: { service: service.rest} -%>
+<% end %>

data/templates/default/package_rest.text.erb

@@ -0,0 +1,6 @@
+<%- assert_locals package -%>
+<%= render partial: "lib/package_rest",
+           layout: "layouts/ruby",
+           locals: { package: package,
+                     namespace: package.parent_namespace }
+%>

data/templates/default/proto_docs/_deprecated.text.erb

@@ -0,0 +1,9 @@
+<%- assert_locals presenter -%>
+<% newline ||= false %>
+<% indentation ||= "# " %>
+<%- if presenter.is_deprecated? -%>
+<%= indent "@deprecated This #{presenter.type} is deprecated and may be removed in the next major version update.\n", indentation %>
+<%- if newline -%>
+<%= indentation %>
+<%- end -%>
+<%- end -%>

data/templates/default/proto_docs/{_enum.erb → _enum.text.erb}

@@ -2,6 +2,7 @@
 <%- if enum.doc_description -%>
 <%= indent enum.doc_description, "# " %>
 <%- end -%>
+<%= render partial: "proto_docs/deprecated", locals: { presenter: enum } -%>
 module <%= enum.name %>
   <%- enum.values.each do |value| -%>
 

data/templates/default/proto_docs/{_message.erb → _message.text.erb}

@@ -2,8 +2,10 @@
 <%- if message.doc_description -%>
 <%= indent message.doc_description, "# " %>
 <%- end -%>
+<%= render partial: "proto_docs/deprecated", locals: { presenter: message } -%>
 <%- message.fields.each do |field| -%>
 <%= indent field.doc_attribute_type, "# " %>
+<%= render(partial: "proto_docs/deprecated", locals: { presenter:field, indentation: "#   " }) -%>
 #   @return [<%= field.output_doc_types %>]
 <%- if field.doc_description -%>
 <%= indent field.doc_description, "#     " %>

data/templates/default/service/client/{_client.erb → _client.text.erb}

@@ -2,15 +2,31 @@
 <% @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 -%>
+<%- if service.autogenerates_uuid? -%>
+require "securerandom"
+<%- end -%>
 <% end %>
 ##
 # Client for the <%= service.name %> service.
 #
 <%- if service.doc_description -%>
-<%= indent service.doc_description, "# " %>
+<%= indent service.doc_description(transport: :grpc), "# " %>
 #
 <%- end -%>
 class <%= service.client_name %>
+  # @private
+  API_VERSION = "<%= service.api_version %>".freeze
+
+  # @private
+  DEFAULT_ENDPOINT_TEMPLATE = <%= service.client_endpoint_template.inspect %>
+
 <%- if service.paths? -%>
   include <%= service.paths_name %>
 
@@ -23,11 +39,8 @@ class <%= service.client_name %>
   #
   # See {<%= service.client_name_full %>::Configuration}
   # for a description of the configuration fields.
-<%- if service.is_deprecated? -%>
-  #
-  # @deprecated This service is deprecated and may be removed in the next major version update.
-<%- end -%>
   #
+<%= render partial: "proto_docs/deprecated", locals: { presenter: service, newline: true } -%>
   # @example
   #
   #   # Modify the configuration for all <%= service.name %> clients
@@ -64,6 +77,15 @@ class <%= service.client_name %>
     @config
   end
 
+  ##
+  # The effective universe domain
+  #
+  # @return [String]
+  #
+  def universe_domain
+    @<%= service.stub_name %>.universe_domain
+  end
+
   ##
   # Create a new <%= service.name %> client object.
   #
@@ -98,7 +120,8 @@ class <%= service.client_name %>
     <%- unless service.generic_endpoint? -%>
     # Use self-signed JWT if the endpoint is unchanged from default,
     # but only if the default endpoint does not have a region prefix.
-    enable_self_signed_jwt = @config.endpoint == <%= service.client_name %>.configure.endpoint &&
+    enable_self_signed_jwt = @config.endpoint.nil? ||
+                             @config.endpoint == Configuration::DEFAULT_ENDPOINT &&
                              !@config.endpoint.split(".").first.include?("-")
     credentials ||= Credentials.default scope: @config.scope,
                                         enable_self_signed_jwt: enable_self_signed_jwt
@@ -109,36 +132,73 @@ 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|
+    <%- service.lro_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
+      config.universe_domain = @config.universe_domain
     end
 
     <%- end -%>
     @<%= service.stub_name %> = ::Gapic::ServiceStub.new(
       <%= service.proto_service_stub_name_full %>,
-      credentials:  credentials,
-      endpoint:     @config.endpoint,
+      credentials: credentials,
+      endpoint: @config.endpoint,
+      endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
+      universe_domain: @config.universe_domain,
       channel_args: @config.channel_args,
-      interceptors: @config.interceptors
+      interceptors: @config.interceptors,
+      channel_pool_config: @config.channel_pool,
+      logger: @config.logger
     )
+
+    @<%= service.stub_name %>.stub_logger&.info do |entry|
+      entry.set_system_name
+      entry.set_service
+      entry.message = "Created client for #{entry.service}"
+      entry.set_credentials_fields credentials
+      entry.set "customEndpoint", @config.endpoint if @config.endpoint
+      entry.set "defaultTimeout", @config.timeout if @config.timeout
+      entry.set "quotaProject", @quota_project_id if @quota_project_id
+    end
+    <%- service.mixin_presenters.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 = @<%= service.stub_name %>.endpoint
+      config.universe_domain = @<%= service.stub_name %>.universe_domain
+      config.logger = @<%= service.stub_name %>.logger if config.respond_to? :logger=
+    end
+    <%- end -%>
   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 -%>
+  ##
+  # The logger used for request/response debug logging.
+  #
+  # @return [Logger]
+  #
+  def logger
+    @<%= service.stub_name %>.logger
+  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/{_config.erb → _config.text.erb}

@@ -32,20 +32,27 @@
 #
 <%- end -%>
 # @!attribute [rw] endpoint
-#   The hostname or hostname:port of the service endpoint.
-#   Defaults to `<%= service.client_endpoint.inspect %>`.
-#   @return [::String]
+#   A custom service endpoint, as a hostname or hostname:port. The default is
+#   nil, indicating to use the default endpoint in the current universe domain.
+#   @return [::String,nil]
 # @!attribute [rw] credentials
 #   Credentials to send with calls. You may provide any of the following types:
 #    *  (`String`) The path to a service account key file in JSON format
 #    *  (`Hash`) A service account key as a Hash
 #    *  (`Google::Auth::Credentials`) A googleauth credentials object
-#       (see the [googleauth docs](https://googleapis.dev/ruby/googleauth/latest/index.html))
+#       (see the [googleauth docs](https://rubydoc.info/gems/googleauth/Google/Auth/Credentials))
 #    *  (`Signet::OAuth2::Client`) A signet oauth2 client object
-#       (see the [signet docs](https://googleapis.dev/ruby/signet/latest/Signet/OAuth2/Client.html))
+#       (see the [signet docs](https://rubydoc.info/gems/signet/Signet/OAuth2/Client))
 #    *  (`GRPC::Core::Channel`) a gRPC channel with included credentials
 #    *  (`GRPC::Core::ChannelCredentials`) a gRPC credentails object
 #    *  (`nil`) indicating no credentials
+#
+#   Warning: If you accept a credential configuration (JSON file or Hash) from an
+#   external source for authentication to Google Cloud, you must validate it before
+#   providing it to a Google API client library. Providing an unvalidated credential
+#   configuration to Google APIs can compromise the security of your systems and data.
+#   For more information, refer to [Validate credential configurations from external
+#   sources](https://cloud.google.com/docs/authentication/external/externally-sourced-credentials).
 #   @return [::Object]
 # @!attribute [rw] scope
 #   The OAuth scopes
@@ -80,14 +87,28 @@
 # @!attribute [rw] quota_project
 #   A separate project against which to charge quota.
 #   @return [::String]
+# @!attribute [rw] universe_domain
+#   The universe domain within which to make requests. This determines the
+#   default endpoint URL. The default value of nil uses the environment
+#   universe (usually the default "googleapis.com" universe).
+#   @return [::String,nil]
+# @!attribute [rw] logger
+#   A custom logger to use for request/response debug logging, or the value
+#   `:default` (the default) to construct a default logger, or `nil` to
+#   explicitly disable logging.
+#   @return [::Logger,:default,nil]
 #
 class Configuration
   extend ::Gapic::Config
 
-  config_attr :endpoint,      <%= service.client_endpoint.inspect %>, ::String
+  # @private
+  # The endpoint specific to the default "googleapis.com" universe. Deprecated.
+  DEFAULT_ENDPOINT = <%= service.client_endpoint.inspect %>
+
+  config_attr :endpoint,      nil, ::String, nil
   config_attr :credentials,   nil do |value|
-    allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
-    allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
+    allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Google::Auth::BaseClient, ::Signet::OAuth2::Client, nil]
+    allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC::Core::Channel
     allowed.any? { |klass| klass === value }
   end
   config_attr :scope,         nil, ::String, ::Array, nil
@@ -99,6 +120,8 @@ class Configuration
   config_attr :metadata,      nil, ::Hash, nil
   config_attr :retry_policy,  nil, ::Hash, ::Proc, nil
   config_attr :quota_project, nil, ::String, nil
+  config_attr :universe_domain, nil, ::String, nil
+  config_attr :logger, :default, ::Logger, nil, :default
 
   # @private
   def initialize parent_config = nil
@@ -119,6 +142,14 @@ class Configuration
     end
   end
 
+  ##
+  # Configuration for the channel pool
+  # @return [::Gapic::ServiceStub::ChannelPool::Configuration]
+  #
+  def channel_pool
+    @channel_pool ||= ::Gapic::ServiceStub::ChannelPool::Configuration.new
+  end
+
   ##
   # Configuration RPC class for the <%= service.name %> API.
   #

data/templates/default/service/client/_nonstandard_lro.text.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/{_operations.erb → _operations.text.erb}

@@ -5,6 +5,12 @@ require "<%= service.lro_service.proto_service_require %>"
 <% end %>
 # Service that implements Longrunning Operations API.
 class <%= service.operations_name %>
+  # @private
+  API_VERSION = "<%= service.api_version %>".freeze
+
+  # @private
+  DEFAULT_ENDPOINT_TEMPLATE = <%= service.client_endpoint_template.inspect %>
+
   # @private
   attr_reader :<%= service.lro_service.stub_name %>
 
@@ -39,6 +45,15 @@ class <%= service.operations_name %>
     @config
   end
 
+  ##
+  # The effective universe domain
+  #
+  # @return [String]
+  #
+  def universe_domain
+    @<%= service.lro_service.stub_name %>.universe_domain
+  end
+
   ##
   # Create a new <%= service.operations_name %> client object.
   #
@@ -69,11 +84,17 @@ class <%= service.operations_name %>
 
     @<%= service.lro_service.stub_name %> = ::Gapic::ServiceStub.new(
       <%= service.lro_service.proto_service_stub_name_full %>,
-      credentials:  credentials,
-      endpoint:     @config.endpoint,
+      credentials: credentials,
+      endpoint: @config.endpoint,
+      endpoint_template: DEFAULT_ENDPOINT_TEMPLATE,
+      universe_domain: @config.universe_domain,
       channel_args: @config.channel_args,
-      interceptors: @config.interceptors
+      interceptors: @config.interceptors,
+      channel_pool_config: @config.channel_pool
     )
+
+    # Used by an LRO wrapper for some methods of this service
+    @operations_client = self
   end
 
   # Service calls

data/templates/default/service/client/{_self_configure_defaults.erb → _self_configure_defaults.text.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.erb → _def.text.erb}

@@ -1,10 +1,10 @@
 <%- assert_locals method -%>
 ##
 <%- if method.doc_description -%>
-<%= indent method.doc_description, "# " %>
+<%= indent method.doc_description(transport: :grpc), "# " %>
 #
 <%- end -%>
-<%= render partial: "service/client/method/docs/deprecated", locals: { method: method } -%>
+<%= render partial: "proto_docs/deprecated", locals: { presenter: method , newline: true} -%>
 <%= render partial: "service/client/method/docs/request", locals: { method: method } -%>
 #
 <%= render partial: "service/client/method/docs/response", locals: { method: method } -%>

data/templates/default/service/client/method/def/{_options_defaults.erb → _options_defaults.text.erb}

@@ -5,21 +5,15 @@ options = ::Gapic::CallOptions.new(**options.to_h) if options.respond_to? :to_h
 # Customize the options with defaults
 metadata = @config.rpcs.<%= method.name %>.metadata.to_h
 
-# Set x-goog-api-client and x-goog-user-project headers
+# Set x-goog-api-client, x-goog-user-project and x-goog-api-version headers
 metadata[:"x-goog-api-client"] ||= ::Gapic::Headers.x_goog_api_client \
   lib_name: @config.lib_name, lib_version: @config.lib_version,
   gapic_version: ::<%= method.service.gem.version_name_full %>
+metadata[:"x-goog-api-version"] = API_VERSION unless API_VERSION.empty?
 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/_request_normal.text.erb

@@ -0,0 +1,18 @@
+<%- assert_locals method -%>
+raise ::ArgumentError, "request must be provided" if request.nil?
+<% method.auto_populated_fields.each do |field| %>
+<% name = field.name %>
+
+# Auto populate request field `<%= name %>`.
+if request.is_a? Hash
+  request[:<%= name %>] = SecureRandom.uuid unless request.key?(:<%= name %>) || request.key?("<%= name %>")
+else
+<%- if field.proto3_optional? -%>
+  request.<%= name %> = SecureRandom.uuid unless request.has_<%= name %>?
+<%- else -%>
+  request.<%= name %> = SecureRandom.uuid if request.respond_to?(:<%= name %>) && request.<%= name %>.empty?
+<%- end -%>
+end
+<% end %>
+
+request = ::Gapic::Protobuf.coerce request, to: <%= method.request_type %>

data/templates/default/service/client/method/def/_request_streaming.text.erb

@@ -0,0 +1,23 @@
+<%- assert_locals method -%>
+unless request.is_a? ::Enumerable
+  raise ::ArgumentError, "request must be an Enumerable" unless request.respond_to? :to_enum
+  request = request.to_enum
+end
+<% method.auto_populated_fields.each do |field| %>
+<% name = field.name %>
+
+# Auto populate request field `<%= name %>`.
+if request.is_a? Hash
+  request[:<%= name %>] = SecureRandom.uuid unless request.key?(:<%= name %>) || request.key?("<%= name %>")
+else
+<%- if field.proto3_optional? -%>
+  request.<%= name %> = SecureRandom.uuid unless request.has_<%= name %>?
+<%- else -%>
+  request.<%= name %> = SecureRandom.uuid if request.respond_to?(:<%= name %>) && request.<%= name %>.empty?
+<%- end -%>
+end
+<% end %>
+
+request = request.lazy.map do |req|
+  ::Gapic::Protobuf.coerce req, to: <%= method.request_type %>
+end

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

@@ -0,0 +1,10 @@
+<%- 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 } -%>
+<%- elsif method.lro? -%>
+<%= render partial: "service/client/method/def/response_normal_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.text.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?
+  throw :response, result
+end

data/templates/default/service/client/method/def/_response_normal.text.erb

@@ -0,0 +1,4 @@
+<%- assert_locals method -%>
+@<%= method.service.stub_name %>.call_rpc :<%= method.name %>, request, options: options do |response, operation|
+  yield response, operation if block_given?
+end

data/templates/default/service/client/method/def/{_response_normal.erb → _response_normal_lro.text.erb}

@@ -1,8 +1,6 @@
 <%- assert_locals method -%>
 @<%= method.service.stub_name %>.call_rpc :<%= method.name %>, request, options: options do |response, operation|
-  <%- if method.lro? -%>
   response = ::Gapic::Operation.new response, <%= method.service.lro_client_ivar %>, options: options
-  <%- end -%>
   yield response, operation if block_given?
-  return response
+  throw :response, response
 end

data/templates/default/service/client/method/def/{_response_paged.erb → _response_paged.text.erb}

@@ -5,5 +5,5 @@
   <%- end -%>
   response = ::Gapic::PagedEnumerable.new @<%= method.service.stub_name %>, :<%= method.name %>, request, response, operation, options<%- if method.lro? -%>, format_resource: wrap_lro_operation<%- end -%>
   yield response, operation if block_given?
-  return response
+  throw :response, response
 end