move duplicate code

googleapis · Mar 18, 2020 · f543fda · alexander-fenster · Mar 18, 2020 · xiaozhenliu-gg5
1 parent 60390f1
commit f543fda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline
@@ -216,12 +216,17 @@ export class LoggingServiceV2Client {
       listLogs:
           new this._gaxModule.PageDescriptor('pageToken', 'nextPageToken', 'logNames')
     };
-    // Some methods on this API support automatically batching
-    // requests; denote this.
+
+    // This API contains "long-running operations", which return a
+    // an Operation object that allows for tracking of the operation,
+    // rather than holding a request open.
     const protoFilesRoot = opts.fallback?
       this._gaxModule.protobuf.Root.fromJSON(require("../../protos/protos.json")) :
       this._gaxModule.protobuf.loadSync(nodejsProtoPath);
 
+    // Some methods on this API support automatically batching
+    // requests; denote this.
+
     this._descriptors.batching = {
       WriteLogEntries: new this._gaxModule.BundleDescriptor(
         'entries',

diff --git a/templates/typescript_gapic/src/$version/$service_client.ts.njk b/templates/typescript_gapic/src/$version/$service_client.ts.njk
@@ -185,15 +185,16 @@ export class {{ service.name }}Client {
 {%- endfor %}
     };
 {%- endif %}
-{%- if (service.longRunning.length > 0) %}
+{%- if (service.longRunning.length > 0) or (service.bundleConfigs.length > 0) %}
 
     // This API contains "long-running operations", which return a
     // an Operation object that allows for tracking of the operation,
     // rather than holding a request open.
     const protoFilesRoot = opts.fallback?
       this._gaxModule.protobuf.Root.fromJSON(require("../../protos/protos.json")) :
       this._gaxModule.protobuf.loadSync(nodejsProtoPath);
-
+{% endif %}
+{%- if service.longRunning.length > 0 %}
     this.operationsClient = this._gaxModule.lro({
       auth: this.auth,
       grpc: 'grpc' in this._gaxGrpc ? this._gaxGrpc.grpc : undefined
@@ -221,11 +222,6 @@ export class {{ service.name }}Client {
 {%- if (service.bundleConfigs.length > 0) %}
     // Some methods on this API support automatically batching
     // requests; denote this.
-{%- if (service.longRunning.length === 0) %}
-    const protoFilesRoot = opts.fallback?
-      this._gaxModule.protobuf.Root.fromJSON(require("../../protos/protos.json")) :
-      this._gaxModule.protobuf.loadSync(nodejsProtoPath);
-{%- endif %}
 
     this._descriptors.batching = {
 {%- for method in service.bundleConfigsMethods %}