gapic-generator 0.10.1 → 0.45.1

data/templates/default/service/rest/client/method/def/_response_normal_lro.text.erb

@@ -0,0 +1,7 @@
+<%- assert_locals method -%>
+<%- boverr_str = method.service.rest.is_main_mixin_service? ? ", bindings_override: bindings_override" : "" -%>
+@<%= method.service.stub_name %>.<%= method.name %> request, options<%= boverr_str %> do |result, operation|
+  result = ::Gapic::Operation.new result, <%= method.service.lro_client_ivar %>, options: options
+  yield result, operation if block_given?
+  throw :response, result
+end

data/templates/default/service/rest/client/method/def/_response_paged.text.erb

@@ -0,0 +1,7 @@
+<%- assert_locals method -%>
+<%- boverr_str = method.service.rest.is_main_mixin_service? ? ", bindings_override: bindings_override" : "" -%>
+@<%= method.service.stub_name %>.<%= method.name %> request, options<%= boverr_str %> do |result, operation|
+  result = ::Gapic::Rest::PagedEnumerable.new @<%= method.service.stub_name %>, :<%= method.name %>, "<%= method.rest.paged_response_repeated_field_name %>", request, result, options
+  yield result, operation if block_given?
+  throw :response, result
+end

data/templates/default/service/rest/client/method/def/_response_server_streaming.text.erb

@@ -0,0 +1,11 @@
+<%- assert_locals method -%>
+
+::Gapic::Rest::ServerStream.new(
+  <%= method.return_type %>,
+  ::Gapic::Rest::ThreadedEnumerator.new do |in_q, out_q|
+    @<%= method.service.stub_name %>.<%= method.name %> request, options do |chunk|
+      in_q.deq
+      out_q.enq chunk
+    end
+  end
+)

data/templates/default/service/rest/client/method/docs/{_request.erb → _request.text.erb}

@@ -8,8 +8,6 @@
 #     parameters, or to keep all the default parameter values, pass an empty Hash.
 #   @param options [::Gapic::CallOptions, ::Hash]
 #     Overrides the default settings for this call, e.g, timeout, retries etc. Optional.
-#     Note: currently retry functionality is not implemented. While it is possible
-#     to set it using ::Gapic::CallOptions, it will not be applied
 <%-if method.arguments.any?-%>
 #
 <%- arg_list = method.arguments.map { |arg| "#{arg.name}: nil"}.join ", " -%>
@@ -21,7 +19,7 @@
 <%- method.arguments.each do |arg| -%>
 #   @param <%= arg.name %> [<%= arg.doc_types %>]
 <%- if arg.doc_description -%>
-<%= indent arg.doc_description, "#     " %>
+<%= indent arg.doc_description(transport: :rest), "#     " %>
 <%- end -%>
 <%- end -%>
 <%- end -%>

data/templates/default/service/rest/client/method/docs/_result.text.erb

@@ -0,0 +1,10 @@
+<%- assert_locals method -%>
+<%- if method.server_streaming? -%>
+# @return [::Enumerable<<%= method.rest.doc_response_type %>>]
+<%- else -%>
+# @yield [result, operation] Access the result along with the TransportOperation object
+# @yieldparam result [<%= method.rest.doc_response_type %>]
+# @yieldparam operation [::Gapic::Rest::TransportOperation]
+#
+# @return [<%= method.rest.doc_response_type %>]
+<%- end -%>

data/templates/default/service/rest/client/method/docs/_snippets.text.erb

@@ -0,0 +1,6 @@
+<%- assert_locals method -%>
+<%- if method.generate_yardoc_snippets? -%>
+# @example Basic example
+<%= indent render(partial: "snippets/snippet/inline", locals: { snippet: method.snippet(transport: :rest) }), "#   " %>
+#
+<%- end -%>

data/templates/default/service/rest/nonstandard_lro.text.erb

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

data/templates/default/service/rest/operations.text.erb

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

data/templates/default/service/rest/service_stub/_service_stub.text.erb

@@ -0,0 +1,63 @@
+<%- assert_locals service -%>
+<% @requires = capture do %>
+require "<%= service.proto_service_require %>"
+<% end %>
+##
+# REST service stub for the <%= service.name %> service.
+# Service stub contains baseline method implementations
+# including transcoding, making the REST call, and deserialing the response.
+#
+<%= render partial: "proto_docs/deprecated", locals: { presenter: service } -%>
+class <%= service.rest.service_stub_name %>
+  # @private
+  def initialize endpoint:, endpoint_template:, universe_domain:, credentials:, logger:
+    # These require statements are intentionally placed here to initialize
+    # the REST modules only when it's required.
+    require "gapic/rest"
+
+    @client_stub = ::Gapic::Rest::ClientStub.new endpoint: endpoint,
+                                                 endpoint_template: endpoint_template,
+                                                 universe_domain: universe_domain,
+                                                 credentials: credentials,
+                                                 numeric_enums: <%= service.rest.numeric_enums? %>,
+                                                 service_name: self.class,
+                                                 raise_faraday_errors: false,
+                                                 logger: logger
+  end
+
+  ##
+  # The effective universe domain
+  #
+  # @return [String]
+  #
+  def universe_domain
+    @client_stub.universe_domain
+  end
+
+  ##
+  # The effective endpoint
+  #
+  # @return [String]
+  #
+  def endpoint
+    @client_stub.endpoint
+  end
+
+  ##
+  # The logger used for request/response debug logging.
+  #
+  # @return [Logger]
+  #
+  def logger stub: false
+    stub ? @client_stub.stub_logger : @client_stub.logger
+  end
+
+  <%- service.rest.methods.each do |method| -%>
+  <%= indent_tail render(partial: "service/rest/service_stub/method/def", locals: { method: method, service_stub_name: service.rest.service_stub_name }), 2 %>
+
+  <%- end %>
+  <%- service.rest.methods.each do |method| -%>
+  <%= indent_tail render(partial: "service/rest/service_stub/grpc_transcoding_method/def", locals: { method: method }), 2 %>
+
+  <%- end %>
+end

data/templates/default/service/rest/service_stub/grpc_transcoding_method/_def.text.erb

@@ -0,0 +1,37 @@
+<%- assert_locals method -%>
+##
+# @private
+#
+# GRPC transcoding helper method for the <%= method.name %> REST call
+#
+# @param request_pb [<%= method.request_type %>]
+#   A request object representing the call parameters. Required.
+<%- if method.service.rest.is_main_mixin_service? -%>
+# @param bindings_override [::Array<::Gapic::Rest::GrpcTranscoder::HttpBinding>, nil]
+#   Binding overrides for the transcoding.
+<%- end %>
+# @return [Array(String, [String, nil], Hash{String => String})]
+#   Uri, Body, Query string parameters
+<%- boverr_str = method.service.rest.is_main_mixin_service? ? ", bindings_override: nil" : "" -%>
+def self.<%= method.rest.transcoding_helper_name %> request_pb<%= boverr_str %>
+  <%- if method.service.rest.is_main_mixin_service? -%>
+  transcoder = Gapic::Rest::GrpcTranscoder.new(bindings_override) if bindings_override
+  <%- end %>
+  <%- assignment = method.service.rest.is_main_mixin_service? ? "||=" : "=" -%>
+  transcoder <%= assignment %> Gapic::Rest::GrpcTranscoder.new
+  <%- method.http_bindings.each do |http_binding| -%>
+                                            .with_bindings(
+                                              uri_method: :<%= http_binding.verb %>,
+                                              uri_template: "<%= http_binding.uri_for_transcoding %>",
+                                            <%- if http_binding.body? -%>
+                                              body: "<%= http_binding.body %>",
+                                            <%- end -%>
+                                              matches: [
+                                            <%- http_binding.routing_params_transcoder_matches_strings.each do |match_str| -%>
+                                                <%= match_str %>
+                                            <%- end -%>
+                                              ]
+                                            )
+  <%- end %>
+  transcoder.transcode request_pb
+end

data/templates/default/service/rest/service_stub/method/_def.text.erb

@@ -0,0 +1,35 @@
+<%- assert_locals method -%>
+##
+# Baseline implementation for the <%= method.name %> REST call
+#
+# @param request_pb [<%= method.rest.request_type %>]
+#   A request object representing the call parameters. Required.
+# @param options [::Gapic::CallOptions]
+#   Overrides the default settings for this call, e.g, timeout, retries etc. Optional.
+<%- if method.service.rest.is_main_mixin_service? -%>
+# @param bindings_override [::Array<::Gapic::Rest::GrpcTranscoder::HttpBinding>, nil]
+#   Binding overrides for the transcoding. Only used internally.
+<%- end %>
+#
+<%- if method.server_streaming? -%>
+# @yieldparam chunk [::String] The chunk of data received during server streaming.
+#
+# @return [::Gapic::Rest::TransportOperation]
+<%- else -%>
+# @yield [result, operation] Access the result along with the TransportOperation object
+# @yieldparam result [<%= method.rest.return_type %>]
+# @yieldparam operation [::Gapic::Rest::TransportOperation]
+#
+# @return [<%= method.rest.return_type %>]
+#   A result object deserialized from the server's reply
+<%- end -%>
+<%- if method.server_streaming? -%>
+def <%= method.name %> request_pb, options = nil, &block
+<%- else -%>
+<%- boverr_str = method.service.rest.is_main_mixin_service? ? ", bindings_override: nil" : "" -%>
+def <%= method.name %> request_pb, options = nil<%= boverr_str %>
+<%- end -%>
+<%= indent render(partial: "service/rest/service_stub/method/def/request", locals: { method: method }), 2 %>
+
+<%= indent render(partial: "service/rest/service_stub/method/def/response", locals: { method: method, service_stub_name: service_stub_name }), 2 %>
+end

data/templates/default/service/rest/service_stub/method/def/_response.text.erb

@@ -0,0 +1,37 @@
+<%- assert_locals method, service_stub_name -%>
+<%- boverr_str = method.service.rest.is_main_mixin_service? ? ", bindings_override: bindings_override" : "" -%>
+verb, uri, query_string_params, body = <%= service_stub_name %>.<%= method.rest.transcoding_helper_name %> request_pb<%= boverr_str %>
+query_string_params = if query_string_params.any?
+                        query_string_params.to_h { |p| p.split "=", 2 }
+                      else
+                        {}
+                      end
+
+<%- if method.server_streaming? -%>
+response = @client_stub.make_http_request(
+  verb,
+  uri: uri,
+  body: body || "",
+  params: query_string_params,
+  method_name: "<%= method.name %>",
+  options: options,
+  is_server_streaming: true,
+  &block
+)
+::Gapic::Rest::TransportOperation.new response
+<%- else -%>
+response = @client_stub.make_http_request(
+  verb,
+  uri: uri,
+  body: body || "",
+  params: query_string_params,
+  method_name: "<%= method.name %>",
+  options: options
+)
+operation = ::Gapic::Rest::TransportOperation.new response
+result = <%= method.return_type %>.decode_json response.body, ignore_unknown_fields: true
+catch :response do
+  yield result, operation if block_given?
+  result
+end
+<%- end -%>

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

@@ -3,13 +3,13 @@
 require "helper"
 require "gapic/rest"
 require "<%= service.proto_service_require %>"
-require "<%= service.service_require %>"
+require "<%= service.rest.service_require %>"
 
 
-class <%= service.client_name_full %>Test < Minitest::Test
+class <%= service.rest.client_name_full %>Test < Minitest::Test
 <%= indent render(partial: "service/rest/test/method/setup"), 2 %>
 
-<% service.methods.each do |method| %>
+<% service.rest.methods.each do |method| %>
 <%= indent render(partial: "service/rest/test/method/#{method.kind}",
                   locals: { method: method }), 2 %>
 

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

@@ -0,0 +1,2 @@
+<%- assert_locals method -%>
+assert_equal http_response, response.underlying_op

data/templates/default/service/rest/test/method/{_configure.erb → _configure.text.erb}

@@ -4,8 +4,9 @@ def test_configure
   credentials_token = :dummy_value
 
   client = block_config = config = nil
-  Gapic::Rest::ClientStub.stub :new, nil do
-    client = <%= full_client_name =%>.new do |config|
+  dummy_stub = ClientStub.new nil
+  Gapic::Rest::ClientStub.stub :new, dummy_stub do
+    client = <%= full_client_name %>.new do |config|
       config.credentials = credentials_token
     end
   end

data/templates/default/service/rest/test/method/_normal.text.erb

@@ -0,0 +1,60 @@
+<%- assert_locals method -%>
+<%- full_client_name = defined?(client_name_full) ? client_name_full : method.service.rest.client_name_full -%>
+<%- fields = method.fields_with_first_oneof -%>
+def test_<%= method.name %>
+  # Create test objects.
+  client_result = <%= method.return_type %>.new
+  http_response = OpenStruct.new body: client_result.to_json
+
+  call_options = {}
+
+  # Create request parameters for a unary method.
+  <%- fields.each do |field| -%>
+  <%= field.value_name %> = <%= field.default_value %>
+  <%- end -%>
+
+  <%= method.name %>_client_stub = ClientStub.new http_response do |_verb, uri:, body:, params:, options:, method_name:|
+    assert options.metadata.key? :"x-goog-api-client"
+    assert options.metadata[:"x-goog-api-client"].include? "rest"
+    refute options.metadata[:"x-goog-api-client"].include? "grpc"
+  end
+
+  <%= method.service.rest.service_name_full %>::<%= method.service.rest.service_stub_name %>.stub :<%= method.rest.transcoding_helper_name %>, ["", "", {}] do
+    Gapic::Rest::ClientStub.stub :new, <%= method.name %>_client_stub do
+      # Create client
+      client = <%= full_client_name %>.new do |config|
+        config.credentials = :dummy_value
+      end
+
+      # Use hash object
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      <%- if fields.any? -%>
+      # Use named arguments
+      client.<%= method.name %> <%= fields.map(&:as_kwarg).join ", " %> do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      <%- end -%>
+      # Use protobuf object
+      client.<%= method.name %> <%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      # Use hash object with options
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }, call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      # Use protobuf object with options
+      client.<%= method.name %>(<%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end
+
+      # Verify method calls
+      assert_equal <%= fields.any? ? 5 : 4 %>, <%= method.name %>_client_stub.call_count
+    end
+  end
+end

data/templates/default/service/rest/test/method/_server.text.erb

@@ -0,0 +1,60 @@
+<%- assert_locals method -%>
+<%- full_client_name = defined?(client_name_full) ? client_name_full : method.service.rest.client_name_full -%>
+<%- fields = method.fields_with_first_oneof -%>
+def test_<%= method.name %>
+  # Create test objects.
+  client_result = <%= method.return_type %>.new
+  http_response = OpenStruct.new body: client_result.to_json
+
+  call_options = {}
+
+  # Create request parameters for a unary method.
+  <%- fields.each do |field| -%>
+  <%= field.value_name %> = <%= field.default_value %>
+  <%- end -%>
+
+  <%= method.name %>_client_stub = ClientStub.new http_response do |_verb, uri:, body:, params:, options:, is_server_streaming:, method_name:|
+    assert options.metadata.key? :"x-goog-api-client"
+    assert options.metadata[:"x-goog-api-client"].include? "rest"
+    refute options.metadata[:"x-goog-api-client"].include? "grpc"
+  end
+
+  <%= method.service.rest.service_name_full %>::<%= method.service.rest.service_stub_name %>.stub :<%= method.rest.transcoding_helper_name %>, ["", "", {}] do
+    Gapic::Rest::ClientStub.stub :new, <%= method.name %>_client_stub do
+      # Create client
+      client = <%= full_client_name %>.new do |config|
+        config.credentials = :dummy_value
+      end
+
+      # Use hash object
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      <%- if fields.any? -%>
+      # Use named arguments
+      client.<%= method.name %> <%= fields.map(&:as_kwarg).join ", " %> do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      <%- end -%>
+      # Use protobuf object
+      client.<%= method.name %> <%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      # Use hash object with options
+      client.<%= method.name %>({ <%= fields.map(&:as_kwarg).join ", " %> }, call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      # Use protobuf object with options
+      client.<%= method.name %>(<%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), call_options) do |_result, response|
+        <%= indent_tail render(partial: "service/rest/test/method/assert_response", locals: { method: method }), 6 %>
+      end.first
+
+      # Verify method calls
+      assert_equal <%= fields.any? ? 5 : 4 %>, <%= method.name %>_client_stub.call_count
+    end
+  end
+end

data/templates/default/service/rest/test/method/{_setup.erb → _setup.text.erb}

@@ -8,24 +8,24 @@ class ClientStub
     @requests = []
   end
 
-  def make_get_request uri:, params: {}, options: {}
-    make_http_request :get, uri: uri, body: nil, params: params, options: options
+  def make_get_request uri:, params: {}, options: {}, method_name: nil
+    make_http_request :get, uri: uri, body: nil, params: params, options: options, method_name: method_name
   end
 
-  def make_delete_request uri:, params: {}, options: {}
-    make_http_request :delete, uri: uri, body: nil, params: params, options: options
+  def make_delete_request uri:, params: {}, options: {}, method_name: nil
+    make_http_request :delete, uri: uri, body: nil, params: params, options: options, method_name: method_name
   end
 
-  def make_post_request uri:, body: nil, params: {}, options: {}
-    make_http_request :post, uri: uri, body: body, params: params, options: options
+  def make_post_request uri:, body: nil, params: {}, options: {}, method_name: nil
+    make_http_request :post, uri: uri, body: body, params: params, options: options, method_name: method_name
   end
 
-  def make_patch_request uri:, body:, params: {}, options: {}
-    make_http_request :patch, uri: uri, body: body, params: params, options: options
+  def make_patch_request uri:, body:, params: {}, options: {}, method_name: nil
+    make_http_request :patch, uri: uri, body: body, params: params, options: options, method_name: method_name
   end
 
-  def make_put_request uri:, body:, params: {}, options: {}
-    make_http_request :put, uri: uri, body: body, params: params, options: options
+  def make_put_request uri:, body:, params: {}, options: {}, method_name: nil
+    make_http_request :put, uri: uri, body: body, params: params, options: options, method_name: method_name
   end
 
   def make_http_request *args, **kwargs
@@ -35,4 +35,20 @@ class ClientStub
 
     @response
   end
+
+  def endpoint
+    "endpoint.example.com"
+  end
+
+  def universe_domain
+    "example.com"
+  end
+
+  def stub_logger
+    nil
+  end
+
+  def logger
+    nil
+  end
 end

data/templates/default/service/test/{_resource.erb → _resource.text.erb}

@@ -3,7 +3,7 @@
 <%- full_client_name = defined?(client_name_full) ? client_name_full : service.client_name_full -%>
 def test_<%= resource.path_helper%>
   grpc_channel = ::GRPC::Core::Channel.new "localhost:8888", nil, :this_channel_is_insecure
-  ::Gapic::ServiceStub.stub :new, nil do
+  ::Gapic::ServiceStub.stub :new, DummyStub.new do
     client = <%= full_client_name %>.new do |config|
       config.credentials = grpc_channel
     end

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

@@ -15,7 +15,7 @@ class <%= service.client_name_full %>Test < Minitest::Test
 <%= indent render(partial: "service/test/method/#{method.kind}",
                   locals: { method: method }), 2 %>
 
-<% end %>
+<%- end -%>
 <%= indent render(partial: "service/test/method/configure", locals: { service: service }), 2 %>
 <%- if service.lro? -%>
 
@@ -23,7 +23,8 @@ class <%= service.client_name_full %>Test < Minitest::Test
     grpc_channel = GRPC::Core::Channel.new "localhost:8888", nil, :this_channel_is_insecure
 
     client = nil
-    Gapic::ServiceStub.stub :new, nil do
+    dummy_stub = ClientStub.new nil, nil
+    Gapic::ServiceStub.stub :new, dummy_stub do
       client = <%= service.client_name_full =%>.new do |config|
         config.credentials = grpc_channel
       end

data/templates/default/service/test/client_paths.text.erb

@@ -0,0 +1,33 @@
+<%- assert_locals service -%>
+<%= render partial: "shared/header" %>
+require "helper"
+
+require "gapic/grpc/service_stub"
+
+require "<%= service.service_require %>"
+
+class <%= service.client_name_full %>PathsTest < Minitest::Test
+  class DummyStub
+    def endpoint
+      "endpoint.example.com"
+    end
+  
+    def universe_domain
+      "example.com"
+    end
+
+    def stub_logger
+      nil
+    end
+
+    def logger
+      nil
+    end
+  end
+
+<%- start_line_spacer -%>
+<%- service.deduped_references.each do |resource| -%>
+<%- locals = { resource: resource, service: service } -%>
+<%= line_spacer %><%= indent render(partial: "service/test/resource", locals: locals), 2 %>
+<%- end -%>
+end

data/templates/default/service/test/method/{_assert_response.erb → _assert_response.text.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 -%>

data/templates/default/service/test/method/{_bidi.erb → _bidi.text.erb}

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a bidi streaming method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new [grpc_response].to_enum, grpc_operation do |name, request, options:|

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

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a client streaming method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new grpc_response, grpc_operation do |name, request, options:|

data/templates/default/service/test/method/{_configure.erb → _configure.text.erb}

@@ -4,7 +4,8 @@ def test_configure
   grpc_channel = GRPC::Core::Channel.new "localhost:8888", nil, :this_channel_is_insecure
 
   client = block_config = config = nil
-  Gapic::ServiceStub.stub :new, nil do
+  dummy_stub = ClientStub.new nil, nil
+  Gapic::ServiceStub.stub :new, dummy_stub do
     client = <%= full_client_name =%>.new do |config|
       config.credentials = grpc_channel
     end

data/templates/default/service/test/method/{_normal.erb → _normal.text.erb}

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a unary method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new grpc_response, grpc_operation do |name, request, options:|

data/templates/default/service/test/method/{_server.erb → _server.text.erb}

@@ -10,7 +10,7 @@ def test_<%= method.name %>
 
   # Create request parameters for a server streaming method.
   <%- fields.each do |field| -%>
-  <%= field.name %> = <%= field.default_value %>
+  <%= field.value_name %> = <%= field.default_value %>
   <%- end -%>
 
   <%= method.name %>_client_stub = ClientStub.new [grpc_response].to_enum, grpc_operation do |name, request, options:|

data/templates/default/service/test/method/{_setup.erb → _setup.text.erb}

@@ -14,8 +14,25 @@ class ClientStub
 
     @requests << @block&.call(*args, **kwargs)
 
-    yield @response, @operation if block_given?
+    catch :response do
+      yield @response, @operation if block_given?
+      @response
+    end
+  end
+
+  def endpoint
+    "endpoint.example.com"
+  end
+
+  def universe_domain
+    "example.com"
+  end
+
+  def stub_logger
+    nil
+  end
 
-    @response
+  def logger
+    nil
   end
 end

data/templates/default/snippets/{gemfile.erb → gemfile.text.erb}

@@ -10,8 +10,8 @@ else
 end
 
 group :test do
-  gem "google-style", "~> 1.25.1"
-  gem "minitest", "~> 5.14"
+  gem "google-style", "~> 1.26.1"
+  gem "minitest", "~> 5.16"
   gem "minitest-focus", "~> 1.1"
   gem "minitest-hooks", "~> 1.5"
 end