From b576ed15e713d6dd0b0f07d25c26c6c28fb113c7 Mon Sep 17 00:00:00 2001 From: Jun Mukai Date: Thu, 16 Feb 2017 10:48:28 -0800 Subject: [PATCH] Pass the entire optional parameters to createStub To allow additional grpc parameters for constructing Client. Fix https://github.com/googleapis/gax-nodejs/issues/107 --- .../com/google/api/codegen/nodejs/main.snip | 19 +++++++++---------- .../testdata/nodejs_doc_main_library.baseline | 7 +++---- .../testdata/nodejs_main_library.baseline | 7 +++---- .../nodejs_main_no_path_templates.baseline | 3 +-- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/resources/com/google/api/codegen/nodejs/main.snip b/src/main/resources/com/google/api/codegen/nodejs/main.snip index d5e92e78c4..891a00de32 100644 --- a/src/main/resources/com/google/api/codegen/nodejs/main.snip +++ b/src/main/resources/com/google/api/codegen/nodejs/main.snip @@ -238,7 +238,6 @@ opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; - var sslCreds = opts.sslCreds || null; var clientConfig = opts.clientConfig || {}; var googleApiClient = [ @@ -280,17 +279,17 @@ @if longrunningMethods + var lroOpts = {}; + Object.keys(opts).forEach(function(key) { + lroOpts[key] = opts[key]; + }); + lroOpts.servicePath = servicePath; + lroOpts.port = port; + lroOpts.clientConfig = clientConfig; this.operationsClient = new gax.lro({ auth: gaxGrpc.auth, grpc: gaxGrpc.grpc - }).operationsClient({ - servicePath: servicePath, - port: port, - sslCreds: sslCreds, - clientConfig: clientConfig, - libName: opts.libName, - libVersion: opts.libVersion - }); + }).operationsClient(lroOpts); this.longrunningDescriptors = { @join method : longrunningMethods on {@", "}.add(BREAK) @@ -315,7 +314,7 @@ servicePath, port, grpcClients.{@stub.fullyQualifiedType}, - {sslCreds: sslCreds}); + opts); var {@stub.stubMethodsArrayName} = [ @join method : {@stub.methodNames} on {@","}.add(BREAK) '{@method}' diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline index 727c1f9db3..50d612b92f 100644 --- a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline +++ b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_main_library.baseline @@ -106,7 +106,6 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; - var sslCreds = opts.sslCreds || null; var clientConfig = opts.clientConfig || {}; var googleApiClient = [ @@ -138,7 +137,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { }).operationsClient({ servicePath: servicePath, port: port, - sslCreds: sslCreds, + sslCreds: opts.sslCreds, clientConfig: clientConfig, libName: opts.libName, libVersion: opts.libVersion @@ -168,7 +167,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { servicePath, port, grpcClients.google.example.library.v1.LibraryService, - {sslCreds: sslCreds}); + opts); var libraryServiceStubMethods = [ 'createShelf', 'getShelf', @@ -212,7 +211,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { servicePath, port, grpcClients.google.tagger.v1.Labeler, - {sslCreds: sslCreds}); + opts); var labelerStubMethods = [ 'addLabel' ]; diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline index 727c1f9db3..50d612b92f 100644 --- a/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline +++ b/src/test/java/com/google/api/codegen/testdata/nodejs_main_library.baseline @@ -106,7 +106,6 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; - var sslCreds = opts.sslCreds || null; var clientConfig = opts.clientConfig || {}; var googleApiClient = [ @@ -138,7 +137,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { }).operationsClient({ servicePath: servicePath, port: port, - sslCreds: sslCreds, + sslCreds: opts.sslCreds, clientConfig: clientConfig, libName: opts.libName, libVersion: opts.libVersion @@ -168,7 +167,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { servicePath, port, grpcClients.google.example.library.v1.LibraryService, - {sslCreds: sslCreds}); + opts); var libraryServiceStubMethods = [ 'createShelf', 'getShelf', @@ -212,7 +211,7 @@ function LibraryServiceClient(gaxGrpc, grpcClients, opts) { servicePath, port, grpcClients.google.tagger.v1.Labeler, - {sslCreds: sslCreds}); + opts); var labelerStubMethods = [ 'addLabel' ]; diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline index 97cad0708d..c38f05f37d 100644 --- a/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline +++ b/src/test/java/com/google/api/codegen/testdata/nodejs_main_no_path_templates.baseline @@ -62,7 +62,6 @@ function NoTemplatesAPIServiceClient(gaxGrpc, grpcClients, opts) { opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; - var sslCreds = opts.sslCreds || null; var clientConfig = opts.clientConfig || {}; var googleApiClient = [ @@ -90,7 +89,7 @@ function NoTemplatesAPIServiceClient(gaxGrpc, grpcClients, opts) { servicePath, port, grpcClients.google.cloud.example.v1.NoTemplatesAPIService, - {sslCreds: sslCreds}); + opts); var noTemplatesApiServiceStubMethods = [ 'increment' ];