From ac86d6e82fb6f3830942cab29a75fa3ef95ee990 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Wed, 27 Nov 2024 21:20:46 +0000 Subject: [PATCH 01/24] fix: template was missing curly brackets, fix for https://github.com/googleapis/gapic-generator-typescript/issues/1668 --- templates/cjs/typescript_gapic/_util.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/cjs/typescript_gapic/_util.njk b/templates/cjs/typescript_gapic/_util.njk index 65d1599e2..337a77b92 100644 --- a/templates/cjs/typescript_gapic/_util.njk +++ b/templates/cjs/typescript_gapic/_util.njk @@ -83,7 +83,7 @@ limitations under the License. {%- endmacro -%} {%- macro printPageStreamHeader(method) %} - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `{{ method.name.toCamelCase() }}`, but returns a NodeJS Stream object. {%- endmacro -%} {%- macro printRequest(method) %} From 5e684f8f3ee630850542d0d8024b6ffe01af52a9 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 3 Dec 2024 21:42:23 +0000 Subject: [PATCH 02/24] feat: preliminary cjs support for debug request/response logging --- templates/cjs/typescript_gapic/_debuglog.njk | 29 +++++++++++++++++++ templates/cjs/typescript_gapic/package.json | 3 +- .../src/$version/$service_client.ts.njk | 20 +++++++++++-- typescript/src/schema/api.ts | 3 ++ 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 templates/cjs/typescript_gapic/_debuglog.njk diff --git a/templates/cjs/typescript_gapic/_debuglog.njk b/templates/cjs/typescript_gapic/_debuglog.njk new file mode 100644 index 000000000..4f1526c86 --- /dev/null +++ b/templates/cjs/typescript_gapic/_debuglog.njk @@ -0,0 +1,29 @@ +{#- + +Copyright 2024 Google LLC + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +-#} + +{#- + logger() macro should be called in the very beginning of + the template that wants to use the logger. +-#} + +{%- macro logger(service) -%} + +import {log as makeLog} from 'google-logging-utils'; +const log = makeLog('{{service}}'); + +{%- endmacro -%} diff --git a/templates/cjs/typescript_gapic/package.json b/templates/cjs/typescript_gapic/package.json index 039dc3d46..fb6093afd 100644 --- a/templates/cjs/typescript_gapic/package.json +++ b/templates/cjs/typescript_gapic/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index 838c85301..04252f190 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -25,7 +25,9 @@ limitations under the License. {% import "../../_locations.njk" as location -%} {% import "../../_operations.njk" as operations -%} {% import "../../_namer.njk" as namer -%} +{% import "../../_debuglog.njk" as debuglog -%} {{- namer.initialize(id, service) -}} +{{- debuglog.logger(api.loggingName) -}} {%- set autoPopulated = false -%} {%- for method in service.method -%} {%- if method.autoPopulatedFields|length !== 0 %} @@ -656,9 +658,11 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{ method.name.toCamelCase(true) }} %j', request); {%- if method.isDiregapicLRO %} return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { + log.info('{{ method.name.toCamelCase(true) }} success %j', response); return [ { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, operation, @@ -666,7 +670,14 @@ export class {{ service.name }}Client { ]; }); {%- else %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback); + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) + .then(([response, options, rawResponse]: [ + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined + ]) => { + log.info('{{ method.name.toCamelCase(true) }} success %j', response); + return [response, options, rawResponse]; + }); {%- endif %} } {%- endfor %} @@ -689,6 +700,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{ method.name.toCamelCase() }} streaming'); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options); } {%- elif method.serverStreaming %} @@ -712,6 +724,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{ method.name.toCamelCase() }} streaming %j', request); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options); } {%- elif method.clientStreaming %} @@ -757,6 +770,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{ method.name.toCamelCase() }} streaming'); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options, callback); } {%- endif %} @@ -824,6 +838,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{ method.name.toCamelCase() }} long-running %j', request); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback); } /** @@ -903,7 +918,7 @@ export class {{ service.name }}Client { {%- endif %} -{%- for field in method.autoPopulatedFields %} +{%- for field in method.autoPopulatedFields %} if (!request.{{ field.toCamelCase() }}) { request.{{ field.toCamelCase() }} = gax.makeUUID(); } @@ -1057,6 +1072,7 @@ export class {{ service.name }}Client { {{ id.get("close") }}(): Promise { if (this.{{ service.name.toCamelCase() }}Stub && !this._terminated) { return this.{{ service.name.toCamelCase() }}Stub.then(stub => { + log.info('ending gRPC channel'); this._terminated = true; stub.close(); {%- if service.IAMPolicyMixin > 0 %} diff --git a/typescript/src/schema/api.ts b/typescript/src/schema/api.ts index 601e56d5c..7945f9ff1 100644 --- a/typescript/src/schema/api.ts +++ b/typescript/src/schema/api.ts @@ -31,6 +31,8 @@ export class API { port?: string; // This field is for users passing proper publish package name like @google-cloud/text-to-speech. publishName: string; + // The short name we'll use for the package (e.g. @google-cloud/text-to-speech -> text-to-speech) + loggingName: string; // For historical reasons, Webpack library name matches "the main" service of the client library. // Sometimes it's hard to figure out automatically, so making this an option. mainServiceName: string; @@ -97,6 +99,7 @@ export class API { // users specify the actual package name, if not, set it to product name. this.publishName = options.publishName || this.naming.productName.toKebabCase(); + this.loggingName = this.publishName.replace(/^@google-cloud\//, ''); this.handwrittenLayer = options.handwrittenLayer ?? false; this.rest = options.rest; this.diregapic = options.diregapic ?? false; From e96ed599da85572c1933a2c9efa203d1bd3556b1 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Fri, 13 Dec 2024 23:15:08 +0000 Subject: [PATCH 03/24] feat: more logs added --- .../src/$version/$service_client.ts.njk | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index 04252f190..144d631d8 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -658,16 +658,16 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase(true) }} %j', request); + log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - log.info('{{ method.name.toCamelCase(true) }} success %j', response); + log.info('{{ method.name.toCamelCase() }} response %j', response); return [ { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, operation, rawResponse - ]; + ]; }); {%- else %} return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) @@ -675,7 +675,7 @@ export class {{ service.name }}Client { {{ util.toInterface(method.outputInterface) }}, {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined ]) => { - log.info('{{ method.name.toCamelCase(true) }} success %j', response); + log.info('{{ method.name.toCamelCase() }} response %j', response); return [response, options, rawResponse]; }); {%- endif %} @@ -700,7 +700,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} streaming'); + log.info('{{ method.name.toCamelCase() }} stream'); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options); } {%- elif method.serverStreaming %} @@ -724,7 +724,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} streaming %j', request); + log.info('{{ method.name.toCamelCase() }} stream %j', request); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options); } {%- elif method.clientStreaming %} @@ -770,7 +770,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} streaming'); + log.info('{{ method.name.toCamelCase() }} stream'); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options, callback); } {%- endif %} @@ -838,8 +838,15 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} long-running %j', request); - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback); + log.info('{{ method.name.toCamelCase() }} request %j', request); + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) + .then(([response, options, rawResponse]: [ + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined + ]) => { + log.info('{{ method.name.toCamelCase() }} response %j', response); + return [response, options, rawResponse]; + }); } /** {%- set decodeMethodName = id.get("check" + method.name.toPascalCase() + "Progress") -%} @@ -856,6 +863,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{decodeMethodName}}','{{decodeMethodName}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{method.name.toCamelCase()}} long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.{{ method.name.toCamelCase() }}, this._gaxModule.createDefaultBackoffSettings()); @@ -921,8 +929,8 @@ export class {{ service.name }}Client { {%- for field in method.autoPopulatedFields %} if (!request.{{ field.toCamelCase() }}) { request.{{ field.toCamelCase() }} = gax.makeUUID(); - } - + } + {%- endfor %} let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { @@ -937,7 +945,16 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback); + log.info('{{ method.name.toCamelCase() }} request %j', request); + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) + .then(([response, input, output]: [ + {{ util.toInterface(method.pagingResponseType) }}[], + {{ util.toInterface(method.inputInterface) }}|null, + {{ util.toInterface(method.outputInterface) }} + ]) => { + log.info('{{ method.name.toCamelCase() }} response %j', response); + return [response, input, output]; + }); } /** @@ -962,6 +979,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{ method.name.toCamelCase() }} stream %j', request); return this.descriptors.page.{{ method.name.toCamelCase() }}.createStream( this.innerApiCalls.{{ method.name.toCamelCase(true) }} as GaxCall, request, @@ -1000,6 +1018,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + log.info('{{ method.name.toCamelCase() }} iterate %j', request); return this.descriptors.page.{{ method.name.toCamelCase() }}.asyncIterate( this.innerApiCalls['{{ method.name.toCamelCase(true) }}'] as GaxCall, request as {}, From 2eae35bdb83bdc8807a095ed58147ce27617eafd Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:05:58 +0000 Subject: [PATCH 04/24] fix: handle callbacks (as opposed to promises) for logging followups --- .../src/$version/$service_client.ts.njk | 69 ++++++++++++++----- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index 144d631d8..813393e73 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -660,18 +660,36 @@ export class {{ service.name }}Client { {%- endif %} log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) - .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); - return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse - ]; - }); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { + log.info('{{ method.name.toCamelCase() }} response %j', response); + callback(error, response, nextRequest, rawResponse); + } + : undefined; + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { + log.info('{{ method.name.toCamelCase() }} response %j', response); + return [ + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse + ]; + }); {%- else %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) - .then(([response, options, rawResponse]: [ + const wrappedCallback: Callback< + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + log.info('{{ method.name.toCamelCase() }} response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ {{ util.toInterface(method.outputInterface) }}, {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined ]) => { @@ -838,9 +856,18 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + const wrappedCallback: Callback< + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + log.info('{{ method.name.toCamelCase() }} response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; log.info('{{ method.name.toCamelCase() }} request %j', request); - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) - .then(([response, options, rawResponse]: [ + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ {{ util.toInterface(method.outputInterface) }}, {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined ]) => { @@ -945,14 +972,24 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + const wrappedCallback: PaginationCallback< + {{ util.toInterface(method.inputInterface) }}, + {{ util.toInterface(method.outputInterface) }}|null|undefined, + {{ util.toInterface(method.pagingResponseType) }}>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + log.info('{{ method.name.toCamelCase() }} values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; log.info('{{ method.name.toCamelCase() }} request %j', request); - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) - .then(([response, input, output]: [ + return this.innerApiCalls + .{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, input, output]: [ {{ util.toInterface(method.pagingResponseType) }}[], {{ util.toInterface(method.inputInterface) }}|null, {{ util.toInterface(method.outputInterface) }} ]) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); + log.info('{{ method.name.toCamelCase() }} values %j', response); return [response, input, output]; }); } From 3c706c93d905f5891856e1b50e61988f665174d2 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:06:40 +0000 Subject: [PATCH 05/24] build: use bazeliskrc to fix bazel version --- .bazeliskrc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .bazeliskrc diff --git a/.bazeliskrc b/.bazeliskrc new file mode 100644 index 000000000..74cd900fb --- /dev/null +++ b/.bazeliskrc @@ -0,0 +1,2 @@ +# See https://github.com/bazelbuild/bazelisk +USE_BAZEL_VERSION=6.3.0 From 84167b880ad2248b02e2646036a29990647d1975 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 17 Dec 2024 20:11:54 +0000 Subject: [PATCH 06/24] fix: improve debug log instantiation --- templates/cjs/typescript_gapic/_debuglog.njk | 29 ------------- .../src/$version/$service_client.ts.njk | 41 ++++++++++--------- 2 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 templates/cjs/typescript_gapic/_debuglog.njk diff --git a/templates/cjs/typescript_gapic/_debuglog.njk b/templates/cjs/typescript_gapic/_debuglog.njk deleted file mode 100644 index 4f1526c86..000000000 --- a/templates/cjs/typescript_gapic/_debuglog.njk +++ /dev/null @@ -1,29 +0,0 @@ -{#- - -Copyright 2024 Google LLC - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - --#} - -{#- - logger() macro should be called in the very beginning of - the template that wants to use the logger. --#} - -{%- macro logger(service) -%} - -import {log as makeLog} from 'google-logging-utils'; -const log = makeLog('{{service}}'); - -{%- endmacro -%} diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index 813393e73..f7cdfa847 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -25,9 +25,7 @@ limitations under the License. {% import "../../_locations.njk" as location -%} {% import "../../_operations.njk" as operations -%} {% import "../../_namer.njk" as namer -%} -{% import "../../_debuglog.njk" as debuglog -%} {{- namer.initialize(id, service) -}} -{{- debuglog.logger(api.loggingName) -}} {%- set autoPopulated = false -%} {%- for method in service.method -%} {%- if method.autoPopulatedFields|length !== 0 %} @@ -55,6 +53,7 @@ import * as path from 'path'; {%- else %} import jsonProtos = require('../../protos/protos.json'); {%- endif %} +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -82,6 +81,8 @@ export class {{ service.name }}Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('{{api.loggingName}}'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -658,20 +659,20 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} request %j', request); + this._log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} const wrappedCallback: Callback< protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation>|undefined = callback ? (error, response, nextRequest, rawResponse) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); + this._log.info('{{ method.name.toCamelCase() }} response %j', response); callback(error, response, nextRequest, rawResponse); } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); + this._log.info('{{ method.name.toCamelCase() }} response %j', response); return [ { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, operation, @@ -684,7 +685,7 @@ export class {{ service.name }}Client { {{ util.toInterface(method.inputInterface) }}|null|undefined, {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); + this._log.info('{{ method.name.toCamelCase() }} response %j', response); callback(error, response, options, rawResponse); } : undefined; @@ -693,7 +694,7 @@ export class {{ service.name }}Client { {{ util.toInterface(method.outputInterface) }}, {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined ]) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); + this._log.info('{{ method.name.toCamelCase() }} response %j', response); return [response, options, rawResponse]; }); {%- endif %} @@ -718,7 +719,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} stream'); + this._log.info('{{ method.name.toCamelCase() }} stream'); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options); } {%- elif method.serverStreaming %} @@ -742,7 +743,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} stream %j', request); + this._log.info('{{ method.name.toCamelCase() }} stream %j', request); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options); } {%- elif method.clientStreaming %} @@ -788,7 +789,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} stream'); + this._log.info('{{ method.name.toCamelCase() }} stream'); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options, callback); } {%- endif %} @@ -861,17 +862,17 @@ export class {{ service.name }}Client { {{ util.toInterface(method.inputInterface) }}|null|undefined, {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); + this._log.info('{{ method.name.toCamelCase() }} response %j', response); callback(error, response, options, rawResponse); } : undefined; - log.info('{{ method.name.toCamelCase() }} request %j', request); + this._log.info('{{ method.name.toCamelCase() }} request %j', request); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ {{ util.toInterface(method.outputInterface) }}, {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined ]) => { - log.info('{{ method.name.toCamelCase() }} response %j', response); + this._log.info('{{ method.name.toCamelCase() }} response %j', response); return [response, options, rawResponse]; }); } @@ -890,7 +891,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{decodeMethodName}}','{{decodeMethodName}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{method.name.toCamelCase()}} long-running'); + this._log.info('{{method.name.toCamelCase()}} long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.{{ method.name.toCamelCase() }}, this._gaxModule.createDefaultBackoffSettings()); @@ -977,11 +978,11 @@ export class {{ service.name }}Client { {{ util.toInterface(method.outputInterface) }}|null|undefined, {{ util.toInterface(method.pagingResponseType) }}>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { - log.info('{{ method.name.toCamelCase() }} values %j', values); + this._log.info('{{ method.name.toCamelCase() }} values %j', values); callback(error, values, nextPageRequest, rawResponse); } : undefined; - log.info('{{ method.name.toCamelCase() }} request %j', request); + this._log.info('{{ method.name.toCamelCase() }} request %j', request); return this.innerApiCalls .{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) ?.then(([response, input, output]: [ @@ -989,7 +990,7 @@ export class {{ service.name }}Client { {{ util.toInterface(method.inputInterface) }}|null, {{ util.toInterface(method.outputInterface) }} ]) => { - log.info('{{ method.name.toCamelCase() }} values %j', response); + this._log.info('{{ method.name.toCamelCase() }} values %j', response); return [response, input, output]; }); } @@ -1016,7 +1017,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} stream %j', request); + this._log.info('{{ method.name.toCamelCase() }} stream %j', request); return this.descriptors.page.{{ method.name.toCamelCase() }}.createStream( this.innerApiCalls.{{ method.name.toCamelCase(true) }} as GaxCall, request, @@ -1055,7 +1056,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - log.info('{{ method.name.toCamelCase() }} iterate %j', request); + this._log.info('{{ method.name.toCamelCase() }} iterate %j', request); return this.descriptors.page.{{ method.name.toCamelCase() }}.asyncIterate( this.innerApiCalls['{{ method.name.toCamelCase(true) }}'] as GaxCall, request as {}, @@ -1128,7 +1129,7 @@ export class {{ service.name }}Client { {{ id.get("close") }}(): Promise { if (this.{{ service.name.toCamelCase() }}Stub && !this._terminated) { return this.{{ service.name.toCamelCase() }}Stub.then(stub => { - log.info('ending gRPC channel'); + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); {%- if service.IAMPolicyMixin > 0 %} From ed7c130bfa2ede5e4c38fd46dbb3f9dcee8024ef Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 17 Dec 2024 21:06:00 +0000 Subject: [PATCH 07/24] feat: show streaming call options with log lines --- .../typescript_gapic/src/$version/$service_client.ts.njk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index f7cdfa847..050b6e8a7 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -719,7 +719,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - this._log.info('{{ method.name.toCamelCase() }} stream'); + this._log.info('{{ method.name.toCamelCase() }} stream %j', options); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options); } {%- elif method.serverStreaming %} @@ -743,7 +743,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - this._log.info('{{ method.name.toCamelCase() }} stream %j', request); + this._log.info('{{ method.name.toCamelCase() }} stream %j', options); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options); } {%- elif method.clientStreaming %} @@ -789,7 +789,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - this._log.info('{{ method.name.toCamelCase() }} stream'); + this._log.info('{{ method.name.toCamelCase() }} stream %j', options); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options, callback); } {%- endif %} From 569546318659413ad66a48b79ac3b5c364a4dd64 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 17 Dec 2024 21:15:14 +0000 Subject: [PATCH 08/24] tests: update baselines --- baselines/asset/package.json | 3 +- .../src/v1/asset_service_client.ts.baseline | 138 +++- baselines/bigquery-storage/package.json | 3 +- .../big_query_storage_client.ts.baseline | 81 ++- baselines/bigquery-v2/package.json | 3 +- .../src/v2/dataset_service_client.ts.baseline | 141 +++- .../src/v2/job_service_client.ts.baseline | 141 +++- .../src/v2/model_service_client.ts.baseline | 84 ++- .../src/v2/project_service_client.ts.baseline | 23 +- .../src/v2/routine_service_client.ts.baseline | 122 +++- ...w_access_policy_service_client.ts.baseline | 27 +- .../src/v2/table_service_client.ts.baseline | 122 +++- baselines/compute/package.json | 3 +- .../src/v1/addresses_client.ts.baseline | 78 ++- .../v1/region_operations_client.ts.baseline | 42 +- baselines/deprecatedtest/package.json | 3 +- .../v1/deprecated_service_client.ts.baseline | 42 +- baselines/disable-packing-test/package.json | 3 +- .../src/v1beta1/compliance_client.ts.baseline | 194 +++++- .../src/v1beta1/echo_client.ts.baseline | 126 +++- .../src/v1beta1/identity_client.ts.baseline | 103 ++- .../src/v1beta1/messaging_client.ts.baseline | 225 ++++++- .../sequence_service_client.ts.baseline | 61 +- .../src/v1beta1/testing_client.ts.baseline | 164 ++++- baselines/dlp/package.json | 3 +- .../dlp/src/v2/dlp_service_client.ts.baseline | 613 +++++++++++++++++- baselines/kms/package.json | 3 +- .../key_management_service_client.ts.baseline | 457 ++++++++++++- baselines/logging/package.json | 3 +- .../v2/config_service_v2_client.ts.baseline | 515 ++++++++++++++- .../v2/logging_service_v2_client.ts.baseline | 112 +++- .../v2/metrics_service_v2_client.ts.baseline | 103 ++- baselines/monitoring/package.json | 3 +- .../alert_policy_service_client.ts.baseline | 103 ++- .../src/v3/group_service_client.ts.baseline | 126 +++- .../src/v3/metric_service_client.ts.baseline | 168 ++++- ...ication_channel_service_client.ts.baseline | 202 +++++- ...vice_monitoring_service_client.ts.baseline | 202 +++++- .../uptime_check_service_client.ts.baseline | 126 +++- baselines/naming/package.json | 3 +- .../src/v1beta1/naming_client.ts.baseline | 256 +++++++- baselines/redis/package.json | 3 +- .../v1beta1/cloud_redis_client.ts.baseline | 166 ++++- baselines/routingtest/package.json | 3 +- .../src/v1/test_service_client.ts.baseline | 61 +- baselines/showcase-legacy/package.json | 3 +- .../src/v1beta1/echo_client.ts.baseline | 126 +++- baselines/showcase/package.json | 3 +- .../src/v1beta1/compliance_client.ts.baseline | 194 +++++- .../src/v1beta1/echo_client.ts.baseline | 126 +++- .../src/v1beta1/identity_client.ts.baseline | 103 ++- .../src/v1beta1/messaging_client.ts.baseline | 225 ++++++- .../sequence_service_client.ts.baseline | 61 +- .../src/v1beta1/testing_client.ts.baseline | 164 ++++- baselines/tasks/package.json | 3 +- .../src/v2/cloud_tasks_client.ts.baseline | 316 ++++++++- baselines/texttospeech/package.json | 3 +- .../src/v1/text_to_speech_client.ts.baseline | 42 +- baselines/translate/package.json | 3 +- .../translation_service_client.ts.baseline | 163 ++++- baselines/videointelligence/package.json | 3 +- ...eo_intelligence_service_client.ts.baseline | 24 +- 62 files changed, 6366 insertions(+), 359 deletions(-) diff --git a/baselines/asset/package.json b/baselines/asset/package.json index 75d34104d..8693f3b3f 100644 --- a/baselines/asset/package.json +++ b/baselines/asset/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/asset/src/v1/asset_service_client.ts.baseline b/baselines/asset/src/v1/asset_service_client.ts.baseline index bc5836f6a..86936fcc1 100644 --- a/baselines/asset/src/v1/asset_service_client.ts.baseline +++ b/baselines/asset/src/v1/asset_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class AssetServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('asset'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -450,7 +453,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.batchGetAssetsHistory(request, options, callback); + this._log.info('batchGetAssetsHistory request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryResponse, + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('batchGetAssetsHistory response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.batchGetAssetsHistory(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryResponse, + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|undefined, {}|undefined + ]) => { + this._log.info('batchGetAssetsHistory response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a feed in a parent project/folder/organization to listen to its @@ -534,7 +554,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createFeed(request, options, callback); + this._log.info('createFeed request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.ICreateFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.ICreateFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('createFeed response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets details about an asset feed. @@ -607,7 +644,24 @@ export class AssetServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getFeed(request, options, callback); + this._log.info('getFeed request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IGetFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IGetFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('getFeed response %j', response); + return [response, options, rawResponse]; + }); } /** * Lists all asset feeds in a parent project/folder/organization. @@ -679,7 +733,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listFeeds(request, options, callback); + this._log.info('listFeeds request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IListFeedsResponse, + protos.google.cloud.asset.v1.IListFeedsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('listFeeds response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.listFeeds(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IListFeedsResponse, + protos.google.cloud.asset.v1.IListFeedsRequest|undefined, {}|undefined + ]) => { + this._log.info('listFeeds response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an asset feed configuration. @@ -757,7 +828,24 @@ export class AssetServiceClient { 'feed.name': request.feed!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateFeed(request, options, callback); + this._log.info('updateFeed request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IUpdateFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IUpdateFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('updateFeed response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an asset feed. @@ -830,7 +918,24 @@ export class AssetServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteFeed(request, options, callback); + this._log.info('deleteFeed request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.asset.v1.IDeleteFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.asset.v1.IDeleteFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteFeed response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -927,7 +1032,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.exportAssets(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.asset.v1.IExportAssetsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('exportAssets response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('exportAssets request %j', request); + return this.innerApiCalls.exportAssets(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.asset.v1.IExportAssetsRequest|undefined, {}|undefined + ]) => { + this._log.info('exportAssets response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `exportAssets()`. @@ -941,6 +1063,7 @@ export class AssetServiceClient { * region_tag:cloudasset_v1_generated_AssetService_ExportAssets_async */ async checkExportAssetsProgress(name: string): Promise>{ + this._log.info('exportAssets long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.exportAssets, this._gaxModule.createDefaultBackoffSettings()); @@ -1067,6 +1190,7 @@ export class AssetServiceClient { close(): Promise { if (this.assetServiceStub && !this._terminated) { return this.assetServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/bigquery-storage/package.json b/baselines/bigquery-storage/package.json index e8002d5fc..8d5f7ccb0 100644 --- a/baselines/bigquery-storage/package.json +++ b/baselines/bigquery-storage/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline index cb1452873..740600115 100644 --- a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline +++ b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import {PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -48,6 +49,8 @@ export class BigQueryStorageClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('storage'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -443,7 +446,24 @@ export class BigQueryStorageClient { 'table_reference.dataset_id': request.tableReference!.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.createReadSession(request, options, callback); + this._log.info('createReadSession request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.storage.v1beta1.IReadSession, + protos.google.cloud.bigquery.storage.v1beta1.ICreateReadSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createReadSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createReadSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.storage.v1beta1.IReadSession, + protos.google.cloud.bigquery.storage.v1beta1.ICreateReadSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('createReadSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates additional streams for a ReadSession. This API can be used to @@ -520,7 +540,24 @@ export class BigQueryStorageClient { 'session.name': request.session!.name ?? '', }); this.initialize(); - return this.innerApiCalls.batchCreateReadSessionStreams(request, options, callback); + this._log.info('batchCreateReadSessionStreams request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsResponse, + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('batchCreateReadSessionStreams response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.batchCreateReadSessionStreams(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsResponse, + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsRequest|undefined, {}|undefined + ]) => { + this._log.info('batchCreateReadSessionStreams response %j', response); + return [response, options, rawResponse]; + }); } /** * Triggers the graceful termination of a single stream in a ReadSession. This @@ -603,7 +640,24 @@ export class BigQueryStorageClient { 'stream.name': request.stream!.name ?? '', }); this.initialize(); - return this.innerApiCalls.finalizeStream(request, options, callback); + this._log.info('finalizeStream request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.storage.v1beta1.IFinalizeStreamRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('finalizeStream response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.finalizeStream(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.storage.v1beta1.IFinalizeStreamRequest|undefined, {}|undefined + ]) => { + this._log.info('finalizeStream response %j', response); + return [response, options, rawResponse]; + }); } /** * Splits a given read stream into two Streams. These streams are referred to @@ -693,7 +747,24 @@ export class BigQueryStorageClient { 'original_stream.name': request.originalStream!.name ?? '', }); this.initialize(); - return this.innerApiCalls.splitReadStream(request, options, callback); + this._log.info('splitReadStream request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamResponse, + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('splitReadStream response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.splitReadStream(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamResponse, + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamRequest|undefined, {}|undefined + ]) => { + this._log.info('splitReadStream response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -736,6 +807,7 @@ export class BigQueryStorageClient { 'read_position.stream.name': request.readPosition!.stream!.name ?? '', }); this.initialize(); + this._log.info('readRows stream %j', options); return this.innerApiCalls.readRows(request, options); } @@ -850,6 +922,7 @@ export class BigQueryStorageClient { close(): Promise { if (this.bigQueryStorageStub && !this._terminated) { return this.bigQueryStorageStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2/package.json b/baselines/bigquery-v2/package.json index 22d6d1473..62143f9a5 100644 --- a/baselines/bigquery-v2/package.json +++ b/baselines/bigquery-v2/package.json @@ -41,7 +41,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline index fdaced291..2707ea97e 100644 --- a/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class DatasetServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -399,7 +402,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.getDataset(request, options, callback); + this._log.info('getDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IGetDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IGetDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('getDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new empty dataset. @@ -471,7 +491,24 @@ export class DatasetServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.insertDataset(request, options, callback); + this._log.info('insertDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IInsertDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IInsertDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('insertDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing dataset. The update method replaces the @@ -550,7 +587,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.patchDataset(request, options, callback); + this._log.info('patchDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('patchDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing dataset. The update method replaces the @@ -628,7 +682,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.updateDataset(request, options, callback); + this._log.info('updateDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('updateDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the dataset specified by the datasetId value. Before you can delete @@ -708,7 +779,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteDataset(request, options, callback); + this._log.info('deleteDataset request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Undeletes a dataset which is within time travel window based on datasetId. @@ -787,7 +875,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.undeleteDataset(request, options, callback); + this._log.info('undeleteDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUndeleteDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('undeleteDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.undeleteDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUndeleteDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('undeleteDataset response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -885,7 +990,26 @@ export class DatasetServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.listDatasets(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListDatasetsRequest, + protos.google.cloud.bigquery.v2.IDatasetList|null|undefined, + protos.google.cloud.bigquery.v2.IListFormatDataset>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listDatasets values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listDatasets request %j', request); + return this.innerApiCalls + .listDatasets(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IListFormatDataset[], + protos.google.cloud.bigquery.v2.IListDatasetsRequest|null, + protos.google.cloud.bigquery.v2.IDatasetList + ]) => { + this._log.info('listDatasets values %j', response); + return [response, input, output]; + }); } /** @@ -937,6 +1061,7 @@ export class DatasetServiceClient { const defaultCallSettings = this._defaults['listDatasets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDatasets stream %j', request); return this.descriptors.page.listDatasets.createStream( this.innerApiCalls.listDatasets as GaxCall, request, @@ -996,6 +1121,7 @@ export class DatasetServiceClient { const defaultCallSettings = this._defaults['listDatasets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDatasets iterate %j', request); return this.descriptors.page.listDatasets.asyncIterate( this.innerApiCalls['listDatasets'] as GaxCall, request as {}, @@ -1012,6 +1138,7 @@ export class DatasetServiceClient { close(): Promise { if (this.datasetServiceStub && !this._terminated) { return this.datasetServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline index 74d7e48c0..0aaef696a 100644 --- a/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class JobServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -412,7 +415,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.cancelJob(request, options, callback); + this._log.info('cancelJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IJobCancelResponse, + protos.google.cloud.bigquery.v2.ICancelJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('cancelJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.cancelJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IJobCancelResponse, + protos.google.cloud.bigquery.v2.ICancelJobRequest|undefined, {}|undefined + ]) => { + this._log.info('cancelJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns information about a specific job. Job information is available for @@ -498,7 +518,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.getJob(request, options, callback); + this._log.info('getJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IGetJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IGetJobRequest|undefined, {}|undefined + ]) => { + this._log.info('getJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Starts a new asynchronous job. @@ -580,7 +617,24 @@ export class JobServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.insertJob(request, options, callback); + this._log.info('insertJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IInsertJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IInsertJobRequest|undefined, {}|undefined + ]) => { + this._log.info('insertJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Requests the deletion of the metadata of a job. This call returns when the @@ -661,7 +715,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteJob(request, options, callback); + this._log.info('deleteJob request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteJobRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteJob response %j', response); + return [response, options, rawResponse]; + }); } /** * RPC to get the results of a query job. @@ -769,7 +840,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.getQueryResults(request, options, callback); + this._log.info('getQueryResults request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IGetQueryResultsResponse, + protos.google.cloud.bigquery.v2.IGetQueryResultsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getQueryResults response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getQueryResults(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IGetQueryResultsResponse, + protos.google.cloud.bigquery.v2.IGetQueryResultsRequest|undefined, {}|undefined + ]) => { + this._log.info('getQueryResults response %j', response); + return [response, options, rawResponse]; + }); } /** * Runs a BigQuery SQL query synchronously and returns query results if the @@ -842,7 +930,24 @@ export class JobServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.query(request, options, callback); + this._log.info('query request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IQueryResponse, + protos.google.cloud.bigquery.v2.IPostQueryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('query response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.query(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IQueryResponse, + protos.google.cloud.bigquery.v2.IPostQueryRequest|undefined, {}|undefined + ]) => { + this._log.info('query response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -948,7 +1053,26 @@ export class JobServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.listJobs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListJobsRequest, + protos.google.cloud.bigquery.v2.IJobList|null|undefined, + protos.google.cloud.bigquery.v2.IListFormatJob>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listJobs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listJobs request %j', request); + return this.innerApiCalls + .listJobs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IListFormatJob[], + protos.google.cloud.bigquery.v2.IListJobsRequest|null, + protos.google.cloud.bigquery.v2.IJobList + ]) => { + this._log.info('listJobs values %j', response); + return [response, input, output]; + }); } /** @@ -1005,6 +1129,7 @@ export class JobServiceClient { const defaultCallSettings = this._defaults['listJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobs stream %j', request); return this.descriptors.page.listJobs.createStream( this.innerApiCalls.listJobs as GaxCall, request, @@ -1069,6 +1194,7 @@ export class JobServiceClient { const defaultCallSettings = this._defaults['listJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobs iterate %j', request); return this.descriptors.page.listJobs.asyncIterate( this.innerApiCalls['listJobs'] as GaxCall, request as {}, @@ -1085,6 +1211,7 @@ export class JobServiceClient { close(): Promise { if (this.jobServiceStub && !this._terminated) { return this.jobServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline index bb0e63392..b3d674c68 100644 --- a/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class ModelServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -399,7 +402,24 @@ export class ModelServiceClient { 'model_id': request.modelId ?? '', }); this.initialize(); - return this.innerApiCalls.getModel(request, options, callback); + this._log.info('getModel request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IGetModelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getModel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getModel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IGetModelRequest|undefined, {}|undefined + ]) => { + this._log.info('getModel response %j', response); + return [response, options, rawResponse]; + }); } /** * Patch specific fields in the specified model. @@ -479,7 +499,24 @@ export class ModelServiceClient { 'model_id': request.modelId ?? '', }); this.initialize(); - return this.innerApiCalls.patchModel(request, options, callback); + this._log.info('patchModel request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IPatchModelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchModel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchModel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IPatchModelRequest|undefined, {}|undefined + ]) => { + this._log.info('patchModel response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the model specified by modelId from the dataset. @@ -555,7 +592,24 @@ export class ModelServiceClient { 'model_id': request.modelId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteModel(request, options, callback); + this._log.info('deleteModel request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteModelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteModel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteModel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteModelRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteModel response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -647,7 +701,26 @@ export class ModelServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.listModels(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListModelsRequest, + protos.google.cloud.bigquery.v2.IListModelsResponse|null|undefined, + protos.google.cloud.bigquery.v2.IModel>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listModels values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listModels request %j', request); + return this.innerApiCalls + .listModels(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IModel[], + protos.google.cloud.bigquery.v2.IListModelsRequest|null, + protos.google.cloud.bigquery.v2.IListModelsResponse + ]) => { + this._log.info('listModels values %j', response); + return [response, input, output]; + }); } /** @@ -692,6 +765,7 @@ export class ModelServiceClient { const defaultCallSettings = this._defaults['listModels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listModels stream %j', request); return this.descriptors.page.listModels.createStream( this.innerApiCalls.listModels as GaxCall, request, @@ -744,6 +818,7 @@ export class ModelServiceClient { const defaultCallSettings = this._defaults['listModels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listModels iterate %j', request); return this.descriptors.page.listModels.asyncIterate( this.innerApiCalls['listModels'] as GaxCall, request as {}, @@ -760,6 +835,7 @@ export class ModelServiceClient { close(): Promise { if (this.modelServiceStub && !this._terminated) { return this.modelServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline index 848fabb96..b15332784 100644 --- a/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class ProjectServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -385,7 +388,24 @@ export class ProjectServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.getServiceAccount(request, options, callback); + this._log.info('getServiceAccount request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IGetServiceAccountResponse, + protos.google.cloud.bigquery.v2.IGetServiceAccountRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getServiceAccount response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getServiceAccount(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IGetServiceAccountResponse, + protos.google.cloud.bigquery.v2.IGetServiceAccountRequest|undefined, {}|undefined + ]) => { + this._log.info('getServiceAccount response %j', response); + return [response, options, rawResponse]; + }); } @@ -398,6 +418,7 @@ export class ProjectServiceClient { close(): Promise { if (this.projectServiceStub && !this._terminated) { return this.projectServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline index f742aecbb..53b936616 100644 --- a/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class RoutineServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -399,7 +402,24 @@ export class RoutineServiceClient { 'routine_id': request.routineId ?? '', }); this.initialize(); - return this.innerApiCalls.getRoutine(request, options, callback); + this._log.info('getRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IGetRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IGetRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('getRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new routine in the dataset. @@ -474,7 +494,24 @@ export class RoutineServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.insertRoutine(request, options, callback); + this._log.info('insertRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IInsertRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IInsertRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('insertRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing routine. The update method replaces the @@ -553,7 +590,24 @@ export class RoutineServiceClient { 'routine_id': request.routineId ?? '', }); this.initialize(); - return this.innerApiCalls.updateRoutine(request, options, callback); + this._log.info('updateRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IUpdateRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IUpdateRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('updateRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Patches information in an existing routine. The patch method does a partial @@ -630,7 +684,24 @@ export class RoutineServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.patchRoutine(request, options, callback); + this._log.info('patchRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IPatchRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IPatchRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('patchRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the routine specified by routineId from the dataset. @@ -706,7 +777,24 @@ export class RoutineServiceClient { 'routine_id': request.routineId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteRoutine(request, options, callback); + this._log.info('deleteRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -801,7 +889,26 @@ export class RoutineServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.listRoutines(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListRoutinesRequest, + protos.google.cloud.bigquery.v2.IListRoutinesResponse|null|undefined, + protos.google.cloud.bigquery.v2.IRoutine>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRoutines values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRoutines request %j', request); + return this.innerApiCalls + .listRoutines(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IRoutine[], + protos.google.cloud.bigquery.v2.IListRoutinesRequest|null, + protos.google.cloud.bigquery.v2.IListRoutinesResponse + ]) => { + this._log.info('listRoutines values %j', response); + return [response, input, output]; + }); } /** @@ -850,6 +957,7 @@ export class RoutineServiceClient { const defaultCallSettings = this._defaults['listRoutines']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRoutines stream %j', request); return this.descriptors.page.listRoutines.createStream( this.innerApiCalls.listRoutines as GaxCall, request, @@ -906,6 +1014,7 @@ export class RoutineServiceClient { const defaultCallSettings = this._defaults['listRoutines']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRoutines iterate %j', request); return this.descriptors.page.listRoutines.asyncIterate( this.innerApiCalls['listRoutines'] as GaxCall, request as {}, @@ -922,6 +1031,7 @@ export class RoutineServiceClient { close(): Promise { if (this.routineServiceStub && !this._terminated) { return this.routineServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline index 5932a72d5..ee0dc3cf9 100644 --- a/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class RowAccessPolicyServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -408,7 +411,26 @@ export class RowAccessPolicyServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.listRowAccessPolicies(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesRequest, + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesResponse|null|undefined, + protos.google.cloud.bigquery.v2.IRowAccessPolicy>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRowAccessPolicies values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRowAccessPolicies request %j', request); + return this.innerApiCalls + .listRowAccessPolicies(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IRowAccessPolicy[], + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesRequest|null, + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesResponse + ]) => { + this._log.info('listRowAccessPolicies values %j', response); + return [response, input, output]; + }); } /** @@ -456,6 +478,7 @@ export class RowAccessPolicyServiceClient { const defaultCallSettings = this._defaults['listRowAccessPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRowAccessPolicies stream %j', request); return this.descriptors.page.listRowAccessPolicies.createStream( this.innerApiCalls.listRowAccessPolicies as GaxCall, request, @@ -511,6 +534,7 @@ export class RowAccessPolicyServiceClient { const defaultCallSettings = this._defaults['listRowAccessPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRowAccessPolicies iterate %j', request); return this.descriptors.page.listRowAccessPolicies.asyncIterate( this.innerApiCalls['listRowAccessPolicies'] as GaxCall, request as {}, @@ -527,6 +551,7 @@ export class RowAccessPolicyServiceClient { close(): Promise { if (this.rowAccessPolicyServiceStub && !this._terminated) { return this.rowAccessPolicyServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline index 8f422c4fe..f18e48b8b 100644 --- a/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class TableServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -412,7 +415,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.getTable(request, options, callback); + this._log.info('getTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IGetTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IGetTableRequest|undefined, {}|undefined + ]) => { + this._log.info('getTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new, empty table in the dataset. @@ -487,7 +507,24 @@ export class TableServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.insertTable(request, options, callback); + this._log.info('insertTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IInsertTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IInsertTableRequest|undefined, {}|undefined + ]) => { + this._log.info('insertTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing table. The update method replaces the @@ -570,7 +607,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.patchTable(request, options, callback); + this._log.info('patchTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, {}|undefined + ]) => { + this._log.info('patchTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing table. The update method replaces the @@ -652,7 +706,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.updateTable(request, options, callback); + this._log.info('updateTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, {}|undefined + ]) => { + this._log.info('updateTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the table specified by tableId from the dataset. @@ -729,7 +800,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTable(request, options, callback); + this._log.info('deleteTable request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteTableRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTable response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -820,7 +908,26 @@ export class TableServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.listTables(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListTablesRequest, + protos.google.cloud.bigquery.v2.ITableList|null|undefined, + protos.google.cloud.bigquery.v2.IListFormatTable>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTables values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTables request %j', request); + return this.innerApiCalls + .listTables(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IListFormatTable[], + protos.google.cloud.bigquery.v2.IListTablesRequest|null, + protos.google.cloud.bigquery.v2.ITableList + ]) => { + this._log.info('listTables values %j', response); + return [response, input, output]; + }); } /** @@ -865,6 +972,7 @@ export class TableServiceClient { const defaultCallSettings = this._defaults['listTables']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTables stream %j', request); return this.descriptors.page.listTables.createStream( this.innerApiCalls.listTables as GaxCall, request, @@ -917,6 +1025,7 @@ export class TableServiceClient { const defaultCallSettings = this._defaults['listTables']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTables iterate %j', request); return this.descriptors.page.listTables.asyncIterate( this.innerApiCalls['listTables'] as GaxCall, request as {}, @@ -933,6 +1042,7 @@ export class TableServiceClient { close(): Promise { if (this.tableServiceStub && !this._terminated) { return this.tableServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/compute/package.json b/baselines/compute/package.json index 0c56e04f9..f6f5e5ca6 100644 --- a/baselines/compute/package.json +++ b/baselines/compute/package.json @@ -36,7 +36,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/compute/src/v1/addresses_client.ts.baseline b/baselines/compute/src/v1/addresses_client.ts.baseline index 1dbff6714..a9802ec8e 100644 --- a/baselines/compute/src/v1/addresses_client.ts.baseline +++ b/baselines/compute/src/v1/addresses_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, LROperation, Pag import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class AddressesClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('compute'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -414,14 +417,25 @@ export class AddressesClient { 'address': request.address ?? '', }); this.initialize(); - return this.innerApiCalls.delete(request, options, callback) - .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + this._log.info('delete request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { + this._log.info('delete response %j', response); + callback(error, response, nextRequest, rawResponse); + } + : undefined; + return this.innerApiCalls.delete(request, options, wrappedCallback) + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { + this._log.info('delete response %j', response); + return [ + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; - }); + }); } /** * Creates an address resource in the specified project by using the data included in the request. @@ -507,14 +521,25 @@ export class AddressesClient { 'region': request.region ?? '', }); this.initialize(); - return this.innerApiCalls.insert(request, options, callback) - .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + this._log.info('insert request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { + this._log.info('insert response %j', response); + callback(error, response, nextRequest, rawResponse); + } + : undefined; + return this.innerApiCalls.insert(request, options, wrappedCallback) + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { + this._log.info('insert response %j', response); + return [ + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; - }); + }); } @@ -574,6 +599,7 @@ export class AddressesClient { const defaultCallSettings = this._defaults['aggregatedList']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('aggregatedList iterate %j', request); return this.descriptors.page.aggregatedList.asyncIterate( this.innerApiCalls['aggregatedList'] as GaxCall, request as {}, @@ -674,7 +700,26 @@ export class AddressesClient { 'region': request.region ?? '', }); this.initialize(); - return this.innerApiCalls.list(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.compute.v1.IListAddressesRequest, + protos.google.cloud.compute.v1.IAddressList|null|undefined, + protos.google.cloud.compute.v1.IAddress>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('list values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('list request %j', request); + return this.innerApiCalls + .list(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.compute.v1.IAddress[], + protos.google.cloud.compute.v1.IListAddressesRequest|null, + protos.google.cloud.compute.v1.IAddressList + ]) => { + this._log.info('list values %j', response); + return [response, input, output]; + }); } /** @@ -731,6 +776,7 @@ export class AddressesClient { const defaultCallSettings = this._defaults['list']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('list stream %j', request); return this.descriptors.page.list.createStream( this.innerApiCalls.list as GaxCall, request, @@ -795,6 +841,7 @@ export class AddressesClient { const defaultCallSettings = this._defaults['list']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('list iterate %j', request); return this.descriptors.page.list.asyncIterate( this.innerApiCalls['list'] as GaxCall, request as {}, @@ -811,6 +858,7 @@ export class AddressesClient { close(): Promise { if (this.addressesStub && !this._terminated) { return this.addressesStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/compute/src/v1/region_operations_client.ts.baseline b/baselines/compute/src/v1/region_operations_client.ts.baseline index db3d4e1f1..34fe29c5b 100644 --- a/baselines/compute/src/v1/region_operations_client.ts.baseline +++ b/baselines/compute/src/v1/region_operations_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class RegionOperationsClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('compute'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -390,7 +393,24 @@ export class RegionOperationsClient { 'operation': request.operation ?? '', }); this.initialize(); - return this.innerApiCalls.get(request, options, callback); + this._log.info('get request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IGetRegionOperationRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('get response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.get(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IGetRegionOperationRequest|undefined, {}|undefined + ]) => { + this._log.info('get response %j', response); + return [response, options, rawResponse]; + }); } /** * Waits for the specified Operation resource to return as `DONE` or for the request to approach the 2 minute deadline, and retrieves the specified Operation resource. This method differs from the `GET` method in that it waits for no more than the default deadline (2 minutes) and then returns the current state of the operation, which might be `DONE` or still in progress. @@ -470,7 +490,24 @@ export class RegionOperationsClient { 'operation': request.operation ?? '', }); this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + this._log.info('wait request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IWaitRegionOperationRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IWaitRegionOperationRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } @@ -483,6 +520,7 @@ export class RegionOperationsClient { close(): Promise { if (this.regionOperationsStub && !this._terminated) { return this.regionOperationsStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/deprecatedtest/package.json b/baselines/deprecatedtest/package.json index 703565c25..7f122f640 100644 --- a/baselines/deprecatedtest/package.json +++ b/baselines/deprecatedtest/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline b/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline index bc1cf0c86..b927347c3 100644 --- a/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline +++ b/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -48,6 +49,8 @@ export class DeprecatedServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('deprecatedtest'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -378,7 +381,24 @@ export class DeprecatedServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.fastFibonacci(request, options, callback); + this._log.info('fastFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('fastFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('fastFibonacci response %j', response); + return [response, options, rawResponse]; + }); } /** * Calculates Fibonacci on the provided value, slowly. @@ -445,7 +465,24 @@ export class DeprecatedServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); this.warn('DEP$DeprecatedService-$SlowFibonacci','SlowFibonacci is deprecated and may be removed in a future version.', 'DeprecationWarning'); - return this.innerApiCalls.slowFibonacci(request, options, callback); + this._log.info('slowFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('slowFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('slowFibonacci response %j', response); + return [response, options, rawResponse]; + }); } @@ -458,6 +495,7 @@ export class DeprecatedServiceClient { close(): Promise { if (this.deprecatedServiceStub && !this._terminated) { return this.deprecatedServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test/package.json b/baselines/disable-packing-test/package.json index 07895c925..56ed5fae5 100644 --- a/baselines/disable-packing-test/package.json +++ b/baselines/disable-packing-test/package.json @@ -40,7 +40,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline index a24f914a1..72f4e830f 100644 --- a/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -48,6 +49,8 @@ export class ComplianceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -428,7 +431,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBody(request, options, callback); + this._log.info('repeatDataBody request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBody response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBody response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -508,7 +528,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyInfo(request, options, callback); + this._log.info('repeatDataBodyInfo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyInfo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyInfo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -587,7 +624,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataQuery(request, options, callback); + this._log.info('repeatDataQuery request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataQuery response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataQuery response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -676,7 +730,24 @@ export class ComplianceClient { 'info.f_kingdom': request.info!.fKingdom ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataSimplePath(request, options, callback); + this._log.info('repeatDataSimplePath request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataSimplePath response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataSimplePath response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a path resource. @@ -761,7 +832,24 @@ export class ComplianceClient { 'info.f_bool': request.info!.fBool ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathResource(request, options, callback); + this._log.info('repeatDataPathResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathResource response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a trailing resource. @@ -845,7 +933,24 @@ export class ComplianceClient { 'info.f_child.f_string': request.info!.fChild!.fString ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathTrailingResource(request, options, callback); + this._log.info('repeatDataPathTrailingResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PUT method. @@ -923,7 +1028,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPut(request, options, callback); + this._log.info('repeatDataBodyPut request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPut response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPut response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PATCH method. @@ -1001,7 +1123,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPatch(request, options, callback); + this._log.info('repeatDataBodyPatch request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPatch response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPatch response %j', response); + return [response, options, rawResponse]; + }); } /** * This method requests an enum value from the server. Depending on the contents of EnumRequest, the enum value returned will be a known enum declared in the @@ -1071,7 +1210,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.getEnum(request, options, callback); + this._log.info('getEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|undefined, {}|undefined + ]) => { + this._log.info('getEnum response %j', response); + return [response, options, rawResponse]; + }); } /** * This method is used to verify that clients can round-trip enum values, which is particularly important for unknown enum values over REST. VerifyEnum() @@ -1143,7 +1299,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.verifyEnum(request, options, callback); + this._log.info('verifyEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|undefined, {}|undefined + ]) => { + this._log.info('verifyEnum response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -1529,6 +1702,7 @@ export class ComplianceClient { close(): Promise { if (this.complianceStub && !this._terminated) { return this.complianceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline index f689a04ae..5e9ecd943 100644 --- a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -52,6 +53,8 @@ export class EchoClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -566,7 +569,24 @@ export class EchoClient { routingParameter ); this.initialize(); - return this.innerApiCalls.echo(request, options, callback); + this._log.info('echo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + ]) => { + this._log.info('echo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method returns error details in a repeated "google.protobuf.Any" @@ -640,7 +660,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.echoErrorDetails(request, options, callback); + this._log.info('echoErrorDetails request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echoErrorDetails response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + ]) => { + this._log.info('echoErrorDetails response %j', response); + return [response, options, rawResponse]; + }); } /** * This is similar to the PagedExpand except that it uses @@ -713,7 +750,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpandLegacy(request, options, callback); + this._log.info('pagedExpandLegacy request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pagedExpandLegacy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + ]) => { + this._log.info('pagedExpandLegacy response %j', response); + return [response, options, rawResponse]; + }); } /** * This method will block (wait) for the requested amount of time @@ -785,7 +839,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.block(request, options, callback); + this._log.info('block request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('block response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.block(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + ]) => { + this._log.info('block response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -818,6 +889,7 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); + this._log.info('expand stream %j', options); return this.innerApiCalls.expand(request, options); } @@ -864,6 +936,7 @@ export class EchoClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('collect stream %j', options); return this.innerApiCalls.collect(null, options, callback); } @@ -887,6 +960,7 @@ export class EchoClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('chat stream %j', options); return this.innerApiCalls.chat(null, options); } @@ -963,7 +1037,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('wait request %j', request); + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `wait()`. @@ -977,6 +1068,7 @@ export class EchoClient { * region_tag:localhost_v1beta1_generated_Echo_Wait_async */ async checkWaitProgress(name: string): Promise>{ + this._log.info('wait long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.wait, this._gaxModule.createDefaultBackoffSettings()); @@ -1055,7 +1147,26 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpand(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IPagedExpandRequest, + protos.google.showcase.v1beta1.IPagedExpandResponse|null|undefined, + protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('pagedExpand values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('pagedExpand request %j', request); + return this.innerApiCalls + .pagedExpand(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IEchoResponse[], + protos.google.showcase.v1beta1.IPagedExpandRequest|null, + protos.google.showcase.v1beta1.IPagedExpandResponse + ]) => { + this._log.info('pagedExpand values %j', response); + return [response, input, output]; + }); } /** @@ -1090,6 +1201,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand stream %j', request); return this.descriptors.page.pagedExpand.createStream( this.innerApiCalls.pagedExpand as GaxCall, request, @@ -1132,6 +1244,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand iterate %j', request); return this.descriptors.page.pagedExpand.asyncIterate( this.innerApiCalls['pagedExpand'] as GaxCall, request as {}, @@ -1521,6 +1634,7 @@ export class EchoClient { close(): Promise { if (this.echoStub && !this._terminated) { return this.echoStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline index 6b29f4242..e510f06b7 100644 --- a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class IdentityClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -421,7 +424,24 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createUser(request, options, callback); + this._log.info('createUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('createUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the User with the given uri. @@ -491,7 +511,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getUser(request, options, callback); + this._log.info('getUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|undefined, {}|undefined + ]) => { + this._log.info('getUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a user. @@ -564,7 +601,24 @@ export class IdentityClient { 'user.name': request.user!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateUser(request, options, callback); + this._log.info('updateUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('updateUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a user, their profile, and all of their authored messages. @@ -634,7 +688,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteUser(request, options, callback); + this._log.info('deleteUser request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteUser response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -710,7 +781,26 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listUsers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListUsersRequest, + protos.google.showcase.v1beta1.IListUsersResponse|null|undefined, + protos.google.showcase.v1beta1.IUser>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUsers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUsers request %j', request); + return this.innerApiCalls + .listUsers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IUser[], + protos.google.showcase.v1beta1.IListUsersRequest|null, + protos.google.showcase.v1beta1.IListUsersResponse + ]) => { + this._log.info('listUsers values %j', response); + return [response, input, output]; + }); } /** @@ -746,6 +836,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers stream %j', request); return this.descriptors.page.listUsers.createStream( this.innerApiCalls.listUsers as GaxCall, request, @@ -789,6 +880,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers iterate %j', request); return this.descriptors.page.listUsers.asyncIterate( this.innerApiCalls['listUsers'] as GaxCall, request as {}, @@ -1178,6 +1270,7 @@ export class IdentityClient { close(): Promise { if (this.identityStub && !this._terminated) { return this.identityStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline index fa6e74736..f2e317238 100644 --- a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class MessagingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -469,7 +472,24 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createRoom(request, options, callback); + this._log.info('createRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('createRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Room with the given resource name. @@ -539,7 +559,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getRoom(request, options, callback); + this._log.info('getRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('getRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a room. @@ -612,7 +649,24 @@ export class MessagingClient { 'room.name': request.room!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateRoom(request, options, callback); + this._log.info('updateRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('updateRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a room and all of its blurbs. @@ -682,7 +736,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteRoom(request, options, callback); + this._log.info('deleteRoom request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a blurb. If the parent is a room, the blurb is understood to be a @@ -757,7 +828,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createBlurb(request, options, callback); + this._log.info('createBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('createBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Blurb with the given resource name. @@ -827,7 +915,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getBlurb(request, options, callback); + this._log.info('getBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('getBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a blurb. @@ -900,7 +1005,24 @@ export class MessagingClient { 'blurb.name': request.blurb!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateBlurb(request, options, callback); + this._log.info('updateBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('updateBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a blurb. @@ -970,7 +1092,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteBlurb(request, options, callback); + this._log.info('deleteBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1006,6 +1145,7 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); + this._log.info('streamBlurbs stream %j', options); return this.innerApiCalls.streamBlurbs(request, options); } @@ -1051,6 +1191,7 @@ export class MessagingClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('sendBlurbs stream %j', options); return this.innerApiCalls.sendBlurbs(null, options, callback); } @@ -1075,6 +1216,7 @@ export class MessagingClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('connect stream %j', options); return this.innerApiCalls.connect(null, options); } @@ -1163,7 +1305,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.searchBlurbs(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('searchBlurbs response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('searchBlurbs request %j', request); + return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ]) => { + this._log.info('searchBlurbs response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `searchBlurbs()`. @@ -1177,6 +1336,7 @@ export class MessagingClient { * region_tag:localhost_v1beta1_generated_Messaging_SearchBlurbs_async */ async checkSearchBlurbsProgress(name: string): Promise>{ + this._log.info('searchBlurbs long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.searchBlurbs, this._gaxModule.createDefaultBackoffSettings()); @@ -1255,7 +1415,26 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listRooms(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListRoomsRequest, + protos.google.showcase.v1beta1.IListRoomsResponse|null|undefined, + protos.google.showcase.v1beta1.IRoom>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRooms values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRooms request %j', request); + return this.innerApiCalls + .listRooms(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IRoom[], + protos.google.showcase.v1beta1.IListRoomsRequest|null, + protos.google.showcase.v1beta1.IListRoomsResponse + ]) => { + this._log.info('listRooms values %j', response); + return [response, input, output]; + }); } /** @@ -1291,6 +1470,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms stream %j', request); return this.descriptors.page.listRooms.createStream( this.innerApiCalls.listRooms as GaxCall, request, @@ -1334,6 +1514,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms iterate %j', request); return this.descriptors.page.listRooms.asyncIterate( this.innerApiCalls['listRooms'] as GaxCall, request as {}, @@ -1422,7 +1603,26 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listBlurbs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListBlurbsRequest, + protos.google.showcase.v1beta1.IListBlurbsResponse|null|undefined, + protos.google.showcase.v1beta1.IBlurb>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listBlurbs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listBlurbs request %j', request); + return this.innerApiCalls + .listBlurbs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IBlurb[], + protos.google.showcase.v1beta1.IListBlurbsRequest|null, + protos.google.showcase.v1beta1.IListBlurbsResponse + ]) => { + this._log.info('listBlurbs values %j', response); + return [response, input, output]; + }); } /** @@ -1466,6 +1666,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs stream %j', request); return this.descriptors.page.listBlurbs.createStream( this.innerApiCalls.listBlurbs as GaxCall, request, @@ -1517,6 +1718,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs iterate %j', request); return this.descriptors.page.listBlurbs.asyncIterate( this.innerApiCalls['listBlurbs'] as GaxCall, request as {}, @@ -1906,6 +2108,7 @@ export class MessagingClient { close(): Promise { if (this.messagingStub && !this._terminated) { return this.messagingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline index 4145ee30a..4b816b050 100644 --- a/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -45,6 +46,8 @@ export class SequenceServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -410,7 +413,24 @@ export class SequenceServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSequence(request, options, callback); + this._log.info('createSequence request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('createSequence response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves a sequence. @@ -479,7 +499,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSequenceReport(request, options, callback); + this._log.info('getSequenceReport request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSequenceReport response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, {}|undefined + ]) => { + this._log.info('getSequenceReport response %j', response); + return [response, options, rawResponse]; + }); } /** * Attempts a sequence. @@ -548,7 +585,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.attemptSequence(request, options, callback); + this._log.info('attemptSequence request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('attemptSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('attemptSequence response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -934,6 +988,7 @@ export class SequenceServiceClient { close(): Promise { if (this.sequenceServiceStub && !this._terminated) { return this.sequenceServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline index 060f48a43..9d263c8da 100644 --- a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -47,6 +48,8 @@ export class TestingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -426,7 +429,24 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSession(request, options, callback); + this._log.info('createSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('createSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a testing session. @@ -496,7 +516,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSession(request, options, callback); + this._log.info('getSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('getSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Delete a test session. @@ -566,7 +603,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteSession(request, options, callback); + this._log.info('deleteSession request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Report on the status of a session. @@ -638,7 +692,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.reportSession(request, options, callback); + this._log.info('reportSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('reportSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.reportSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('reportSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Explicitly decline to implement a test. @@ -713,7 +784,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTest(request, options, callback); + this._log.info('deleteTest request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTest response %j', response); + return [response, options, rawResponse]; + }); } /** * Register a response to a test. @@ -790,7 +878,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.verifyTest(request, options, callback); + this._log.info('verifyTest request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, {}|undefined + ]) => { + this._log.info('verifyTest response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -863,7 +968,26 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listSessions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListSessionsRequest, + protos.google.showcase.v1beta1.IListSessionsResponse|null|undefined, + protos.google.showcase.v1beta1.ISession>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSessions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listSessions request %j', request); + return this.innerApiCalls + .listSessions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ISession[], + protos.google.showcase.v1beta1.IListSessionsRequest|null, + protos.google.showcase.v1beta1.IListSessionsResponse + ]) => { + this._log.info('listSessions values %j', response); + return [response, input, output]; + }); } /** @@ -896,6 +1020,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions stream %j', request); return this.descriptors.page.listSessions.createStream( this.innerApiCalls.listSessions as GaxCall, request, @@ -936,6 +1061,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions iterate %j', request); return this.descriptors.page.listSessions.asyncIterate( this.innerApiCalls['listSessions'] as GaxCall, request as {}, @@ -1019,7 +1145,26 @@ export class TestingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listTests(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListTestsRequest, + protos.google.showcase.v1beta1.IListTestsResponse|null|undefined, + protos.google.showcase.v1beta1.ITest>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTests values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTests request %j', request); + return this.innerApiCalls + .listTests(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ITest[], + protos.google.showcase.v1beta1.IListTestsRequest|null, + protos.google.showcase.v1beta1.IListTestsResponse + ]) => { + this._log.info('listTests values %j', response); + return [response, input, output]; + }); } /** @@ -1059,6 +1204,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests stream %j', request); return this.descriptors.page.listTests.createStream( this.innerApiCalls.listTests as GaxCall, request, @@ -1106,6 +1252,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests iterate %j', request); return this.descriptors.page.listTests.asyncIterate( this.innerApiCalls['listTests'] as GaxCall, request as {}, @@ -1495,6 +1642,7 @@ export class TestingClient { close(): Promise { if (this.testingStub && !this._terminated) { return this.testingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/dlp/package.json b/baselines/dlp/package.json index d1334f501..11054747d 100644 --- a/baselines/dlp/package.json +++ b/baselines/dlp/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/dlp/src/v2/dlp_service_client.ts.baseline b/baselines/dlp/src/v2/dlp_service_client.ts.baseline index 126583841..b8916a0c4 100644 --- a/baselines/dlp/src/v2/dlp_service_client.ts.baseline +++ b/baselines/dlp/src/v2/dlp_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -54,6 +55,8 @@ export class DlpServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('dlp'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -464,7 +467,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.inspectContent(request, options, callback); + this._log.info('inspectContent request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectContentResponse, + protos.google.privacy.dlp.v2.IInspectContentRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('inspectContent response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.inspectContent(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectContentResponse, + protos.google.privacy.dlp.v2.IInspectContentRequest|undefined, {}|undefined + ]) => { + this._log.info('inspectContent response %j', response); + return [response, options, rawResponse]; + }); } /** * Redacts potentially sensitive info from an image. @@ -554,7 +574,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.redactImage(request, options, callback); + this._log.info('redactImage request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IRedactImageResponse, + protos.google.privacy.dlp.v2.IRedactImageRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('redactImage response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.redactImage(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IRedactImageResponse, + protos.google.privacy.dlp.v2.IRedactImageRequest|undefined, {}|undefined + ]) => { + this._log.info('redactImage response %j', response); + return [response, options, rawResponse]; + }); } /** * De-identifies potentially sensitive info from a ContentItem. @@ -657,7 +694,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.deidentifyContent(request, options, callback); + this._log.info('deidentifyContent request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyContentResponse, + protos.google.privacy.dlp.v2.IDeidentifyContentRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deidentifyContent response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deidentifyContent(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyContentResponse, + protos.google.privacy.dlp.v2.IDeidentifyContentRequest|undefined, {}|undefined + ]) => { + this._log.info('deidentifyContent response %j', response); + return [response, options, rawResponse]; + }); } /** * Re-identifies content that has been de-identified. @@ -762,7 +816,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.reidentifyContent(request, options, callback); + this._log.info('reidentifyContent request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IReidentifyContentResponse, + protos.google.privacy.dlp.v2.IReidentifyContentRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('reidentifyContent response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.reidentifyContent(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IReidentifyContentResponse, + protos.google.privacy.dlp.v2.IReidentifyContentRequest|undefined, {}|undefined + ]) => { + this._log.info('reidentifyContent response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns a list of the sensitive information types that the DLP API @@ -842,7 +913,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listInfoTypes(request, options, callback); + this._log.info('listInfoTypes request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IListInfoTypesResponse, + protos.google.privacy.dlp.v2.IListInfoTypesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('listInfoTypes response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.listInfoTypes(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IListInfoTypesResponse, + protos.google.privacy.dlp.v2.IListInfoTypesRequest|undefined, {}|undefined + ]) => { + this._log.info('listInfoTypes response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates an InspectTemplate for re-using frequently used configuration @@ -926,7 +1014,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createInspectTemplate(request, options, callback); + this._log.info('createInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.ICreateInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.ICreateInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('createInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the InspectTemplate. @@ -1003,7 +1108,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateInspectTemplate(request, options, callback); + this._log.info('updateInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IUpdateInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IUpdateInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('updateInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets an InspectTemplate. @@ -1076,7 +1198,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getInspectTemplate(request, options, callback); + this._log.info('getInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IGetInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IGetInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('getInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an InspectTemplate. @@ -1149,7 +1288,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteInspectTemplate(request, options, callback); + this._log.info('deleteInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a DeidentifyTemplate for re-using frequently used configuration @@ -1234,7 +1390,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createDeidentifyTemplate(request, options, callback); + this._log.info('createDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.ICreateDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.ICreateDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('createDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the DeidentifyTemplate. @@ -1312,7 +1485,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateDeidentifyTemplate(request, options, callback); + this._log.info('updateDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IUpdateDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IUpdateDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('updateDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a DeidentifyTemplate. @@ -1386,7 +1576,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getDeidentifyTemplate(request, options, callback); + this._log.info('getDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IGetDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IGetDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('getDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a DeidentifyTemplate. @@ -1460,7 +1667,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteDeidentifyTemplate(request, options, callback); + this._log.info('deleteDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a job trigger to run DLP actions such as scanning storage for @@ -1543,7 +1767,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createJobTrigger(request, options, callback); + this._log.info('createJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.ICreateJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.ICreateJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('createJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a job trigger. @@ -1619,7 +1860,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateJobTrigger(request, options, callback); + this._log.info('updateJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IUpdateJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IUpdateJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('updateJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a job trigger. @@ -1691,7 +1949,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getJobTrigger(request, options, callback); + this._log.info('getJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IGetJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IGetJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('getJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a job trigger. @@ -1763,7 +2038,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteJobTrigger(request, options, callback); + this._log.info('deleteJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Activate a job trigger. Causes the immediate execute of a trigger @@ -1835,7 +2127,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.activateJobTrigger(request, options, callback); + this._log.info('activateJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IActivateJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('activateJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.activateJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IActivateJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('activateJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new job to inspect storage or calculate risk metrics. @@ -1924,7 +2233,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createDlpJob(request, options, callback); + this._log.info('createDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.ICreateDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.ICreateDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('createDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the latest state of a long-running DlpJob. @@ -1996,7 +2322,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getDlpJob(request, options, callback); + this._log.info('getDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IGetDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IGetDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('getDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a long-running DlpJob. This method indicates that the client is @@ -2070,7 +2413,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteDlpJob(request, options, callback); + this._log.info('deleteDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Starts asynchronous cancellation on a long-running DlpJob. The server @@ -2144,7 +2504,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.cancelDlpJob(request, options, callback); + this._log.info('cancelDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.ICancelDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('cancelDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.cancelDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.ICancelDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('cancelDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a pre-built stored infoType to be used for inspection. @@ -2228,7 +2605,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createStoredInfoType(request, options, callback); + this._log.info('createStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.ICreateStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.ICreateStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('createStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the stored infoType by creating a new version. The existing version @@ -2309,7 +2703,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateStoredInfoType(request, options, callback); + this._log.info('updateStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IUpdateStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IUpdateStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('updateStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a stored infoType. @@ -2383,7 +2794,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getStoredInfoType(request, options, callback); + this._log.info('getStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IGetStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IGetStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('getStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a stored infoType. @@ -2457,7 +2885,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteStoredInfoType(request, options, callback); + this._log.info('deleteStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -2559,7 +3004,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listInspectTemplates(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListInspectTemplatesRequest, + protos.google.privacy.dlp.v2.IListInspectTemplatesResponse|null|undefined, + protos.google.privacy.dlp.v2.IInspectTemplate>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listInspectTemplates values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listInspectTemplates request %j', request); + return this.innerApiCalls + .listInspectTemplates(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IInspectTemplate[], + protos.google.privacy.dlp.v2.IListInspectTemplatesRequest|null, + protos.google.privacy.dlp.v2.IListInspectTemplatesResponse + ]) => { + this._log.info('listInspectTemplates values %j', response); + return [response, input, output]; + }); } /** @@ -2620,6 +3084,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listInspectTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInspectTemplates stream %j', request); return this.descriptors.page.listInspectTemplates.createStream( this.innerApiCalls.listInspectTemplates as GaxCall, request, @@ -2688,6 +3153,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listInspectTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInspectTemplates iterate %j', request); return this.descriptors.page.listInspectTemplates.asyncIterate( this.innerApiCalls['listInspectTemplates'] as GaxCall, request as {}, @@ -2794,7 +3260,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listDeidentifyTemplates(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesRequest, + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesResponse|null|undefined, + protos.google.privacy.dlp.v2.IDeidentifyTemplate>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listDeidentifyTemplates values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listDeidentifyTemplates request %j', request); + return this.innerApiCalls + .listDeidentifyTemplates(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate[], + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesRequest|null, + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesResponse + ]) => { + this._log.info('listDeidentifyTemplates values %j', response); + return [response, input, output]; + }); } /** @@ -2855,6 +3340,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDeidentifyTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDeidentifyTemplates stream %j', request); return this.descriptors.page.listDeidentifyTemplates.createStream( this.innerApiCalls.listDeidentifyTemplates as GaxCall, request, @@ -2923,6 +3409,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDeidentifyTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDeidentifyTemplates iterate %j', request); return this.descriptors.page.listDeidentifyTemplates.asyncIterate( this.innerApiCalls['listDeidentifyTemplates'] as GaxCall, request as {}, @@ -3054,7 +3541,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listJobTriggers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListJobTriggersRequest, + protos.google.privacy.dlp.v2.IListJobTriggersResponse|null|undefined, + protos.google.privacy.dlp.v2.IJobTrigger>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listJobTriggers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listJobTriggers request %j', request); + return this.innerApiCalls + .listJobTriggers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IJobTrigger[], + protos.google.privacy.dlp.v2.IListJobTriggersRequest|null, + protos.google.privacy.dlp.v2.IListJobTriggersResponse + ]) => { + this._log.info('listJobTriggers values %j', response); + return [response, input, output]; + }); } /** @@ -3141,6 +3647,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listJobTriggers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobTriggers stream %j', request); return this.descriptors.page.listJobTriggers.createStream( this.innerApiCalls.listJobTriggers as GaxCall, request, @@ -3235,6 +3742,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listJobTriggers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobTriggers iterate %j', request); return this.descriptors.page.listJobTriggers.asyncIterate( this.innerApiCalls['listJobTriggers'] as GaxCall, request as {}, @@ -3369,7 +3877,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listDlpJobs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListDlpJobsRequest, + protos.google.privacy.dlp.v2.IListDlpJobsResponse|null|undefined, + protos.google.privacy.dlp.v2.IDlpJob>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listDlpJobs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listDlpJobs request %j', request); + return this.innerApiCalls + .listDlpJobs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IDlpJob[], + protos.google.privacy.dlp.v2.IListDlpJobsRequest|null, + protos.google.privacy.dlp.v2.IListDlpJobsResponse + ]) => { + this._log.info('listDlpJobs values %j', response); + return [response, input, output]; + }); } /** @@ -3458,6 +3985,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDlpJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDlpJobs stream %j', request); return this.descriptors.page.listDlpJobs.createStream( this.innerApiCalls.listDlpJobs as GaxCall, request, @@ -3554,6 +4082,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDlpJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDlpJobs iterate %j', request); return this.descriptors.page.listDlpJobs.asyncIterate( this.innerApiCalls['listDlpJobs'] as GaxCall, request as {}, @@ -3661,7 +4190,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listStoredInfoTypes(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListStoredInfoTypesRequest, + protos.google.privacy.dlp.v2.IListStoredInfoTypesResponse|null|undefined, + protos.google.privacy.dlp.v2.IStoredInfoType>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listStoredInfoTypes values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listStoredInfoTypes request %j', request); + return this.innerApiCalls + .listStoredInfoTypes(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IStoredInfoType[], + protos.google.privacy.dlp.v2.IListStoredInfoTypesRequest|null, + protos.google.privacy.dlp.v2.IListStoredInfoTypesResponse + ]) => { + this._log.info('listStoredInfoTypes values %j', response); + return [response, input, output]; + }); } /** @@ -3723,6 +4271,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listStoredInfoTypes']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listStoredInfoTypes stream %j', request); return this.descriptors.page.listStoredInfoTypes.createStream( this.innerApiCalls.listStoredInfoTypes as GaxCall, request, @@ -3792,6 +4341,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listStoredInfoTypes']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listStoredInfoTypes iterate %j', request); return this.descriptors.page.listStoredInfoTypes.asyncIterate( this.innerApiCalls['listStoredInfoTypes'] as GaxCall, request as {}, @@ -4145,6 +4695,7 @@ export class DlpServiceClient { close(): Promise { if (this.dlpServiceStub && !this._terminated) { return this.dlpServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/kms/package.json b/baselines/kms/package.json index 525aabc64..3b643389b 100644 --- a/baselines/kms/package.json +++ b/baselines/kms/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/kms/src/v1/key_management_service_client.ts.baseline b/baselines/kms/src/v1/key_management_service_client.ts.baseline index df75be008..cf8cbc7df 100644 --- a/baselines/kms/src/v1/key_management_service_client.ts.baseline +++ b/baselines/kms/src/v1/key_management_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -56,6 +57,8 @@ export class KeyManagementServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('kms'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -408,7 +411,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getKeyRing(request, options, callback); + this._log.info('getKeyRing request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.IGetKeyRingRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getKeyRing response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getKeyRing(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.IGetKeyRingRequest|undefined, {}|undefined + ]) => { + this._log.info('getKeyRing response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns metadata for a given {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey}, as well as its @@ -479,7 +499,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getCryptoKey(request, options, callback); + this._log.info('getCryptoKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IGetCryptoKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getCryptoKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getCryptoKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IGetCryptoKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('getCryptoKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns metadata for a given {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion}. @@ -549,7 +586,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getCryptoKeyVersion(request, options, callback); + this._log.info('getCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IGetCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IGetCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('getCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns the public key for the given {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion}. The @@ -623,7 +677,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getPublicKey(request, options, callback); + this._log.info('getPublicKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IPublicKey, + protos.google.cloud.kms.v1.IGetPublicKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getPublicKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getPublicKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IPublicKey, + protos.google.cloud.kms.v1.IGetPublicKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('getPublicKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns metadata for a given {@link protos.google.cloud.kms.v1.ImportJob|ImportJob}. @@ -693,7 +764,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getImportJob(request, options, callback); + this._log.info('getImportJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.IGetImportJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getImportJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getImportJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.IGetImportJobRequest|undefined, {}|undefined + ]) => { + this._log.info('getImportJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.KeyRing|KeyRing} in a given Project and Location. @@ -769,7 +857,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createKeyRing(request, options, callback); + this._log.info('createKeyRing request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.ICreateKeyRingRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createKeyRing response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createKeyRing(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.ICreateKeyRingRequest|undefined, {}|undefined + ]) => { + this._log.info('createKeyRing response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey} within a {@link protos.google.cloud.kms.v1.KeyRing|KeyRing}. @@ -855,7 +960,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createCryptoKey(request, options, callback); + this._log.info('createCryptoKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.ICreateCryptoKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createCryptoKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createCryptoKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.ICreateCryptoKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('createCryptoKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} in a {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey}. @@ -932,7 +1054,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createCryptoKeyVersion(request, options, callback); + this._log.info('createCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.ICreateCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.ICreateCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('createCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Imports a new {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} into an existing {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey} using the @@ -1034,7 +1173,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.importCryptoKeyVersion(request, options, callback); + this._log.info('importCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IImportCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('importCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.importCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IImportCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('importCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.ImportJob|ImportJob} within a {@link protos.google.cloud.kms.v1.KeyRing|KeyRing}. @@ -1112,7 +1268,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createImportJob(request, options, callback); + this._log.info('createImportJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.ICreateImportJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createImportJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createImportJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.ICreateImportJobRequest|undefined, {}|undefined + ]) => { + this._log.info('createImportJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Update a {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey}. @@ -1184,7 +1357,24 @@ export class KeyManagementServiceClient { 'crypto_key.name': request.cryptoKey!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCryptoKey(request, options, callback); + this._log.info('updateCryptoKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCryptoKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCryptoKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCryptoKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Update a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion}'s metadata. @@ -1262,7 +1452,24 @@ export class KeyManagementServiceClient { 'crypto_key_version.name': request.cryptoKeyVersion!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCryptoKeyVersion(request, options, callback); + this._log.info('updateCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IUpdateCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IUpdateCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Encrypts data, so that it can only be recovered by a call to {@link protos.google.cloud.kms.v1.KeyManagementService.Decrypt|Decrypt}. @@ -1357,7 +1564,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.encrypt(request, options, callback); + this._log.info('encrypt request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IEncryptResponse, + protos.google.cloud.kms.v1.IEncryptRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('encrypt response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.encrypt(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IEncryptResponse, + protos.google.cloud.kms.v1.IEncryptRequest|undefined, {}|undefined + ]) => { + this._log.info('encrypt response %j', response); + return [response, options, rawResponse]; + }); } /** * Decrypts data that was protected by {@link protos.google.cloud.kms.v1.KeyManagementService.Encrypt|Encrypt}. The {@link protos.google.cloud.kms.v1.CryptoKey.purpose|CryptoKey.purpose} @@ -1435,7 +1659,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.decrypt(request, options, callback); + this._log.info('decrypt request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IDecryptResponse, + protos.google.cloud.kms.v1.IDecryptRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('decrypt response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.decrypt(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IDecryptResponse, + protos.google.cloud.kms.v1.IDecryptRequest|undefined, {}|undefined + ]) => { + this._log.info('decrypt response %j', response); + return [response, options, rawResponse]; + }); } /** * Signs data using a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} with {@link protos.google.cloud.kms.v1.CryptoKey.purpose|CryptoKey.purpose} @@ -1511,7 +1752,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.asymmetricSign(request, options, callback); + this._log.info('asymmetricSign request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IAsymmetricSignResponse, + protos.google.cloud.kms.v1.IAsymmetricSignRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('asymmetricSign response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.asymmetricSign(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IAsymmetricSignResponse, + protos.google.cloud.kms.v1.IAsymmetricSignRequest|undefined, {}|undefined + ]) => { + this._log.info('asymmetricSign response %j', response); + return [response, options, rawResponse]; + }); } /** * Decrypts data that was encrypted with a public key retrieved from @@ -1587,7 +1845,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.asymmetricDecrypt(request, options, callback); + this._log.info('asymmetricDecrypt request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IAsymmetricDecryptResponse, + protos.google.cloud.kms.v1.IAsymmetricDecryptRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('asymmetricDecrypt response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.asymmetricDecrypt(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IAsymmetricDecryptResponse, + protos.google.cloud.kms.v1.IAsymmetricDecryptRequest|undefined, {}|undefined + ]) => { + this._log.info('asymmetricDecrypt response %j', response); + return [response, options, rawResponse]; + }); } /** * Update the version of a {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey} that will be used in {@link protos.google.cloud.kms.v1.KeyManagementService.Encrypt|Encrypt}. @@ -1661,7 +1936,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCryptoKeyPrimaryVersion(request, options, callback); + this._log.info('updateCryptoKeyPrimaryVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyPrimaryVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCryptoKeyPrimaryVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCryptoKeyPrimaryVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyPrimaryVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCryptoKeyPrimaryVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Schedule a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} for destruction. @@ -1742,7 +2034,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.destroyCryptoKeyVersion(request, options, callback); + this._log.info('destroyCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IDestroyCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('destroyCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.destroyCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IDestroyCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('destroyCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Restore a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} in the @@ -1818,7 +2127,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.restoreCryptoKeyVersion(request, options, callback); + this._log.info('restoreCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IRestoreCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('restoreCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.restoreCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IRestoreCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('restoreCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1908,7 +2234,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listKeyRings(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListKeyRingsRequest, + protos.google.cloud.kms.v1.IListKeyRingsResponse|null|undefined, + protos.google.cloud.kms.v1.IKeyRing>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listKeyRings values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listKeyRings request %j', request); + return this.innerApiCalls + .listKeyRings(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.IKeyRing[], + protos.google.cloud.kms.v1.IListKeyRingsRequest|null, + protos.google.cloud.kms.v1.IListKeyRingsResponse + ]) => { + this._log.info('listKeyRings values %j', response); + return [response, input, output]; + }); } /** @@ -1958,6 +2303,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listKeyRings']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listKeyRings stream %j', request); return this.descriptors.page.listKeyRings.createStream( this.innerApiCalls.listKeyRings as GaxCall, request, @@ -2015,6 +2361,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listKeyRings']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listKeyRings iterate %j', request); return this.descriptors.page.listKeyRings.asyncIterate( this.innerApiCalls['listKeyRings'] as GaxCall, request as {}, @@ -2110,7 +2457,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listCryptoKeys(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListCryptoKeysRequest, + protos.google.cloud.kms.v1.IListCryptoKeysResponse|null|undefined, + protos.google.cloud.kms.v1.ICryptoKey>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listCryptoKeys values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listCryptoKeys request %j', request); + return this.innerApiCalls + .listCryptoKeys(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.ICryptoKey[], + protos.google.cloud.kms.v1.IListCryptoKeysRequest|null, + protos.google.cloud.kms.v1.IListCryptoKeysResponse + ]) => { + this._log.info('listCryptoKeys values %j', response); + return [response, input, output]; + }); } /** @@ -2162,6 +2528,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeys']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeys stream %j', request); return this.descriptors.page.listCryptoKeys.createStream( this.innerApiCalls.listCryptoKeys as GaxCall, request, @@ -2221,6 +2588,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeys']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeys iterate %j', request); return this.descriptors.page.listCryptoKeys.asyncIterate( this.innerApiCalls['listCryptoKeys'] as GaxCall, request as {}, @@ -2317,7 +2685,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listCryptoKeyVersions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListCryptoKeyVersionsRequest, + protos.google.cloud.kms.v1.IListCryptoKeyVersionsResponse|null|undefined, + protos.google.cloud.kms.v1.ICryptoKeyVersion>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listCryptoKeyVersions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listCryptoKeyVersions request %j', request); + return this.innerApiCalls + .listCryptoKeyVersions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion[], + protos.google.cloud.kms.v1.IListCryptoKeyVersionsRequest|null, + protos.google.cloud.kms.v1.IListCryptoKeyVersionsResponse + ]) => { + this._log.info('listCryptoKeyVersions values %j', response); + return [response, input, output]; + }); } /** @@ -2370,6 +2757,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeyVersions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeyVersions stream %j', request); return this.descriptors.page.listCryptoKeyVersions.createStream( this.innerApiCalls.listCryptoKeyVersions as GaxCall, request, @@ -2430,6 +2818,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeyVersions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeyVersions iterate %j', request); return this.descriptors.page.listCryptoKeyVersions.asyncIterate( this.innerApiCalls['listCryptoKeyVersions'] as GaxCall, request as {}, @@ -2523,7 +2912,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listImportJobs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListImportJobsRequest, + protos.google.cloud.kms.v1.IListImportJobsResponse|null|undefined, + protos.google.cloud.kms.v1.IImportJob>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listImportJobs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listImportJobs request %j', request); + return this.innerApiCalls + .listImportJobs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.IImportJob[], + protos.google.cloud.kms.v1.IListImportJobsRequest|null, + protos.google.cloud.kms.v1.IListImportJobsResponse + ]) => { + this._log.info('listImportJobs values %j', response); + return [response, input, output]; + }); } /** @@ -2573,6 +2981,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listImportJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listImportJobs stream %j', request); return this.descriptors.page.listImportJobs.createStream( this.innerApiCalls.listImportJobs as GaxCall, request, @@ -2630,6 +3039,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listImportJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listImportJobs iterate %j', request); return this.descriptors.page.listImportJobs.asyncIterate( this.innerApiCalls['listImportJobs'] as GaxCall, request as {}, @@ -2784,6 +3194,7 @@ export class KeyManagementServiceClient { close(): Promise { if (this.keyManagementServiceStub && !this._terminated) { return this.keyManagementServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.iamClient.close(); diff --git a/baselines/logging/package.json b/baselines/logging/package.json index 6d1bfd183..7a3d55aba 100644 --- a/baselines/logging/package.json +++ b/baselines/logging/package.json @@ -37,7 +37,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/logging/src/v2/config_service_v2_client.ts.baseline b/baselines/logging/src/v2/config_service_v2_client.ts.baseline index 3dcb2aced..8e6e7a7a2 100644 --- a/baselines/logging/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/config_service_v2_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class ConfigServiceV2Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('logging'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -533,7 +536,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getBucket(request, options, callback); + this._log.info('getBucket request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IGetBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IGetBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('getBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a log bucket that can be used to store log entries. After a bucket @@ -618,7 +638,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createBucket(request, options, callback); + this._log.info('createBucket request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.ICreateBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.ICreateBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('createBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a log bucket. This method replaces the following fields in the @@ -717,7 +754,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateBucket(request, options, callback); + this._log.info('updateBucket request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IUpdateBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IUpdateBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('updateBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a log bucket. @@ -800,7 +854,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteBucket(request, options, callback); + this._log.info('deleteBucket request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Undeletes a log bucket. A bucket that has been deleted can be undeleted @@ -880,7 +951,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.undeleteBucket(request, options, callback); + this._log.info('undeleteBucket request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IUndeleteBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('undeleteBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.undeleteBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IUndeleteBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('undeleteBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a view on a log bucket.. @@ -956,7 +1044,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getView(request, options, callback); + this._log.info('getView request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IGetViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IGetViewRequest|undefined, {}|undefined + ]) => { + this._log.info('getView response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a view over log entries in a log bucket. A bucket may contain a @@ -1037,7 +1142,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createView(request, options, callback); + this._log.info('createView request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogView, + protos.google.logging.v2.ICreateViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogView, + protos.google.logging.v2.ICreateViewRequest|undefined, {}|undefined + ]) => { + this._log.info('createView response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a view on a log bucket. This method replaces the following fields @@ -1128,7 +1250,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateView(request, options, callback); + this._log.info('updateView request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IUpdateViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IUpdateViewRequest|undefined, {}|undefined + ]) => { + this._log.info('updateView response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a view on a log bucket. @@ -1207,7 +1346,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteView(request, options, callback); + this._log.info('deleteView request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteViewRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteView response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a sink. @@ -1286,7 +1442,24 @@ export class ConfigServiceV2Client { 'sink_name': request.sinkName ?? '', }); this.initialize(); - return this.innerApiCalls.getSink(request, options, callback); + this._log.info('getSink request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IGetSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IGetSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('getSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a sink that exports specified log entries to a destination. The @@ -1384,7 +1557,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createSink(request, options, callback); + this._log.info('createSink request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.ICreateSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.ICreateSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('createSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a sink. This method replaces the following fields in the existing @@ -1500,7 +1690,24 @@ export class ConfigServiceV2Client { 'sink_name': request.sinkName ?? '', }); this.initialize(); - return this.innerApiCalls.updateSink(request, options, callback); + this._log.info('updateSink request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IUpdateSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IUpdateSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('updateSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a sink. If the sink has a unique `writer_identity`, then that @@ -1581,7 +1788,24 @@ export class ConfigServiceV2Client { 'sink_name': request.sinkName ?? '', }); this.initialize(); - return this.innerApiCalls.deleteSink(request, options, callback); + this._log.info('deleteSink request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the description of an exclusion in the _Default sink. @@ -1660,7 +1884,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getExclusion(request, options, callback); + this._log.info('getExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IGetExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IGetExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('getExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new exclusion in the _Default sink in a specified parent @@ -1745,7 +1986,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createExclusion(request, options, callback); + this._log.info('createExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.ICreateExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.ICreateExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('createExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Changes one or more properties of an existing exclusion in the _Default @@ -1836,7 +2094,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateExclusion(request, options, callback); + this._log.info('updateExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IUpdateExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IUpdateExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('updateExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an exclusion in the _Default sink. @@ -1915,7 +2190,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteExclusion(request, options, callback); + this._log.info('deleteExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the Logging CMEK settings for the given resource. @@ -2008,7 +2300,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getCmekSettings(request, options, callback); + this._log.info('getCmekSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IGetCmekSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getCmekSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getCmekSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IGetCmekSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('getCmekSettings response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the Log Router CMEK settings for the given resource. @@ -2119,7 +2428,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCmekSettings(request, options, callback); + this._log.info('updateCmekSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IUpdateCmekSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCmekSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCmekSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IUpdateCmekSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCmekSettings response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the Log Router settings for the given resource. @@ -2212,7 +2538,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSettings(request, options, callback); + this._log.info('getSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IGetSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IGetSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('getSettings response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the Log Router settings for the given resource. @@ -2321,7 +2664,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateSettings(request, options, callback); + this._log.info('updateSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IUpdateSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IUpdateSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('updateSettings response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -2398,7 +2758,24 @@ export class ConfigServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.copyLogEntries(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.logging.v2.ICopyLogEntriesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('copyLogEntries response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('copyLogEntries request %j', request); + return this.innerApiCalls.copyLogEntries(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.logging.v2.ICopyLogEntriesRequest|undefined, {}|undefined + ]) => { + this._log.info('copyLogEntries response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `copyLogEntries()`. @@ -2412,6 +2789,7 @@ export class ConfigServiceV2Client { * region_tag:logging_v2_generated_ConfigServiceV2_CopyLogEntries_async */ async checkCopyLogEntriesProgress(name: string): Promise>{ + this._log.info('copyLogEntries long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.copyLogEntries, this._gaxModule.createDefaultBackoffSettings()); @@ -2508,7 +2886,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listBuckets(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListBucketsRequest, + protos.google.logging.v2.IListBucketsResponse|null|undefined, + protos.google.logging.v2.ILogBucket>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listBuckets values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listBuckets request %j', request); + return this.innerApiCalls + .listBuckets(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogBucket[], + protos.google.logging.v2.IListBucketsRequest|null, + protos.google.logging.v2.IListBucketsResponse + ]) => { + this._log.info('listBuckets values %j', response); + return [response, input, output]; + }); } /** @@ -2562,6 +2959,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listBuckets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBuckets stream %j', request); return this.descriptors.page.listBuckets.createStream( this.innerApiCalls.listBuckets as GaxCall, request, @@ -2623,6 +3021,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listBuckets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBuckets iterate %j', request); return this.descriptors.page.listBuckets.asyncIterate( this.innerApiCalls['listBuckets'] as GaxCall, request as {}, @@ -2714,7 +3113,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listViews(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListViewsRequest, + protos.google.logging.v2.IListViewsResponse|null|undefined, + protos.google.logging.v2.ILogView>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listViews values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listViews request %j', request); + return this.innerApiCalls + .listViews(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogView[], + protos.google.logging.v2.IListViewsRequest|null, + protos.google.logging.v2.IListViewsResponse + ]) => { + this._log.info('listViews values %j', response); + return [response, input, output]; + }); } /** @@ -2762,6 +3180,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listViews']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listViews stream %j', request); return this.descriptors.page.listViews.createStream( this.innerApiCalls.listViews as GaxCall, request, @@ -2817,6 +3236,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listViews']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listViews iterate %j', request); return this.descriptors.page.listViews.asyncIterate( this.innerApiCalls['listViews'] as GaxCall, request as {}, @@ -2910,7 +3330,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listSinks(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListSinksRequest, + protos.google.logging.v2.IListSinksResponse|null|undefined, + protos.google.logging.v2.ILogSink>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSinks values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listSinks request %j', request); + return this.innerApiCalls + .listSinks(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogSink[], + protos.google.logging.v2.IListSinksRequest|null, + protos.google.logging.v2.IListSinksResponse + ]) => { + this._log.info('listSinks values %j', response); + return [response, input, output]; + }); } /** @@ -2960,6 +3399,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listSinks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSinks stream %j', request); return this.descriptors.page.listSinks.createStream( this.innerApiCalls.listSinks as GaxCall, request, @@ -3017,6 +3457,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listSinks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSinks iterate %j', request); return this.descriptors.page.listSinks.asyncIterate( this.innerApiCalls['listSinks'] as GaxCall, request as {}, @@ -3110,7 +3551,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listExclusions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListExclusionsRequest, + protos.google.logging.v2.IListExclusionsResponse|null|undefined, + protos.google.logging.v2.ILogExclusion>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listExclusions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listExclusions request %j', request); + return this.innerApiCalls + .listExclusions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogExclusion[], + protos.google.logging.v2.IListExclusionsRequest|null, + protos.google.logging.v2.IListExclusionsResponse + ]) => { + this._log.info('listExclusions values %j', response); + return [response, input, output]; + }); } /** @@ -3160,6 +3620,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listExclusions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listExclusions stream %j', request); return this.descriptors.page.listExclusions.createStream( this.innerApiCalls.listExclusions as GaxCall, request, @@ -3217,6 +3678,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listExclusions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listExclusions iterate %j', request); return this.descriptors.page.listExclusions.asyncIterate( this.innerApiCalls['listExclusions'] as GaxCall, request as {}, @@ -4391,6 +4853,7 @@ export class ConfigServiceV2Client { close(): Promise { if (this.configServiceV2Stub && !this._terminated) { return this.configServiceV2Stub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline index 92b939024..5168affbf 100644 --- a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class LoggingServiceV2Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('logging'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -539,7 +542,24 @@ export class LoggingServiceV2Client { 'log_name': request.logName ?? '', }); this.initialize(); - return this.innerApiCalls.deleteLog(request, options, callback); + this._log.info('deleteLog request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteLog response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteLog(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteLog response %j', response); + return [response, options, rawResponse]; + }); } /** * Writes log entries to Logging. This API method is the @@ -675,7 +695,24 @@ export class LoggingServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.writeLogEntries(request, options, callback); + this._log.info('writeLogEntries request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.IWriteLogEntriesResponse, + protos.google.logging.v2.IWriteLogEntriesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('writeLogEntries response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.writeLogEntries(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.IWriteLogEntriesResponse, + protos.google.logging.v2.IWriteLogEntriesRequest|undefined, {}|undefined + ]) => { + this._log.info('writeLogEntries response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -697,6 +734,7 @@ export class LoggingServiceV2Client { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('tailLogEntries stream %j', options); return this.innerApiCalls.tailLogEntries(null, options); } @@ -811,7 +849,26 @@ export class LoggingServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listLogEntries(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListLogEntriesRequest, + protos.google.logging.v2.IListLogEntriesResponse|null|undefined, + protos.google.logging.v2.ILogEntry>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listLogEntries values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listLogEntries request %j', request); + return this.innerApiCalls + .listLogEntries(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogEntry[], + protos.google.logging.v2.IListLogEntriesRequest|null, + protos.google.logging.v2.IListLogEntriesResponse + ]) => { + this._log.info('listLogEntries values %j', response); + return [response, input, output]; + }); } /** @@ -882,6 +939,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogEntries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogEntries stream %j', request); return this.descriptors.page.listLogEntries.createStream( this.innerApiCalls.listLogEntries as GaxCall, request, @@ -960,6 +1018,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogEntries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogEntries iterate %j', request); return this.descriptors.page.listLogEntries.asyncIterate( this.innerApiCalls['listLogEntries'] as GaxCall, request as {}, @@ -1041,7 +1100,26 @@ export class LoggingServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listMonitoredResourceDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListMonitoredResourceDescriptorsRequest, + protos.google.logging.v2.IListMonitoredResourceDescriptorsResponse|null|undefined, + protos.google.api.IMonitoredResourceDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listMonitoredResourceDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listMonitoredResourceDescriptors request %j', request); + return this.innerApiCalls + .listMonitoredResourceDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMonitoredResourceDescriptor[], + protos.google.logging.v2.IListMonitoredResourceDescriptorsRequest|null, + protos.google.logging.v2.IListMonitoredResourceDescriptorsResponse + ]) => { + this._log.info('listMonitoredResourceDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -1079,6 +1157,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors stream %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.createStream( this.innerApiCalls.listMonitoredResourceDescriptors as GaxCall, request, @@ -1124,6 +1203,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors iterate %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.asyncIterate( this.innerApiCalls['listMonitoredResourceDescriptors'] as GaxCall, request as {}, @@ -1232,7 +1312,26 @@ export class LoggingServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listLogs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListLogsRequest, + protos.google.logging.v2.IListLogsResponse|null|undefined, + string>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listLogs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listLogs request %j', request); + return this.innerApiCalls + .listLogs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + string[], + protos.google.logging.v2.IListLogsRequest|null, + protos.google.logging.v2.IListLogsResponse + ]) => { + this._log.info('listLogs values %j', response); + return [response, input, output]; + }); } /** @@ -1296,6 +1395,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogs stream %j', request); return this.descriptors.page.listLogs.createStream( this.innerApiCalls.listLogs as GaxCall, request, @@ -1367,6 +1467,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogs iterate %j', request); return this.descriptors.page.listLogs.asyncIterate( this.innerApiCalls['listLogs'] as GaxCall, request as {}, @@ -2505,6 +2606,7 @@ export class LoggingServiceV2Client { close(): Promise { if (this.loggingServiceV2Stub && !this._terminated) { return this.loggingServiceV2Stub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline index f76fdbca6..57d80d031 100644 --- a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class MetricsServiceV2Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('logging'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -491,7 +494,24 @@ export class MetricsServiceV2Client { 'metric_name': request.metricName ?? '', }); this.initialize(); - return this.innerApiCalls.getLogMetric(request, options, callback); + this._log.info('getLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IGetLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IGetLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('getLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a logs-based metric. @@ -568,7 +588,24 @@ export class MetricsServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createLogMetric(request, options, callback); + this._log.info('createLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.ICreateLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.ICreateLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('createLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates or updates a logs-based metric. @@ -646,7 +683,24 @@ export class MetricsServiceV2Client { 'metric_name': request.metricName ?? '', }); this.initialize(); - return this.innerApiCalls.updateLogMetric(request, options, callback); + this._log.info('updateLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IUpdateLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IUpdateLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('updateLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a logs-based metric. @@ -718,7 +772,24 @@ export class MetricsServiceV2Client { 'metric_name': request.metricName ?? '', }); this.initialize(); - return this.innerApiCalls.deleteLogMetric(request, options, callback); + this._log.info('deleteLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -805,7 +876,26 @@ export class MetricsServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listLogMetrics(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListLogMetricsRequest, + protos.google.logging.v2.IListLogMetricsResponse|null|undefined, + protos.google.logging.v2.ILogMetric>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listLogMetrics values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listLogMetrics request %j', request); + return this.innerApiCalls + .listLogMetrics(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogMetric[], + protos.google.logging.v2.IListLogMetricsRequest|null, + protos.google.logging.v2.IListLogMetricsResponse + ]) => { + this._log.info('listLogMetrics values %j', response); + return [response, input, output]; + }); } /** @@ -852,6 +942,7 @@ export class MetricsServiceV2Client { const defaultCallSettings = this._defaults['listLogMetrics']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogMetrics stream %j', request); return this.descriptors.page.listLogMetrics.createStream( this.innerApiCalls.listLogMetrics as GaxCall, request, @@ -906,6 +997,7 @@ export class MetricsServiceV2Client { const defaultCallSettings = this._defaults['listLogMetrics']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogMetrics iterate %j', request); return this.descriptors.page.listLogMetrics.asyncIterate( this.innerApiCalls['listLogMetrics'] as GaxCall, request as {}, @@ -2044,6 +2136,7 @@ export class MetricsServiceV2Client { close(): Promise { if (this.metricsServiceV2Stub && !this._terminated) { return this.metricsServiceV2Stub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring/package.json b/baselines/monitoring/package.json index 12bf8367b..7f701fe8c 100644 --- a/baselines/monitoring/package.json +++ b/baselines/monitoring/package.json @@ -40,7 +40,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline index 908e468a1..95e1e90b1 100644 --- a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -54,6 +55,8 @@ export class AlertPolicyServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -479,7 +482,24 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getAlertPolicy(request, options, callback); + this._log.info('getAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IGetAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IGetAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('getAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new alerting policy. @@ -560,7 +580,24 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createAlertPolicy(request, options, callback); + this._log.info('createAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.ICreateAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.ICreateAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('createAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an alerting policy. @@ -634,7 +671,24 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteAlertPolicy(request, options, callback); + this._log.info('deleteAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an alerting policy. You can either replace the entire policy with @@ -732,7 +786,24 @@ export class AlertPolicyServiceClient { 'alert_policy.name': request.alertPolicy!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateAlertPolicy(request, options, callback); + this._log.info('updateAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IUpdateAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IUpdateAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('updateAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -835,7 +906,26 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listAlertPolicies(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListAlertPoliciesRequest, + protos.google.monitoring.v3.IListAlertPoliciesResponse|null|undefined, + protos.google.monitoring.v3.IAlertPolicy>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listAlertPolicies values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listAlertPolicies request %j', request); + return this.innerApiCalls + .listAlertPolicies(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IAlertPolicy[], + protos.google.monitoring.v3.IListAlertPoliciesRequest|null, + protos.google.monitoring.v3.IListAlertPoliciesResponse + ]) => { + this._log.info('listAlertPolicies values %j', response); + return [response, input, output]; + }); } /** @@ -898,6 +988,7 @@ export class AlertPolicyServiceClient { const defaultCallSettings = this._defaults['listAlertPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listAlertPolicies stream %j', request); return this.descriptors.page.listAlertPolicies.createStream( this.innerApiCalls.listAlertPolicies as GaxCall, request, @@ -968,6 +1059,7 @@ export class AlertPolicyServiceClient { const defaultCallSettings = this._defaults['listAlertPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listAlertPolicies iterate %j', request); return this.descriptors.page.listAlertPolicies.asyncIterate( this.innerApiCalls['listAlertPolicies'] as GaxCall, request as {}, @@ -1929,6 +2021,7 @@ export class AlertPolicyServiceClient { close(): Promise { if (this.alertPolicyServiceStub && !this._terminated) { return this.alertPolicyServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring/src/v3/group_service_client.ts.baseline b/baselines/monitoring/src/v3/group_service_client.ts.baseline index 730478565..ea1c76c26 100644 --- a/baselines/monitoring/src/v3/group_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/group_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -57,6 +58,8 @@ export class GroupServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -483,7 +486,24 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getGroup(request, options, callback); + this._log.info('getGroup request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IGetGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IGetGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('getGroup response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new group. @@ -559,7 +579,24 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createGroup(request, options, callback); + this._log.info('createGroup request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.ICreateGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.ICreateGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('createGroup response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an existing group. @@ -633,7 +670,24 @@ export class GroupServiceClient { 'group.name': request.group!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateGroup(request, options, callback); + this._log.info('updateGroup request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IUpdateGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IUpdateGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('updateGroup response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an existing group. @@ -708,7 +762,24 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteGroup(request, options, callback); + this._log.info('deleteGroup request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteGroup response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -806,7 +877,26 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listGroups(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListGroupsRequest, + protos.google.monitoring.v3.IListGroupsResponse|null|undefined, + protos.google.monitoring.v3.IGroup>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listGroups values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listGroups request %j', request); + return this.innerApiCalls + .listGroups(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IGroup[], + protos.google.monitoring.v3.IListGroupsRequest|null, + protos.google.monitoring.v3.IListGroupsResponse + ]) => { + this._log.info('listGroups values %j', response); + return [response, input, output]; + }); } /** @@ -864,6 +954,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroups']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroups stream %j', request); return this.descriptors.page.listGroups.createStream( this.innerApiCalls.listGroups as GaxCall, request, @@ -929,6 +1020,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroups']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroups iterate %j', request); return this.descriptors.page.listGroups.asyncIterate( this.innerApiCalls['listGroups'] as GaxCall, request as {}, @@ -1028,7 +1120,26 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listGroupMembers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListGroupMembersRequest, + protos.google.monitoring.v3.IListGroupMembersResponse|null|undefined, + protos.google.api.IMonitoredResource>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listGroupMembers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listGroupMembers request %j', request); + return this.innerApiCalls + .listGroupMembers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMonitoredResource[], + protos.google.monitoring.v3.IListGroupMembersRequest|null, + protos.google.monitoring.v3.IListGroupMembersResponse + ]) => { + this._log.info('listGroupMembers values %j', response); + return [response, input, output]; + }); } /** @@ -1084,6 +1195,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroupMembers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroupMembers stream %j', request); return this.descriptors.page.listGroupMembers.createStream( this.innerApiCalls.listGroupMembers as GaxCall, request, @@ -1147,6 +1259,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroupMembers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroupMembers iterate %j', request); return this.descriptors.page.listGroupMembers.asyncIterate( this.innerApiCalls['listGroupMembers'] as GaxCall, request as {}, @@ -2108,6 +2221,7 @@ export class GroupServiceClient { close(): Promise { if (this.groupServiceStub && !this._terminated) { return this.groupServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring/src/v3/metric_service_client.ts.baseline b/baselines/monitoring/src/v3/metric_service_client.ts.baseline index f8bc09a1c..c941b617b 100644 --- a/baselines/monitoring/src/v3/metric_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/metric_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -47,6 +48,8 @@ export class MetricServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -496,7 +499,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getMonitoredResourceDescriptor(request, options, callback); + this._log.info('getMonitoredResourceDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.api.IMonitoredResourceDescriptor, + protos.google.monitoring.v3.IGetMonitoredResourceDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getMonitoredResourceDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getMonitoredResourceDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.api.IMonitoredResourceDescriptor, + protos.google.monitoring.v3.IGetMonitoredResourceDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('getMonitoredResourceDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a single metric descriptor. This method does not require a Stackdriver account. @@ -569,7 +589,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getMetricDescriptor(request, options, callback); + this._log.info('getMetricDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.IGetMetricDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getMetricDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getMetricDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.IGetMetricDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('getMetricDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new metric descriptor. @@ -645,7 +682,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createMetricDescriptor(request, options, callback); + this._log.info('createMetricDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.ICreateMetricDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createMetricDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createMetricDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.ICreateMetricDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('createMetricDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a metric descriptor. Only user-created @@ -719,7 +773,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteMetricDescriptor(request, options, callback); + this._log.info('deleteMetricDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteMetricDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteMetricDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteMetricDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteMetricDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteMetricDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates or adds data to one or more time series. @@ -801,7 +872,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createTimeSeries(request, options, callback); + this._log.info('createTimeSeries request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ICreateTimeSeriesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createTimeSeries response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createTimeSeries(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ICreateTimeSeriesRequest|undefined, {}|undefined + ]) => { + this._log.info('createTimeSeries response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -892,7 +980,26 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listMonitoredResourceDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsRequest, + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsResponse|null|undefined, + protos.google.api.IMonitoredResourceDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listMonitoredResourceDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listMonitoredResourceDescriptors request %j', request); + return this.innerApiCalls + .listMonitoredResourceDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMonitoredResourceDescriptor[], + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsRequest|null, + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsResponse + ]) => { + this._log.info('listMonitoredResourceDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -943,6 +1050,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors stream %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.createStream( this.innerApiCalls.listMonitoredResourceDescriptors as GaxCall, request, @@ -1001,6 +1109,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors iterate %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.asyncIterate( this.innerApiCalls['listMonitoredResourceDescriptors'] as GaxCall, request as {}, @@ -1096,7 +1205,26 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listMetricDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListMetricDescriptorsRequest, + protos.google.monitoring.v3.IListMetricDescriptorsResponse|null|undefined, + protos.google.api.IMetricDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listMetricDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listMetricDescriptors request %j', request); + return this.innerApiCalls + .listMetricDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMetricDescriptor[], + protos.google.monitoring.v3.IListMetricDescriptorsRequest|null, + protos.google.monitoring.v3.IListMetricDescriptorsResponse + ]) => { + this._log.info('listMetricDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -1148,6 +1276,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMetricDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMetricDescriptors stream %j', request); return this.descriptors.page.listMetricDescriptors.createStream( this.innerApiCalls.listMetricDescriptors as GaxCall, request, @@ -1207,6 +1336,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMetricDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMetricDescriptors iterate %j', request); return this.descriptors.page.listMetricDescriptors.asyncIterate( this.innerApiCalls['listMetricDescriptors'] as GaxCall, request as {}, @@ -1320,7 +1450,26 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listTimeSeries(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListTimeSeriesRequest, + protos.google.monitoring.v3.IListTimeSeriesResponse|null|undefined, + protos.google.monitoring.v3.ITimeSeries>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTimeSeries values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTimeSeries request %j', request); + return this.innerApiCalls + .listTimeSeries(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.ITimeSeries[], + protos.google.monitoring.v3.IListTimeSeriesRequest|null, + protos.google.monitoring.v3.IListTimeSeriesResponse + ]) => { + this._log.info('listTimeSeries values %j', response); + return [response, input, output]; + }); } /** @@ -1390,6 +1539,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listTimeSeries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTimeSeries stream %j', request); return this.descriptors.page.listTimeSeries.createStream( this.innerApiCalls.listTimeSeries as GaxCall, request, @@ -1467,6 +1617,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listTimeSeries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTimeSeries iterate %j', request); return this.descriptors.page.listTimeSeries.asyncIterate( this.innerApiCalls['listTimeSeries'] as GaxCall, request as {}, @@ -2644,6 +2795,7 @@ export class MetricServiceClient { close(): Promise { if (this.metricServiceStub && !this._terminated) { return this.metricServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline index 1040a6c9b..057c44a3f 100644 --- a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -47,6 +48,8 @@ export class NotificationChannelServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -474,7 +477,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getNotificationChannelDescriptor(request, options, callback); + this._log.info('getNotificationChannelDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannelDescriptor, + protos.google.monitoring.v3.IGetNotificationChannelDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getNotificationChannelDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getNotificationChannelDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannelDescriptor, + protos.google.monitoring.v3.IGetNotificationChannelDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('getNotificationChannelDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a single notification channel. The channel includes the relevant @@ -549,7 +569,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getNotificationChannel(request, options, callback); + this._log.info('getNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IGetNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IGetNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('getNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new notification channel, representing a single notification @@ -629,7 +666,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createNotificationChannel(request, options, callback); + this._log.info('createNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.ICreateNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.ICreateNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('createNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a notification channel. Fields not specified in the field mask @@ -705,7 +759,24 @@ export class NotificationChannelServiceClient { 'notification_channel.name': request.notificationChannel!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateNotificationChannel(request, options, callback); + this._log.info('updateNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IUpdateNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IUpdateNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('updateNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a notification channel. @@ -781,7 +852,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteNotificationChannel(request, options, callback); + this._log.info('deleteNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Causes a verification code to be delivered to the channel. The code @@ -852,7 +940,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.sendNotificationChannelVerificationCode(request, options, callback); + this._log.info('sendNotificationChannelVerificationCode request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ISendNotificationChannelVerificationCodeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('sendNotificationChannelVerificationCode response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.sendNotificationChannelVerificationCode(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ISendNotificationChannelVerificationCodeRequest|undefined, {}|undefined + ]) => { + this._log.info('sendNotificationChannelVerificationCode response %j', response); + return [response, options, rawResponse]; + }); } /** * Requests a verification code for an already verified channel that can then @@ -954,7 +1059,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getNotificationChannelVerificationCode(request, options, callback); + this._log.info('getNotificationChannelVerificationCode request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeResponse, + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getNotificationChannelVerificationCode response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getNotificationChannelVerificationCode(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeResponse, + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeRequest|undefined, {}|undefined + ]) => { + this._log.info('getNotificationChannelVerificationCode response %j', response); + return [response, options, rawResponse]; + }); } /** * Verifies a `NotificationChannel` by proving receipt of the code @@ -1034,7 +1156,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.verifyNotificationChannel(request, options, callback); + this._log.info('verifyNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IVerifyNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IVerifyNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('verifyNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1127,7 +1266,26 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listNotificationChannelDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListNotificationChannelDescriptorsRequest, + protos.google.monitoring.v3.IListNotificationChannelDescriptorsResponse|null|undefined, + protos.google.monitoring.v3.INotificationChannelDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listNotificationChannelDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listNotificationChannelDescriptors request %j', request); + return this.innerApiCalls + .listNotificationChannelDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.INotificationChannelDescriptor[], + protos.google.monitoring.v3.IListNotificationChannelDescriptorsRequest|null, + protos.google.monitoring.v3.IListNotificationChannelDescriptorsResponse + ]) => { + this._log.info('listNotificationChannelDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -1179,6 +1337,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannelDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannelDescriptors stream %j', request); return this.descriptors.page.listNotificationChannelDescriptors.createStream( this.innerApiCalls.listNotificationChannelDescriptors as GaxCall, request, @@ -1238,6 +1397,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannelDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannelDescriptors iterate %j', request); return this.descriptors.page.listNotificationChannelDescriptors.asyncIterate( this.innerApiCalls['listNotificationChannelDescriptors'] as GaxCall, request as {}, @@ -1344,7 +1504,26 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listNotificationChannels(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListNotificationChannelsRequest, + protos.google.monitoring.v3.IListNotificationChannelsResponse|null|undefined, + protos.google.monitoring.v3.INotificationChannel>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listNotificationChannels values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listNotificationChannels request %j', request); + return this.innerApiCalls + .listNotificationChannels(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.INotificationChannel[], + protos.google.monitoring.v3.IListNotificationChannelsRequest|null, + protos.google.monitoring.v3.IListNotificationChannelsResponse + ]) => { + this._log.info('listNotificationChannels values %j', response); + return [response, input, output]; + }); } /** @@ -1407,6 +1586,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannels stream %j', request); return this.descriptors.page.listNotificationChannels.createStream( this.innerApiCalls.listNotificationChannels as GaxCall, request, @@ -1477,6 +1657,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannels iterate %j', request); return this.descriptors.page.listNotificationChannels.asyncIterate( this.innerApiCalls['listNotificationChannels'] as GaxCall, request as {}, @@ -2438,6 +2619,7 @@ export class NotificationChannelServiceClient { close(): Promise { if (this.notificationChannelServiceStub && !this._terminated) { return this.notificationChannelServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline index ef230574e..253c50408 100644 --- a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class ServiceMonitoringServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -480,7 +483,24 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createService(request, options, callback); + this._log.info('createService request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.ICreateServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.ICreateServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('createService response %j', response); + return [response, options, rawResponse]; + }); } /** * Get the named `Service`. @@ -551,7 +571,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getService(request, options, callback); + this._log.info('getService request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IGetServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IGetServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('getService response %j', response); + return [response, options, rawResponse]; + }); } /** * Update this `Service`. @@ -624,7 +661,24 @@ export class ServiceMonitoringServiceClient { 'service.name': request.service!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateService(request, options, callback); + this._log.info('updateService request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IUpdateServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IUpdateServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('updateService response %j', response); + return [response, options, rawResponse]; + }); } /** * Soft delete this `Service`. @@ -695,7 +749,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteService(request, options, callback); + this._log.info('deleteService request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteService response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a `ServiceLevelObjective` for the given `Service`. @@ -774,7 +845,24 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createServiceLevelObjective(request, options, callback); + this._log.info('createServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.ICreateServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.ICreateServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('createServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** * Get a `ServiceLevelObjective` by name. @@ -851,7 +939,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getServiceLevelObjective(request, options, callback); + this._log.info('getServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IGetServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IGetServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('getServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** * Update the given `ServiceLevelObjective`. @@ -924,7 +1029,24 @@ export class ServiceMonitoringServiceClient { 'service_level_objective.name': request.serviceLevelObjective!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateServiceLevelObjective(request, options, callback); + this._log.info('updateServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IUpdateServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IUpdateServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('updateServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** * Delete the given `ServiceLevelObjective`. @@ -996,7 +1118,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteServiceLevelObjective(request, options, callback); + this._log.info('deleteServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1096,7 +1235,26 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listServices(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListServicesRequest, + protos.google.monitoring.v3.IListServicesResponse|null|undefined, + protos.google.monitoring.v3.IService>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listServices values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listServices request %j', request); + return this.innerApiCalls + .listServices(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IService[], + protos.google.monitoring.v3.IListServicesRequest|null, + protos.google.monitoring.v3.IListServicesResponse + ]) => { + this._log.info('listServices values %j', response); + return [response, input, output]; + }); } /** @@ -1156,6 +1314,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServices']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServices stream %j', request); return this.descriptors.page.listServices.createStream( this.innerApiCalls.listServices as GaxCall, request, @@ -1223,6 +1382,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServices']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServices iterate %j', request); return this.descriptors.page.listServices.asyncIterate( this.innerApiCalls['listServices'] as GaxCall, request as {}, @@ -1317,7 +1477,26 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listServiceLevelObjectives(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListServiceLevelObjectivesRequest, + protos.google.monitoring.v3.IListServiceLevelObjectivesResponse|null|undefined, + protos.google.monitoring.v3.IServiceLevelObjective>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listServiceLevelObjectives values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listServiceLevelObjectives request %j', request); + return this.innerApiCalls + .listServiceLevelObjectives(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IServiceLevelObjective[], + protos.google.monitoring.v3.IListServiceLevelObjectivesRequest|null, + protos.google.monitoring.v3.IListServiceLevelObjectivesResponse + ]) => { + this._log.info('listServiceLevelObjectives values %j', response); + return [response, input, output]; + }); } /** @@ -1368,6 +1547,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServiceLevelObjectives']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServiceLevelObjectives stream %j', request); return this.descriptors.page.listServiceLevelObjectives.createStream( this.innerApiCalls.listServiceLevelObjectives as GaxCall, request, @@ -1426,6 +1606,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServiceLevelObjectives']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServiceLevelObjectives iterate %j', request); return this.descriptors.page.listServiceLevelObjectives.asyncIterate( this.innerApiCalls['listServiceLevelObjectives'] as GaxCall, request as {}, @@ -2387,6 +2568,7 @@ export class ServiceMonitoringServiceClient { close(): Promise { if (this.serviceMonitoringServiceStub && !this._terminated) { return this.serviceMonitoringServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline index 81d15e477..f61ed12be 100644 --- a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -53,6 +54,8 @@ export class UptimeCheckServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -479,7 +482,24 @@ export class UptimeCheckServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getUptimeCheckConfig(request, options, callback); + this._log.info('getUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IGetUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IGetUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('getUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new Uptime check configuration. @@ -552,7 +572,24 @@ export class UptimeCheckServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createUptimeCheckConfig(request, options, callback); + this._log.info('createUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.ICreateUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.ICreateUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('createUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an Uptime check configuration. You can either replace the entire @@ -640,7 +677,24 @@ export class UptimeCheckServiceClient { 'uptime_check_config.name': request.uptimeCheckConfig!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateUptimeCheckConfig(request, options, callback); + this._log.info('updateUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IUpdateUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IUpdateUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('updateUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an Uptime check configuration. Note that this method will fail @@ -713,7 +767,24 @@ export class UptimeCheckServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteUptimeCheckConfig(request, options, callback); + this._log.info('deleteUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -800,7 +871,26 @@ export class UptimeCheckServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listUptimeCheckConfigs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListUptimeCheckConfigsRequest, + protos.google.monitoring.v3.IListUptimeCheckConfigsResponse|null|undefined, + protos.google.monitoring.v3.IUptimeCheckConfig>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUptimeCheckConfigs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUptimeCheckConfigs request %j', request); + return this.innerApiCalls + .listUptimeCheckConfigs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IUptimeCheckConfig[], + protos.google.monitoring.v3.IListUptimeCheckConfigsRequest|null, + protos.google.monitoring.v3.IListUptimeCheckConfigsResponse + ]) => { + this._log.info('listUptimeCheckConfigs values %j', response); + return [response, input, output]; + }); } /** @@ -846,6 +936,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckConfigs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckConfigs stream %j', request); return this.descriptors.page.listUptimeCheckConfigs.createStream( this.innerApiCalls.listUptimeCheckConfigs as GaxCall, request, @@ -899,6 +990,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckConfigs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckConfigs iterate %j', request); return this.descriptors.page.listUptimeCheckConfigs.asyncIterate( this.innerApiCalls['listUptimeCheckConfigs'] as GaxCall, request as {}, @@ -982,7 +1074,26 @@ export class UptimeCheckServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listUptimeCheckIps(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListUptimeCheckIpsRequest, + protos.google.monitoring.v3.IListUptimeCheckIpsResponse|null|undefined, + protos.google.monitoring.v3.IUptimeCheckIp>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUptimeCheckIps values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUptimeCheckIps request %j', request); + return this.innerApiCalls + .listUptimeCheckIps(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IUptimeCheckIp[], + protos.google.monitoring.v3.IListUptimeCheckIpsRequest|null, + protos.google.monitoring.v3.IListUptimeCheckIpsResponse + ]) => { + this._log.info('listUptimeCheckIps values %j', response); + return [response, input, output]; + }); } /** @@ -1022,6 +1133,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckIps']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckIps stream %j', request); return this.descriptors.page.listUptimeCheckIps.createStream( this.innerApiCalls.listUptimeCheckIps as GaxCall, request, @@ -1069,6 +1181,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckIps']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckIps iterate %j', request); return this.descriptors.page.listUptimeCheckIps.asyncIterate( this.innerApiCalls['listUptimeCheckIps'] as GaxCall, request as {}, @@ -2030,6 +2143,7 @@ export class UptimeCheckServiceClient { close(): Promise { if (this.uptimeCheckServiceStub && !this._terminated) { return this.uptimeCheckServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/naming/package.json b/baselines/naming/package.json index 5391a7232..4efbb64b8 100644 --- a/baselines/naming/package.json +++ b/baselines/naming/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/naming/src/v1beta1/naming_client.ts.baseline b/baselines/naming/src/v1beta1/naming_client.ts.baseline index 382cf8311..fe2729dd9 100644 --- a/baselines/naming/src/v1beta1/naming_client.ts.baseline +++ b/baselines/naming/src/v1beta1/naming_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class NamingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('naming'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -418,7 +421,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.paginatedMethodStream(request, options, callback); + this._log.info('paginatedMethodStream request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('paginatedMethodStream response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.paginatedMethodStream(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('paginatedMethodStream response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -480,7 +500,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.paginatedMethodAsync(request, options, callback); + this._log.info('paginatedMethodAsync request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('paginatedMethodAsync response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.paginatedMethodAsync(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('paginatedMethodAsync response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -542,7 +579,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.checkLongRunningProgress(request, options, callback); + this._log.info('checkLongRunningProgress request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('checkLongRunningProgress response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.checkLongRunningProgress(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('checkLongRunningProgress response %j', response); + return [response, options, rawResponse]; + }); } /** * Problem #3: RPCs that conflict with auto-generated methods @@ -605,7 +659,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.initialize(request, options, callback); + this._log.info('initialize request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('initialize response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.initialize(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('initialize response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -667,7 +738,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.servicePath(request, options, callback); + this._log.info('servicePath request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('servicePath response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.servicePath(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('servicePath response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -729,7 +817,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.apiEndpoint(request, options, callback); + this._log.info('apiEndpoint request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('apiEndpoint response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.apiEndpoint(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('apiEndpoint response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -791,7 +896,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.port(request, options, callback); + this._log.info('port request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('port response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.port(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('port response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -853,7 +975,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.scopes(request, options, callback); + this._log.info('scopes request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('scopes response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.scopes(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('scopes response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -915,7 +1054,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.getProjectId(request, options, callback); + this._log.info('getProjectId request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getProjectId response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getProjectId(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('getProjectId response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -978,7 +1134,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.getReservedWord(request, options, callback); + this._log.info('getReservedWord request %j', request); + const wrappedCallback: Callback< + protos.google.naming.v1beta1.IReservedWord, + protos.google.naming.v1beta1.IGetReservedWordRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getReservedWord response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getReservedWord(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.naming.v1beta1.IReservedWord, + protos.google.naming.v1beta1.IGetReservedWordRequest|undefined, {}|undefined + ]) => { + this._log.info('getReservedWord response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -1040,7 +1213,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.createAbcdeSomething(request, options, callback); + this._log.info('createABCDESomething request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createABCDESomething response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createAbcdeSomething(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('createABCDESomething response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1106,7 +1296,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.longRunning(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('longRunning response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('longRunning request %j', request); + return this.innerApiCalls.longRunning(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('longRunning response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `longRunning()`. @@ -1120,6 +1327,7 @@ export class NamingClient { * region_tag:localhost_v1beta1_generated_Naming_LongRunning_async */ async checkLongRunningProgress1(name: string): Promise>{ + this._log.info('longRunning long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.longRunning, this._gaxModule.createDefaultBackoffSettings()); @@ -1195,7 +1403,26 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.paginatedMethod(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.naming.v1beta1.IPaginatedMethodRequest, + protos.google.naming.v1beta1.IPaginatedMethodResponse|null|undefined, + protos.google.protobuf.IEmpty>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('paginatedMethod values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('paginatedMethod request %j', request); + return this.innerApiCalls + .paginatedMethod(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.protobuf.IEmpty[], + protos.google.naming.v1beta1.IPaginatedMethodRequest|null, + protos.google.naming.v1beta1.IPaginatedMethodResponse + ]) => { + this._log.info('paginatedMethod values %j', response); + return [response, input, output]; + }); } /** @@ -1227,6 +1454,7 @@ export class NamingClient { const defaultCallSettings = this._defaults['paginatedMethod']; const callSettings = defaultCallSettings.merge(options); this.initialize1(); + this._log.info('paginatedMethod stream %j', request); return this.descriptors.page.paginatedMethod.createStream( this.innerApiCalls.paginatedMethod as GaxCall, request, @@ -1266,6 +1494,7 @@ export class NamingClient { const defaultCallSettings = this._defaults['paginatedMethod']; const callSettings = defaultCallSettings.merge(options); this.initialize1(); + this._log.info('paginatedMethod iterate %j', request); return this.descriptors.page.paginatedMethod.asyncIterate( this.innerApiCalls['paginatedMethod'] as GaxCall, request as {}, @@ -1357,6 +1586,7 @@ export class NamingClient { close(): Promise { if (this.namingStub && !this._terminated) { return this.namingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/redis/package.json b/baselines/redis/package.json index 72b5ff6dd..4f3369fc0 100644 --- a/baselines/redis/package.json +++ b/baselines/redis/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline index fbab82928..9d10e8e39 100644 --- a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -60,6 +61,8 @@ export class CloudRedisClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('redis'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -484,7 +487,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getInstance(request, options, callback); + this._log.info('getInstance request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.redis.v1beta1.IInstance, + protos.google.cloud.redis.v1beta1.IGetInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.redis.v1beta1.IInstance, + protos.google.cloud.redis.v1beta1.IGetInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('getInstance response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -581,7 +601,24 @@ export class CloudRedisClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('createInstance request %j', request); + return this.innerApiCalls.createInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('createInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `createInstance()`. @@ -595,6 +632,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_CreateInstance_async */ async checkCreateInstanceProgress(name: string): Promise>{ + this._log.info('createInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.createInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -684,7 +722,24 @@ export class CloudRedisClient { 'instance.name': request.instance!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('updateInstance request %j', request); + return this.innerApiCalls.updateInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('updateInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `updateInstance()`. @@ -698,6 +753,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_UpdateInstance_async */ async checkUpdateInstanceProgress(name: string): Promise>{ + this._log.info('updateInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.updateInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -784,7 +840,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.importInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IImportInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('importInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('importInstance request %j', request); + return this.innerApiCalls.importInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IImportInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('importInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `importInstance()`. @@ -798,6 +871,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_ImportInstance_async */ async checkImportInstanceProgress(name: string): Promise>{ + this._log.info('importInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.importInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -882,7 +956,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.exportInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IExportInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('exportInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('exportInstance request %j', request); + return this.innerApiCalls.exportInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IExportInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('exportInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `exportInstance()`. @@ -896,6 +987,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_ExportInstance_async */ async checkExportInstanceProgress(name: string): Promise>{ + this._log.info('exportInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.exportInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -977,7 +1069,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.failoverInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('failoverInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('failoverInstance request %j', request); + return this.innerApiCalls.failoverInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('failoverInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `failoverInstance()`. @@ -991,6 +1100,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_FailoverInstance_async */ async checkFailoverInstanceProgress(name: string): Promise>{ + this._log.info('failoverInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.failoverInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -1069,7 +1179,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('deleteInstance request %j', request); + return this.innerApiCalls.deleteInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `deleteInstance()`. @@ -1083,6 +1210,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_DeleteInstance_async */ async checkDeleteInstanceProgress(name: string): Promise>{ + this._log.info('deleteInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.deleteInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -1181,7 +1309,26 @@ export class CloudRedisClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listInstances(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.redis.v1beta1.IListInstancesRequest, + protos.google.cloud.redis.v1beta1.IListInstancesResponse|null|undefined, + protos.google.cloud.redis.v1beta1.IInstance>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listInstances values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listInstances request %j', request); + return this.innerApiCalls + .listInstances(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.redis.v1beta1.IInstance[], + protos.google.cloud.redis.v1beta1.IListInstancesRequest|null, + protos.google.cloud.redis.v1beta1.IListInstancesResponse + ]) => { + this._log.info('listInstances values %j', response); + return [response, input, output]; + }); } /** @@ -1230,6 +1377,7 @@ export class CloudRedisClient { const defaultCallSettings = this._defaults['listInstances']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInstances stream %j', request); return this.descriptors.page.listInstances.createStream( this.innerApiCalls.listInstances as GaxCall, request, @@ -1286,6 +1434,7 @@ export class CloudRedisClient { const defaultCallSettings = this._defaults['listInstances']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInstances iterate %j', request); return this.descriptors.page.listInstances.asyncIterate( this.innerApiCalls['listInstances'] as GaxCall, request as {}, @@ -1565,6 +1714,7 @@ export class CloudRedisClient { close(): Promise { if (this.cloudRedisStub && !this._terminated) { return this.cloudRedisStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/routingtest/package.json b/baselines/routingtest/package.json index 9f42a9614..143c2a104 100644 --- a/baselines/routingtest/package.json +++ b/baselines/routingtest/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/routingtest/src/v1/test_service_client.ts.baseline b/baselines/routingtest/src/v1/test_service_client.ts.baseline index 5a59e68e8..cff6f2821 100644 --- a/baselines/routingtest/src/v1/test_service_client.ts.baseline +++ b/baselines/routingtest/src/v1/test_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -47,6 +48,8 @@ export class TestServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('routingtest'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -397,7 +400,24 @@ export class TestServiceClient { routingParameter ); this.initialize(); - return this.innerApiCalls.fastFibonacci(request, options, callback); + this._log.info('fastFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('fastFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('fastFibonacci response %j', response); + return [response, options, rawResponse]; + }); } /** * Calculates Fibonacci on the provided value, randomly. @@ -494,7 +514,24 @@ export class TestServiceClient { routingParameter ); this.initialize(); - return this.innerApiCalls.randomFibonacci(request, options, callback); + this._log.info('randomFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('randomFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.randomFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('randomFibonacci response %j', response); + return [response, options, rawResponse]; + }); } /** * Calculates Fibonacci on the provided value, slowly. @@ -601,7 +638,24 @@ export class TestServiceClient { routingParameter ); this.initialize(); - return this.innerApiCalls.slowFibonacci(request, options, callback); + this._log.info('slowFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('slowFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('slowFibonacci response %j', response); + return [response, options, rawResponse]; + }); } @@ -614,6 +668,7 @@ export class TestServiceClient { close(): Promise { if (this.testServiceStub && !this._terminated) { return this.testServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase-legacy/package.json b/baselines/showcase-legacy/package.json index aeab6a109..48f131f74 100644 --- a/baselines/showcase-legacy/package.json +++ b/baselines/showcase-legacy/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline index ca5319c78..ff5c99dc6 100644 --- a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline @@ -21,6 +21,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import * as path from 'path'; +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -51,6 +52,8 @@ export class EchoClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -505,7 +508,24 @@ export class EchoClient { routingParameter ); this.initialize(); - return this.innerApiCalls.echo(request, options, callback); + this._log.info('echo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + ]) => { + this._log.info('echo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method returns error details in a repeated "google.protobuf.Any" @@ -579,7 +599,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.echoErrorDetails(request, options, callback); + this._log.info('echoErrorDetails request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echoErrorDetails response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + ]) => { + this._log.info('echoErrorDetails response %j', response); + return [response, options, rawResponse]; + }); } /** * This is similar to the PagedExpand except that it uses @@ -652,7 +689,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpandLegacy(request, options, callback); + this._log.info('pagedExpandLegacy request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pagedExpandLegacy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + ]) => { + this._log.info('pagedExpandLegacy response %j', response); + return [response, options, rawResponse]; + }); } /** * This method will block (wait) for the requested amount of time @@ -724,7 +778,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.block(request, options, callback); + this._log.info('block request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('block response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.block(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + ]) => { + this._log.info('block response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -757,6 +828,7 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); + this._log.info('expand stream %j', options); return this.innerApiCalls.expand(request, options); } @@ -803,6 +875,7 @@ export class EchoClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('collect stream %j', options); return this.innerApiCalls.collect(null, options, callback); } @@ -826,6 +899,7 @@ export class EchoClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('chat stream %j', options); return this.innerApiCalls.chat(null, options); } @@ -902,7 +976,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('wait request %j', request); + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `wait()`. @@ -916,6 +1007,7 @@ export class EchoClient { * region_tag:localhost_v1beta1_generated_Echo_Wait_async */ async checkWaitProgress(name: string): Promise>{ + this._log.info('wait long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.wait, this._gaxModule.createDefaultBackoffSettings()); @@ -994,7 +1086,26 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpand(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IPagedExpandRequest, + protos.google.showcase.v1beta1.IPagedExpandResponse|null|undefined, + protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('pagedExpand values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('pagedExpand request %j', request); + return this.innerApiCalls + .pagedExpand(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IEchoResponse[], + protos.google.showcase.v1beta1.IPagedExpandRequest|null, + protos.google.showcase.v1beta1.IPagedExpandResponse + ]) => { + this._log.info('pagedExpand values %j', response); + return [response, input, output]; + }); } /** @@ -1029,6 +1140,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand stream %j', request); return this.descriptors.page.pagedExpand.createStream( this.innerApiCalls.pagedExpand as GaxCall, request, @@ -1071,6 +1183,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand iterate %j', request); return this.descriptors.page.pagedExpand.asyncIterate( this.innerApiCalls['pagedExpand'] as GaxCall, request as {}, @@ -1087,6 +1200,7 @@ export class EchoClient { close(): Promise { if (this.echoStub && !this._terminated) { return this.echoStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/showcase/package.json b/baselines/showcase/package.json index 07895c925..56ed5fae5 100644 --- a/baselines/showcase/package.json +++ b/baselines/showcase/package.json @@ -40,7 +40,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/showcase/src/v1beta1/compliance_client.ts.baseline b/baselines/showcase/src/v1beta1/compliance_client.ts.baseline index 360766ba7..267af605a 100644 --- a/baselines/showcase/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/compliance_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -48,6 +49,8 @@ export class ComplianceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -431,7 +434,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBody(request, options, callback); + this._log.info('repeatDataBody request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBody response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBody response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -511,7 +531,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyInfo(request, options, callback); + this._log.info('repeatDataBodyInfo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyInfo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyInfo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -590,7 +627,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataQuery(request, options, callback); + this._log.info('repeatDataQuery request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataQuery response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataQuery response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -679,7 +733,24 @@ export class ComplianceClient { 'info.f_kingdom': request.info!.fKingdom ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataSimplePath(request, options, callback); + this._log.info('repeatDataSimplePath request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataSimplePath response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataSimplePath response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a path resource. @@ -764,7 +835,24 @@ export class ComplianceClient { 'info.f_bool': request.info!.fBool ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathResource(request, options, callback); + this._log.info('repeatDataPathResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathResource response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a trailing resource. @@ -848,7 +936,24 @@ export class ComplianceClient { 'info.f_child.f_string': request.info!.fChild!.fString ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathTrailingResource(request, options, callback); + this._log.info('repeatDataPathTrailingResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PUT method. @@ -926,7 +1031,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPut(request, options, callback); + this._log.info('repeatDataBodyPut request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPut response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPut response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PATCH method. @@ -1004,7 +1126,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPatch(request, options, callback); + this._log.info('repeatDataBodyPatch request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPatch response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPatch response %j', response); + return [response, options, rawResponse]; + }); } /** * This method requests an enum value from the server. Depending on the contents of EnumRequest, the enum value returned will be a known enum declared in the @@ -1074,7 +1213,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.getEnum(request, options, callback); + this._log.info('getEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|undefined, {}|undefined + ]) => { + this._log.info('getEnum response %j', response); + return [response, options, rawResponse]; + }); } /** * This method is used to verify that clients can round-trip enum values, which is particularly important for unknown enum values over REST. VerifyEnum() @@ -1146,7 +1302,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.verifyEnum(request, options, callback); + this._log.info('verifyEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|undefined, {}|undefined + ]) => { + this._log.info('verifyEnum response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -1532,6 +1705,7 @@ export class ComplianceClient { close(): Promise { if (this.complianceStub && !this._terminated) { return this.complianceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase/src/v1beta1/echo_client.ts.baseline b/baselines/showcase/src/v1beta1/echo_client.ts.baseline index 84fcd0896..ea59a18a5 100644 --- a/baselines/showcase/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/echo_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -52,6 +53,8 @@ export class EchoClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -575,7 +578,24 @@ export class EchoClient { routingParameter ); this.initialize(); - return this.innerApiCalls.echo(request, options, callback); + this._log.info('echo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + ]) => { + this._log.info('echo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method returns error details in a repeated "google.protobuf.Any" @@ -649,7 +669,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.echoErrorDetails(request, options, callback); + this._log.info('echoErrorDetails request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echoErrorDetails response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + ]) => { + this._log.info('echoErrorDetails response %j', response); + return [response, options, rawResponse]; + }); } /** * This is similar to the PagedExpand except that it uses @@ -722,7 +759,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpandLegacy(request, options, callback); + this._log.info('pagedExpandLegacy request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pagedExpandLegacy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + ]) => { + this._log.info('pagedExpandLegacy response %j', response); + return [response, options, rawResponse]; + }); } /** * This method will block (wait) for the requested amount of time @@ -794,7 +848,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.block(request, options, callback); + this._log.info('block request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('block response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.block(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + ]) => { + this._log.info('block response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -827,6 +898,7 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); + this._log.info('expand stream %j', options); return this.innerApiCalls.expand(request, options); } @@ -873,6 +945,7 @@ export class EchoClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('collect stream %j', options); return this.innerApiCalls.collect(null, options, callback); } @@ -896,6 +969,7 @@ export class EchoClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('chat stream %j', options); return this.innerApiCalls.chat(null, options); } @@ -972,7 +1046,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('wait request %j', request); + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `wait()`. @@ -986,6 +1077,7 @@ export class EchoClient { * region_tag:localhost_v1beta1_generated_Echo_Wait_async */ async checkWaitProgress(name: string): Promise>{ + this._log.info('wait long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.wait, this._gaxModule.createDefaultBackoffSettings()); @@ -1064,7 +1156,26 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpand(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IPagedExpandRequest, + protos.google.showcase.v1beta1.IPagedExpandResponse|null|undefined, + protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('pagedExpand values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('pagedExpand request %j', request); + return this.innerApiCalls + .pagedExpand(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IEchoResponse[], + protos.google.showcase.v1beta1.IPagedExpandRequest|null, + protos.google.showcase.v1beta1.IPagedExpandResponse + ]) => { + this._log.info('pagedExpand values %j', response); + return [response, input, output]; + }); } /** @@ -1099,6 +1210,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand stream %j', request); return this.descriptors.page.pagedExpand.createStream( this.innerApiCalls.pagedExpand as GaxCall, request, @@ -1141,6 +1253,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand iterate %j', request); return this.descriptors.page.pagedExpand.asyncIterate( this.innerApiCalls['pagedExpand'] as GaxCall, request as {}, @@ -1530,6 +1643,7 @@ export class EchoClient { close(): Promise { if (this.echoStub && !this._terminated) { return this.echoStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/showcase/src/v1beta1/identity_client.ts.baseline b/baselines/showcase/src/v1beta1/identity_client.ts.baseline index 6ab95d796..acd90ccff 100644 --- a/baselines/showcase/src/v1beta1/identity_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/identity_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class IdentityClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -424,7 +427,24 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createUser(request, options, callback); + this._log.info('createUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('createUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the User with the given uri. @@ -494,7 +514,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getUser(request, options, callback); + this._log.info('getUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|undefined, {}|undefined + ]) => { + this._log.info('getUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a user. @@ -567,7 +604,24 @@ export class IdentityClient { 'user.name': request.user!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateUser(request, options, callback); + this._log.info('updateUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('updateUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a user, their profile, and all of their authored messages. @@ -637,7 +691,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteUser(request, options, callback); + this._log.info('deleteUser request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteUser response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -713,7 +784,26 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listUsers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListUsersRequest, + protos.google.showcase.v1beta1.IListUsersResponse|null|undefined, + protos.google.showcase.v1beta1.IUser>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUsers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUsers request %j', request); + return this.innerApiCalls + .listUsers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IUser[], + protos.google.showcase.v1beta1.IListUsersRequest|null, + protos.google.showcase.v1beta1.IListUsersResponse + ]) => { + this._log.info('listUsers values %j', response); + return [response, input, output]; + }); } /** @@ -749,6 +839,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers stream %j', request); return this.descriptors.page.listUsers.createStream( this.innerApiCalls.listUsers as GaxCall, request, @@ -792,6 +883,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers iterate %j', request); return this.descriptors.page.listUsers.asyncIterate( this.innerApiCalls['listUsers'] as GaxCall, request as {}, @@ -1181,6 +1273,7 @@ export class IdentityClient { close(): Promise { if (this.identityStub && !this._terminated) { return this.identityStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline index 971795581..d6b110730 100644 --- a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -49,6 +50,8 @@ export class MessagingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -475,7 +478,24 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createRoom(request, options, callback); + this._log.info('createRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('createRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Room with the given resource name. @@ -545,7 +565,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getRoom(request, options, callback); + this._log.info('getRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('getRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a room. @@ -618,7 +655,24 @@ export class MessagingClient { 'room.name': request.room!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateRoom(request, options, callback); + this._log.info('updateRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('updateRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a room and all of its blurbs. @@ -688,7 +742,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteRoom(request, options, callback); + this._log.info('deleteRoom request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a blurb. If the parent is a room, the blurb is understood to be a @@ -763,7 +834,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createBlurb(request, options, callback); + this._log.info('createBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('createBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Blurb with the given resource name. @@ -833,7 +921,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getBlurb(request, options, callback); + this._log.info('getBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('getBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a blurb. @@ -906,7 +1011,24 @@ export class MessagingClient { 'blurb.name': request.blurb!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateBlurb(request, options, callback); + this._log.info('updateBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('updateBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a blurb. @@ -976,7 +1098,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteBlurb(request, options, callback); + this._log.info('deleteBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1012,6 +1151,7 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); + this._log.info('streamBlurbs stream %j', options); return this.innerApiCalls.streamBlurbs(request, options); } @@ -1057,6 +1197,7 @@ export class MessagingClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('sendBlurbs stream %j', options); return this.innerApiCalls.sendBlurbs(null, options, callback); } @@ -1081,6 +1222,7 @@ export class MessagingClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('connect stream %j', options); return this.innerApiCalls.connect(null, options); } @@ -1169,7 +1311,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.searchBlurbs(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('searchBlurbs response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('searchBlurbs request %j', request); + return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ]) => { + this._log.info('searchBlurbs response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `searchBlurbs()`. @@ -1183,6 +1342,7 @@ export class MessagingClient { * region_tag:localhost_v1beta1_generated_Messaging_SearchBlurbs_async */ async checkSearchBlurbsProgress(name: string): Promise>{ + this._log.info('searchBlurbs long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.searchBlurbs, this._gaxModule.createDefaultBackoffSettings()); @@ -1261,7 +1421,26 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listRooms(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListRoomsRequest, + protos.google.showcase.v1beta1.IListRoomsResponse|null|undefined, + protos.google.showcase.v1beta1.IRoom>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRooms values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRooms request %j', request); + return this.innerApiCalls + .listRooms(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IRoom[], + protos.google.showcase.v1beta1.IListRoomsRequest|null, + protos.google.showcase.v1beta1.IListRoomsResponse + ]) => { + this._log.info('listRooms values %j', response); + return [response, input, output]; + }); } /** @@ -1297,6 +1476,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms stream %j', request); return this.descriptors.page.listRooms.createStream( this.innerApiCalls.listRooms as GaxCall, request, @@ -1340,6 +1520,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms iterate %j', request); return this.descriptors.page.listRooms.asyncIterate( this.innerApiCalls['listRooms'] as GaxCall, request as {}, @@ -1428,7 +1609,26 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listBlurbs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListBlurbsRequest, + protos.google.showcase.v1beta1.IListBlurbsResponse|null|undefined, + protos.google.showcase.v1beta1.IBlurb>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listBlurbs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listBlurbs request %j', request); + return this.innerApiCalls + .listBlurbs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IBlurb[], + protos.google.showcase.v1beta1.IListBlurbsRequest|null, + protos.google.showcase.v1beta1.IListBlurbsResponse + ]) => { + this._log.info('listBlurbs values %j', response); + return [response, input, output]; + }); } /** @@ -1472,6 +1672,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs stream %j', request); return this.descriptors.page.listBlurbs.createStream( this.innerApiCalls.listBlurbs as GaxCall, request, @@ -1523,6 +1724,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs iterate %j', request); return this.descriptors.page.listBlurbs.asyncIterate( this.innerApiCalls['listBlurbs'] as GaxCall, request as {}, @@ -1912,6 +2114,7 @@ export class MessagingClient { close(): Promise { if (this.messagingStub && !this._terminated) { return this.messagingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline b/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline index fdd719218..f489bc18e 100644 --- a/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -45,6 +46,8 @@ export class SequenceServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -413,7 +416,24 @@ export class SequenceServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSequence(request, options, callback); + this._log.info('createSequence request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('createSequence response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves a sequence. @@ -482,7 +502,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSequenceReport(request, options, callback); + this._log.info('getSequenceReport request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSequenceReport response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, {}|undefined + ]) => { + this._log.info('getSequenceReport response %j', response); + return [response, options, rawResponse]; + }); } /** * Attempts a sequence. @@ -551,7 +588,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.attemptSequence(request, options, callback); + this._log.info('attemptSequence request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('attemptSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('attemptSequence response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -937,6 +991,7 @@ export class SequenceServiceClient { close(): Promise { if (this.sequenceServiceStub && !this._terminated) { return this.sequenceServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase/src/v1beta1/testing_client.ts.baseline b/baselines/showcase/src/v1beta1/testing_client.ts.baseline index 5f2dacec1..d53207466 100644 --- a/baselines/showcase/src/v1beta1/testing_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/testing_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -47,6 +48,8 @@ export class TestingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -429,7 +432,24 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSession(request, options, callback); + this._log.info('createSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('createSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a testing session. @@ -499,7 +519,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSession(request, options, callback); + this._log.info('getSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('getSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Delete a test session. @@ -569,7 +606,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteSession(request, options, callback); + this._log.info('deleteSession request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Report on the status of a session. @@ -641,7 +695,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.reportSession(request, options, callback); + this._log.info('reportSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('reportSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.reportSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('reportSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Explicitly decline to implement a test. @@ -716,7 +787,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTest(request, options, callback); + this._log.info('deleteTest request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTest response %j', response); + return [response, options, rawResponse]; + }); } /** * Register a response to a test. @@ -793,7 +881,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.verifyTest(request, options, callback); + this._log.info('verifyTest request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, {}|undefined + ]) => { + this._log.info('verifyTest response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -866,7 +971,26 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listSessions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListSessionsRequest, + protos.google.showcase.v1beta1.IListSessionsResponse|null|undefined, + protos.google.showcase.v1beta1.ISession>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSessions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listSessions request %j', request); + return this.innerApiCalls + .listSessions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ISession[], + protos.google.showcase.v1beta1.IListSessionsRequest|null, + protos.google.showcase.v1beta1.IListSessionsResponse + ]) => { + this._log.info('listSessions values %j', response); + return [response, input, output]; + }); } /** @@ -899,6 +1023,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions stream %j', request); return this.descriptors.page.listSessions.createStream( this.innerApiCalls.listSessions as GaxCall, request, @@ -939,6 +1064,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions iterate %j', request); return this.descriptors.page.listSessions.asyncIterate( this.innerApiCalls['listSessions'] as GaxCall, request as {}, @@ -1022,7 +1148,26 @@ export class TestingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listTests(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListTestsRequest, + protos.google.showcase.v1beta1.IListTestsResponse|null|undefined, + protos.google.showcase.v1beta1.ITest>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTests values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTests request %j', request); + return this.innerApiCalls + .listTests(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ITest[], + protos.google.showcase.v1beta1.IListTestsRequest|null, + protos.google.showcase.v1beta1.IListTestsResponse + ]) => { + this._log.info('listTests values %j', response); + return [response, input, output]; + }); } /** @@ -1062,6 +1207,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests stream %j', request); return this.descriptors.page.listTests.createStream( this.innerApiCalls.listTests as GaxCall, request, @@ -1109,6 +1255,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests iterate %j', request); return this.descriptors.page.listTests.asyncIterate( this.innerApiCalls['listTests'] as GaxCall, request as {}, @@ -1498,6 +1645,7 @@ export class TestingClient { close(): Promise { if (this.testingStub && !this._terminated) { return this.testingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/tasks/package.json b/baselines/tasks/package.json index 744935b20..728517b2b 100644 --- a/baselines/tasks/package.json +++ b/baselines/tasks/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline b/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline index bcb12200e..196819ffd 100644 --- a/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline +++ b/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, PaginationCallba import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -47,6 +48,8 @@ export class CloudTasksClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('tasks'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -405,7 +408,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getQueue(request, options, callback); + this._log.info('getQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IGetQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IGetQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('getQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a queue. @@ -495,7 +515,24 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createQueue(request, options, callback); + this._log.info('createQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.ICreateQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.ICreateQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('createQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a queue. @@ -589,7 +626,24 @@ export class CloudTasksClient { 'queue.name': request.queue!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateQueue(request, options, callback); + this._log.info('updateQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IUpdateQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IUpdateQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('updateQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a queue. @@ -672,7 +726,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteQueue(request, options, callback); + this._log.info('deleteQueue request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Purges a queue by deleting all of its tasks. @@ -748,7 +819,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.purgeQueue(request, options, callback); + this._log.info('purgeQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPurgeQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('purgeQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.purgeQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPurgeQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('purgeQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Pauses the queue. @@ -825,7 +913,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.pauseQueue(request, options, callback); + this._log.info('pauseQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPauseQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pauseQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pauseQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPauseQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('pauseQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Resume a queue. @@ -908,7 +1013,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.resumeQueue(request, options, callback); + this._log.info('resumeQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IResumeQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('resumeQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.resumeQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IResumeQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('resumeQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the access control policy for a {@link protos.google.cloud.tasks.v2.Queue|Queue}. @@ -990,7 +1112,24 @@ export class CloudTasksClient { 'resource': request.resource ?? '', }); this.initialize(); - return this.innerApiCalls.getIamPolicy(request, options, callback); + this._log.info('getIamPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.IGetIamPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getIamPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getIamPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.IGetIamPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('getIamPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Sets the access control policy for a {@link protos.google.cloud.tasks.v2.Queue|Queue}. Replaces any existing @@ -1076,7 +1215,24 @@ export class CloudTasksClient { 'resource': request.resource ?? '', }); this.initialize(); - return this.innerApiCalls.setIamPolicy(request, options, callback); + this._log.info('setIamPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.ISetIamPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('setIamPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.setIamPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.ISetIamPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('setIamPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns permissions that a caller has on a {@link protos.google.cloud.tasks.v2.Queue|Queue}. @@ -1158,7 +1314,24 @@ export class CloudTasksClient { 'resource': request.resource ?? '', }); this.initialize(); - return this.innerApiCalls.testIamPermissions(request, options, callback); + this._log.info('testIamPermissions request %j', request); + const wrappedCallback: Callback< + protos.google.iam.v1.ITestIamPermissionsResponse, + protos.google.iam.v1.ITestIamPermissionsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('testIamPermissions response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.testIamPermissions(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.iam.v1.ITestIamPermissionsResponse, + protos.google.iam.v1.ITestIamPermissionsRequest|undefined, {}|undefined + ]) => { + this._log.info('testIamPermissions response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a task. @@ -1242,7 +1415,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getTask(request, options, callback); + this._log.info('getTask request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IGetTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IGetTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('getTask response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a task and adds it to a queue. @@ -1366,7 +1556,24 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createTask(request, options, callback); + this._log.info('createTask request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.ICreateTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.ICreateTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('createTask response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a task. @@ -1441,7 +1648,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTask(request, options, callback); + this._log.info('deleteTask request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTask response %j', response); + return [response, options, rawResponse]; + }); } /** * Forces a task to run now. @@ -1548,7 +1772,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.runTask(request, options, callback); + this._log.info('runTask request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IRunTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('runTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.runTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IRunTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('runTask response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1656,7 +1897,26 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listQueues(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.tasks.v2.IListQueuesRequest, + protos.google.cloud.tasks.v2.IListQueuesResponse|null|undefined, + protos.google.cloud.tasks.v2.IQueue>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listQueues values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listQueues request %j', request); + return this.innerApiCalls + .listQueues(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.tasks.v2.IQueue[], + protos.google.cloud.tasks.v2.IListQueuesRequest|null, + protos.google.cloud.tasks.v2.IListQueuesResponse + ]) => { + this._log.info('listQueues values %j', response); + return [response, input, output]; + }); } /** @@ -1722,6 +1982,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listQueues']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listQueues stream %j', request); return this.descriptors.page.listQueues.createStream( this.innerApiCalls.listQueues as GaxCall, request, @@ -1795,6 +2056,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listQueues']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listQueues iterate %j', request); return this.descriptors.page.listQueues.asyncIterate( this.innerApiCalls['listQueues'] as GaxCall, request as {}, @@ -1915,7 +2177,26 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listTasks(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.tasks.v2.IListTasksRequest, + protos.google.cloud.tasks.v2.IListTasksResponse|null|undefined, + protos.google.cloud.tasks.v2.ITask>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTasks values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTasks request %j', request); + return this.innerApiCalls + .listTasks(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.tasks.v2.ITask[], + protos.google.cloud.tasks.v2.IListTasksRequest|null, + protos.google.cloud.tasks.v2.IListTasksResponse + ]) => { + this._log.info('listTasks values %j', response); + return [response, input, output]; + }); } /** @@ -1984,6 +2265,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listTasks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTasks stream %j', request); return this.descriptors.page.listTasks.createStream( this.innerApiCalls.listTasks as GaxCall, request, @@ -2060,6 +2342,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listTasks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTasks iterate %j', request); return this.descriptors.page.listTasks.asyncIterate( this.innerApiCalls['listTasks'] as GaxCall, request as {}, @@ -2190,6 +2473,7 @@ export class CloudTasksClient { close(): Promise { if (this.cloudTasksStub && !this._terminated) { return this.cloudTasksStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/texttospeech/package.json b/baselines/texttospeech/package.json index 8839a2bf9..b4b715035 100644 --- a/baselines/texttospeech/package.json +++ b/baselines/texttospeech/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline index 26d2dc853..32318871e 100644 --- a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline +++ b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class TextToSpeechClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('text-to-speech'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -381,7 +384,24 @@ export class TextToSpeechClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listVoices(request, options, callback); + this._log.info('listVoices request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.texttospeech.v1.IListVoicesResponse, + protos.google.cloud.texttospeech.v1.IListVoicesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('listVoices response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.listVoices(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.texttospeech.v1.IListVoicesResponse, + protos.google.cloud.texttospeech.v1.IListVoicesRequest|undefined, {}|undefined + ]) => { + this._log.info('listVoices response %j', response); + return [response, options, rawResponse]; + }); } /** * Synthesizes speech synchronously: receive results after all text input @@ -451,7 +471,24 @@ export class TextToSpeechClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.synthesizeSpeech(request, options, callback); + this._log.info('synthesizeSpeech request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechResponse, + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('synthesizeSpeech response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.synthesizeSpeech(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechResponse, + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechRequest|undefined, {}|undefined + ]) => { + this._log.info('synthesizeSpeech response %j', response); + return [response, options, rawResponse]; + }); } @@ -464,6 +501,7 @@ export class TextToSpeechClient { close(): Promise { if (this.textToSpeechStub && !this._terminated) { return this.textToSpeechStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/translate/package.json b/baselines/translate/package.json index 0ec36aa27..84753257e 100644 --- a/baselines/translate/package.json +++ b/baselines/translate/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline index 0de1b108a..6d134df58 100644 --- a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class TranslationServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('translation'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -505,7 +508,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.translateText(request, options, callback); + this._log.info('translateText request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.ITranslateTextResponse, + protos.google.cloud.translation.v3beta1.ITranslateTextRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('translateText response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.translateText(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.ITranslateTextResponse, + protos.google.cloud.translation.v3beta1.ITranslateTextRequest|undefined, {}|undefined + ]) => { + this._log.info('translateText response %j', response); + return [response, options, rawResponse]; + }); } /** * Detects the language of text within a request. @@ -609,7 +629,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.detectLanguage(request, options, callback); + this._log.info('detectLanguage request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.IDetectLanguageResponse, + protos.google.cloud.translation.v3beta1.IDetectLanguageRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('detectLanguage response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.detectLanguage(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.IDetectLanguageResponse, + protos.google.cloud.translation.v3beta1.IDetectLanguageRequest|undefined, {}|undefined + ]) => { + this._log.info('detectLanguage response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns a list of supported languages for translation. @@ -710,7 +747,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.getSupportedLanguages(request, options, callback); + this._log.info('getSupportedLanguages request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.ISupportedLanguages, + protos.google.cloud.translation.v3beta1.IGetSupportedLanguagesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSupportedLanguages response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSupportedLanguages(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.ISupportedLanguages, + protos.google.cloud.translation.v3beta1.IGetSupportedLanguagesRequest|undefined, {}|undefined + ]) => { + this._log.info('getSupportedLanguages response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a glossary. Returns NOT_FOUND, if the glossary doesn't @@ -781,7 +835,24 @@ export class TranslationServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getGlossary(request, options, callback); + this._log.info('getGlossary request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.IGlossary, + protos.google.cloud.translation.v3beta1.IGetGlossaryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getGlossary response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getGlossary(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.IGlossary, + protos.google.cloud.translation.v3beta1.IGetGlossaryRequest|undefined, {}|undefined + ]) => { + this._log.info('getGlossary response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -910,7 +981,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.batchTranslateText(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('batchTranslateText response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('batchTranslateText request %j', request); + return this.innerApiCalls.batchTranslateText(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|undefined, {}|undefined + ]) => { + this._log.info('batchTranslateText response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `batchTranslateText()`. @@ -924,6 +1012,7 @@ export class TranslationServiceClient { * region_tag:translate_v3beta1_generated_TranslationService_BatchTranslateText_async */ async checkBatchTranslateTextProgress(name: string): Promise>{ + this._log.info('batchTranslateText long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.batchTranslateText, this._gaxModule.createDefaultBackoffSettings()); @@ -1002,7 +1091,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createGlossary(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createGlossary response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('createGlossary request %j', request); + return this.innerApiCalls.createGlossary(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|undefined, {}|undefined + ]) => { + this._log.info('createGlossary response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `createGlossary()`. @@ -1016,6 +1122,7 @@ export class TranslationServiceClient { * region_tag:translate_v3beta1_generated_TranslationService_CreateGlossary_async */ async checkCreateGlossaryProgress(name: string): Promise>{ + this._log.info('createGlossary long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.createGlossary, this._gaxModule.createDefaultBackoffSettings()); @@ -1093,7 +1200,24 @@ export class TranslationServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteGlossary(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteGlossary response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('deleteGlossary request %j', request); + return this.innerApiCalls.deleteGlossary(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteGlossary response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `deleteGlossary()`. @@ -1107,6 +1231,7 @@ export class TranslationServiceClient { * region_tag:translate_v3beta1_generated_TranslationService_DeleteGlossary_async */ async checkDeleteGlossaryProgress(name: string): Promise>{ + this._log.info('deleteGlossary long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.deleteGlossary, this._gaxModule.createDefaultBackoffSettings()); @@ -1198,7 +1323,26 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listGlossaries(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.translation.v3beta1.IListGlossariesRequest, + protos.google.cloud.translation.v3beta1.IListGlossariesResponse|null|undefined, + protos.google.cloud.translation.v3beta1.IGlossary>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listGlossaries values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listGlossaries request %j', request); + return this.innerApiCalls + .listGlossaries(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.translation.v3beta1.IGlossary[], + protos.google.cloud.translation.v3beta1.IListGlossariesRequest|null, + protos.google.cloud.translation.v3beta1.IListGlossariesResponse + ]) => { + this._log.info('listGlossaries values %j', response); + return [response, input, output]; + }); } /** @@ -1246,6 +1390,7 @@ export class TranslationServiceClient { const defaultCallSettings = this._defaults['listGlossaries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGlossaries stream %j', request); return this.descriptors.page.listGlossaries.createStream( this.innerApiCalls.listGlossaries as GaxCall, request, @@ -1301,6 +1446,7 @@ export class TranslationServiceClient { const defaultCallSettings = this._defaults['listGlossaries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGlossaries iterate %j', request); return this.descriptors.page.listGlossaries.asyncIterate( this.innerApiCalls['listGlossaries'] as GaxCall, request as {}, @@ -1405,6 +1551,7 @@ export class TranslationServiceClient { close(): Promise { if (this.translationServiceStub && !this._terminated) { return this.translationServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/videointelligence/package.json b/baselines/videointelligence/package.json index 2ce4688ce..34b148ff2 100644 --- a/baselines/videointelligence/package.json +++ b/baselines/videointelligence/package.json @@ -35,7 +35,8 @@ "test": "c8 mocha build/test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "next" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline index b18fe88a6..027e34c3b 100644 --- a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline +++ b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline @@ -22,6 +22,7 @@ import type {Callback, CallOptions, Descriptors, ClientOptions, GrpcClientOption import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -46,6 +47,8 @@ export class VideoIntelligenceServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('videointelligence'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -435,7 +438,24 @@ export class VideoIntelligenceServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.annotateVideo(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('annotateVideo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('annotateVideo request %j', request); + return this.innerApiCalls.annotateVideo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|undefined, {}|undefined + ]) => { + this._log.info('annotateVideo response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `annotateVideo()`. @@ -449,6 +469,7 @@ export class VideoIntelligenceServiceClient { * region_tag:videointelligence_v1_generated_VideoIntelligenceService_AnnotateVideo_async */ async checkAnnotateVideoProgress(name: string): Promise>{ + this._log.info('annotateVideo long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.annotateVideo, this._gaxModule.createDefaultBackoffSettings()); @@ -464,6 +485,7 @@ export class VideoIntelligenceServiceClient { close(): Promise { if (this.videoIntelligenceServiceStub && !this._terminated) { return this.videoIntelligenceServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); From 33dfa6b3f191183529a6d9d1c57017fd893b9d7b Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:13:32 +0000 Subject: [PATCH 09/24] feat: update esm templates as well --- .../esm/src/$version/$service_client.ts.njk | 92 +++++++++++++++++-- 1 file changed, 82 insertions(+), 10 deletions(-) diff --git a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk index 54e4b7daf..61c97a22d 100644 --- a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk +++ b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk @@ -50,6 +50,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -86,6 +87,7 @@ export class {{ service.name }}Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('{{api.loggingName}}'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -668,17 +670,44 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + this._log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback) - .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', response); + callback(error, response, nextRequest, rawResponse); + } + : undefined; + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', response); + return [ + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; - }); + }); {%- else %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback); + const wrappedCallback: Callback< + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined + ]) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', response); + return [response, options, rawResponse]; + }); {%- endif %} } {%- endfor %} @@ -701,6 +730,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + this._log.info('{{ method.name.toCamelCase() }} stream %j', options); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options); } {%- elif method.serverStreaming %} @@ -724,6 +754,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + this._log.info('{{ method.name.toCamelCase() }} stream %j', options); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options); } {%- elif method.clientStreaming %} @@ -769,6 +800,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + this._log.info('{{ method.name.toCamelCase() }} stream %j', options); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(null, options, callback); } {%- endif %} @@ -836,7 +868,24 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback); + const wrappedCallback: Callback< + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('{{ method.name.toCamelCase() }} request %j', request); + return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined + ]) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', response); + return [response, options, rawResponse]; + }); } /** {%- set decodeMethodName = id.get("check" + method.name.toPascalCase() + "Progress") -%} @@ -853,6 +902,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{decodeMethodName}}','{{decodeMethodName}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + this._log.info('{{method.name.toCamelCase()}} long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.{{ method.name.toCamelCase() }}, this._gaxModule.createDefaultBackoffSettings()); @@ -929,7 +979,26 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} - return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, callback); + const wrappedCallback: PaginationCallback< + {{ util.toInterface(method.inputInterface) }}, + {{ util.toInterface(method.outputInterface) }}|null|undefined, + {{ util.toInterface(method.pagingResponseType) }}>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('{{ method.name.toCamelCase() }} values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('{{ method.name.toCamelCase() }} request %j', request); + return this.innerApiCalls + .{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + {{ util.toInterface(method.pagingResponseType) }}[], + {{ util.toInterface(method.inputInterface) }}|null, + {{ util.toInterface(method.outputInterface) }} + ]) => { + this._log.info('{{ method.name.toCamelCase() }} values %j', response); + return [response, input, output]; + }); } /** @@ -954,6 +1023,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + this._log.info('{{ method.name.toCamelCase() }} stream %j', request); return this.descriptors.page.{{ method.name.toCamelCase() }}.createStream( this.innerApiCalls.{{ method.name.toCamelCase(true) }} as GaxCall, request, @@ -992,6 +1062,7 @@ export class {{ service.name }}Client { {%- if method.options and method.options.deprecated %} this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} + this._log.info('{{ method.name.toCamelCase() }} iterate %j', request); return this.descriptors.page.{{ method.name.toCamelCase() }}.asyncIterate( this.innerApiCalls['{{ method.name.toCamelCase(true) }}'] as GaxCall, request as {}, @@ -1064,6 +1135,7 @@ export class {{ service.name }}Client { {{ id.get("close") }}(): Promise { if (this.{{ service.name.toCamelCase() }}Stub && !this._terminated) { return this.{{ service.name.toCamelCase() }}Stub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); {%- if service.IAMPolicyMixin > 0 %} From e8abb7ba4d40b88c5e94aa9ef9478b669e02f6b3 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Thu, 19 Dec 2024 21:43:02 +0000 Subject: [PATCH 10/24] tests: update baselines for esm changes --- .../src/v1/asset_service_client.ts.baseline | 137 +++- .../big_query_storage_client.ts.baseline | 80 ++- .../src/v2/dataset_service_client.ts.baseline | 140 +++- .../esm/src/v2/job_service_client.ts.baseline | 140 +++- .../src/v2/model_service_client.ts.baseline | 83 ++- .../src/v2/project_service_client.ts.baseline | 22 +- .../src/v2/routine_service_client.ts.baseline | 121 +++- ...w_access_policy_service_client.ts.baseline | 26 +- .../src/v2/table_service_client.ts.baseline | 121 +++- .../esm/src/v1/addresses_client.ts.baseline | 77 ++- .../v1/region_operations_client.ts.baseline | 41 +- .../v1/deprecated_service_client.ts.baseline | 41 +- .../src/v1beta1/compliance_client.ts.baseline | 193 +++++- .../esm/src/v1beta1/echo_client.ts.baseline | 125 +++- .../src/v1beta1/identity_client.ts.baseline | 102 ++- .../src/v1beta1/messaging_client.ts.baseline | 224 ++++++- .../sequence_service_client.ts.baseline | 60 +- .../src/v1beta1/testing_client.ts.baseline | 163 ++++- .../esm/src/v2/dlp_service_client.ts.baseline | 612 +++++++++++++++++- .../key_management_service_client.ts.baseline | 456 ++++++++++++- .../v2/config_service_v2_client.ts.baseline | 514 ++++++++++++++- .../v2/logging_service_v2_client.ts.baseline | 111 +++- .../v2/metrics_service_v2_client.ts.baseline | 102 ++- .../alert_policy_service_client.ts.baseline | 102 ++- .../src/v3/group_service_client.ts.baseline | 125 +++- .../src/v3/metric_service_client.ts.baseline | 167 ++++- ...ication_channel_service_client.ts.baseline | 201 +++++- ...vice_monitoring_service_client.ts.baseline | 201 +++++- .../uptime_check_service_client.ts.baseline | 125 +++- .../esm/src/v1beta1/naming_client.ts.baseline | 255 +++++++- .../v1beta1/cloud_redis_client.ts.baseline | 165 ++++- .../src/v1/test_service_client.ts.baseline | 60 +- .../src/v1beta1/compliance_client.ts.baseline | 193 +++++- .../esm/src/v1beta1/echo_client.ts.baseline | 125 +++- .../src/v1beta1/identity_client.ts.baseline | 102 ++- .../src/v1beta1/messaging_client.ts.baseline | 224 ++++++- .../sequence_service_client.ts.baseline | 60 +- .../src/v1beta1/testing_client.ts.baseline | 163 ++++- .../esm/src/v1beta1/echo_client.ts.baseline | 125 +++- .../esm/src/v2/cloud_tasks_client.ts.baseline | 315 ++++++++- .../src/v1/text_to_speech_client.ts.baseline | 41 +- .../translation_service_client.ts.baseline | 162 ++++- ...eo_intelligence_service_client.ts.baseline | 23 +- 43 files changed, 6285 insertions(+), 340 deletions(-) diff --git a/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline b/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline index aeb3942e2..d56a21b20 100644 --- a/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline +++ b/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class AssetServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('asset'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -472,7 +474,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.batchGetAssetsHistory(request, options, callback); + this._log.info('batchGetAssetsHistory request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryResponse, + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('batchGetAssetsHistory response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.batchGetAssetsHistory(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryResponse, + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|undefined, {}|undefined + ]) => { + this._log.info('batchGetAssetsHistory response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a feed in a parent project/folder/organization to listen to its @@ -556,7 +575,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createFeed(request, options, callback); + this._log.info('createFeed request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.ICreateFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.ICreateFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('createFeed response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets details about an asset feed. @@ -629,7 +665,24 @@ export class AssetServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getFeed(request, options, callback); + this._log.info('getFeed request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IGetFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IGetFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('getFeed response %j', response); + return [response, options, rawResponse]; + }); } /** * Lists all asset feeds in a parent project/folder/organization. @@ -701,7 +754,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listFeeds(request, options, callback); + this._log.info('listFeeds request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IListFeedsResponse, + protos.google.cloud.asset.v1.IListFeedsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('listFeeds response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.listFeeds(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IListFeedsResponse, + protos.google.cloud.asset.v1.IListFeedsRequest|undefined, {}|undefined + ]) => { + this._log.info('listFeeds response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an asset feed configuration. @@ -779,7 +849,24 @@ export class AssetServiceClient { 'feed.name': request.feed!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateFeed(request, options, callback); + this._log.info('updateFeed request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IUpdateFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.asset.v1.IFeed, + protos.google.cloud.asset.v1.IUpdateFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('updateFeed response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an asset feed. @@ -852,7 +939,24 @@ export class AssetServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteFeed(request, options, callback); + this._log.info('deleteFeed request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.asset.v1.IDeleteFeedRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteFeed response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteFeed(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.asset.v1.IDeleteFeedRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteFeed response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -949,7 +1053,24 @@ export class AssetServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.exportAssets(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.asset.v1.IExportAssetsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('exportAssets response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('exportAssets request %j', request); + return this.innerApiCalls.exportAssets(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.asset.v1.IExportAssetsRequest|undefined, {}|undefined + ]) => { + this._log.info('exportAssets response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `exportAssets()`. @@ -963,6 +1084,7 @@ export class AssetServiceClient { * region_tag:cloudasset_v1_generated_AssetService_ExportAssets_async */ async checkExportAssetsProgress(name: string): Promise>{ + this._log.info('exportAssets long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.exportAssets, this._gaxModule.createDefaultBackoffSettings()); @@ -1089,6 +1211,7 @@ export class AssetServiceClient { close(): Promise { if (this.assetServiceStub && !this._terminated) { return this.assetServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline b/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline index ccdbb7ef2..c10ce8c55 100644 --- a/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline +++ b/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -64,6 +65,7 @@ export class BigQueryStorageClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('storage'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -465,7 +467,24 @@ export class BigQueryStorageClient { 'table_reference.dataset_id': request.tableReference!.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.createReadSession(request, options, callback); + this._log.info('createReadSession request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.storage.v1beta1.IReadSession, + protos.google.cloud.bigquery.storage.v1beta1.ICreateReadSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createReadSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createReadSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.storage.v1beta1.IReadSession, + protos.google.cloud.bigquery.storage.v1beta1.ICreateReadSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('createReadSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates additional streams for a ReadSession. This API can be used to @@ -542,7 +561,24 @@ export class BigQueryStorageClient { 'session.name': request.session!.name ?? '', }); this.initialize(); - return this.innerApiCalls.batchCreateReadSessionStreams(request, options, callback); + this._log.info('batchCreateReadSessionStreams request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsResponse, + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('batchCreateReadSessionStreams response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.batchCreateReadSessionStreams(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsResponse, + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsRequest|undefined, {}|undefined + ]) => { + this._log.info('batchCreateReadSessionStreams response %j', response); + return [response, options, rawResponse]; + }); } /** * Triggers the graceful termination of a single stream in a ReadSession. This @@ -625,7 +661,24 @@ export class BigQueryStorageClient { 'stream.name': request.stream!.name ?? '', }); this.initialize(); - return this.innerApiCalls.finalizeStream(request, options, callback); + this._log.info('finalizeStream request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.storage.v1beta1.IFinalizeStreamRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('finalizeStream response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.finalizeStream(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.storage.v1beta1.IFinalizeStreamRequest|undefined, {}|undefined + ]) => { + this._log.info('finalizeStream response %j', response); + return [response, options, rawResponse]; + }); } /** * Splits a given read stream into two Streams. These streams are referred to @@ -715,7 +768,24 @@ export class BigQueryStorageClient { 'original_stream.name': request.originalStream!.name ?? '', }); this.initialize(); - return this.innerApiCalls.splitReadStream(request, options, callback); + this._log.info('splitReadStream request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamResponse, + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('splitReadStream response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.splitReadStream(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamResponse, + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamRequest|undefined, {}|undefined + ]) => { + this._log.info('splitReadStream response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -758,6 +828,7 @@ export class BigQueryStorageClient { 'read_position.stream.name': request.readPosition!.stream!.name ?? '', }); this.initialize(); + this._log.info('readRows stream %j', options); return this.innerApiCalls.readRows(request, options); } @@ -872,6 +943,7 @@ export class BigQueryStorageClient { close(): Promise { if (this.bigQueryStorageStub && !this._terminated) { return this.bigQueryStorageStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline index efbb950cb..dc6b00e37 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class DatasetServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -421,7 +423,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.getDataset(request, options, callback); + this._log.info('getDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IGetDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IGetDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('getDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new empty dataset. @@ -493,7 +512,24 @@ export class DatasetServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.insertDataset(request, options, callback); + this._log.info('insertDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IInsertDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IInsertDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('insertDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing dataset. The update method replaces the @@ -572,7 +608,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.patchDataset(request, options, callback); + this._log.info('patchDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('patchDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing dataset. The update method replaces the @@ -650,7 +703,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.updateDataset(request, options, callback); + this._log.info('updateDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('updateDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the dataset specified by the datasetId value. Before you can delete @@ -730,7 +800,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteDataset(request, options, callback); + this._log.info('deleteDataset request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteDataset response %j', response); + return [response, options, rawResponse]; + }); } /** * Undeletes a dataset which is within time travel window based on datasetId. @@ -809,7 +896,24 @@ export class DatasetServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.undeleteDataset(request, options, callback); + this._log.info('undeleteDataset request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUndeleteDatasetRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('undeleteDataset response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.undeleteDataset(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IDataset, + protos.google.cloud.bigquery.v2.IUndeleteDatasetRequest|undefined, {}|undefined + ]) => { + this._log.info('undeleteDataset response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -907,7 +1011,26 @@ export class DatasetServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.listDatasets(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListDatasetsRequest, + protos.google.cloud.bigquery.v2.IDatasetList|null|undefined, + protos.google.cloud.bigquery.v2.IListFormatDataset>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listDatasets values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listDatasets request %j', request); + return this.innerApiCalls + .listDatasets(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IListFormatDataset[], + protos.google.cloud.bigquery.v2.IListDatasetsRequest|null, + protos.google.cloud.bigquery.v2.IDatasetList + ]) => { + this._log.info('listDatasets values %j', response); + return [response, input, output]; + }); } /** @@ -959,6 +1082,7 @@ export class DatasetServiceClient { const defaultCallSettings = this._defaults['listDatasets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDatasets stream %j', request); return this.descriptors.page.listDatasets.createStream( this.innerApiCalls.listDatasets as GaxCall, request, @@ -1018,6 +1142,7 @@ export class DatasetServiceClient { const defaultCallSettings = this._defaults['listDatasets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDatasets iterate %j', request); return this.descriptors.page.listDatasets.asyncIterate( this.innerApiCalls['listDatasets'] as GaxCall, request as {}, @@ -1034,6 +1159,7 @@ export class DatasetServiceClient { close(): Promise { if (this.datasetServiceStub && !this._terminated) { return this.datasetServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline index db0518576..4a1ca0a1e 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class JobServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -434,7 +436,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.cancelJob(request, options, callback); + this._log.info('cancelJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IJobCancelResponse, + protos.google.cloud.bigquery.v2.ICancelJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('cancelJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.cancelJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IJobCancelResponse, + protos.google.cloud.bigquery.v2.ICancelJobRequest|undefined, {}|undefined + ]) => { + this._log.info('cancelJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns information about a specific job. Job information is available for @@ -520,7 +539,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.getJob(request, options, callback); + this._log.info('getJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IGetJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IGetJobRequest|undefined, {}|undefined + ]) => { + this._log.info('getJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Starts a new asynchronous job. @@ -602,7 +638,24 @@ export class JobServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.insertJob(request, options, callback); + this._log.info('insertJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IInsertJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IJob, + protos.google.cloud.bigquery.v2.IInsertJobRequest|undefined, {}|undefined + ]) => { + this._log.info('insertJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Requests the deletion of the metadata of a job. This call returns when the @@ -683,7 +736,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteJob(request, options, callback); + this._log.info('deleteJob request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteJobRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteJob response %j', response); + return [response, options, rawResponse]; + }); } /** * RPC to get the results of a query job. @@ -791,7 +861,24 @@ export class JobServiceClient { 'job_id': request.jobId ?? '', }); this.initialize(); - return this.innerApiCalls.getQueryResults(request, options, callback); + this._log.info('getQueryResults request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IGetQueryResultsResponse, + protos.google.cloud.bigquery.v2.IGetQueryResultsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getQueryResults response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getQueryResults(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IGetQueryResultsResponse, + protos.google.cloud.bigquery.v2.IGetQueryResultsRequest|undefined, {}|undefined + ]) => { + this._log.info('getQueryResults response %j', response); + return [response, options, rawResponse]; + }); } /** * Runs a BigQuery SQL query synchronously and returns query results if the @@ -864,7 +951,24 @@ export class JobServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.query(request, options, callback); + this._log.info('query request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IQueryResponse, + protos.google.cloud.bigquery.v2.IPostQueryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('query response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.query(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IQueryResponse, + protos.google.cloud.bigquery.v2.IPostQueryRequest|undefined, {}|undefined + ]) => { + this._log.info('query response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -970,7 +1074,26 @@ export class JobServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.listJobs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListJobsRequest, + protos.google.cloud.bigquery.v2.IJobList|null|undefined, + protos.google.cloud.bigquery.v2.IListFormatJob>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listJobs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listJobs request %j', request); + return this.innerApiCalls + .listJobs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IListFormatJob[], + protos.google.cloud.bigquery.v2.IListJobsRequest|null, + protos.google.cloud.bigquery.v2.IJobList + ]) => { + this._log.info('listJobs values %j', response); + return [response, input, output]; + }); } /** @@ -1027,6 +1150,7 @@ export class JobServiceClient { const defaultCallSettings = this._defaults['listJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobs stream %j', request); return this.descriptors.page.listJobs.createStream( this.innerApiCalls.listJobs as GaxCall, request, @@ -1091,6 +1215,7 @@ export class JobServiceClient { const defaultCallSettings = this._defaults['listJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobs iterate %j', request); return this.descriptors.page.listJobs.asyncIterate( this.innerApiCalls['listJobs'] as GaxCall, request as {}, @@ -1107,6 +1232,7 @@ export class JobServiceClient { close(): Promise { if (this.jobServiceStub && !this._terminated) { return this.jobServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline index 87131c442..3078596aa 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class ModelServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -421,7 +423,24 @@ export class ModelServiceClient { 'model_id': request.modelId ?? '', }); this.initialize(); - return this.innerApiCalls.getModel(request, options, callback); + this._log.info('getModel request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IGetModelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getModel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getModel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IGetModelRequest|undefined, {}|undefined + ]) => { + this._log.info('getModel response %j', response); + return [response, options, rawResponse]; + }); } /** * Patch specific fields in the specified model. @@ -501,7 +520,24 @@ export class ModelServiceClient { 'model_id': request.modelId ?? '', }); this.initialize(); - return this.innerApiCalls.patchModel(request, options, callback); + this._log.info('patchModel request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IPatchModelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchModel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchModel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IModel, + protos.google.cloud.bigquery.v2.IPatchModelRequest|undefined, {}|undefined + ]) => { + this._log.info('patchModel response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the model specified by modelId from the dataset. @@ -577,7 +613,24 @@ export class ModelServiceClient { 'model_id': request.modelId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteModel(request, options, callback); + this._log.info('deleteModel request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteModelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteModel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteModel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteModelRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteModel response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -669,7 +722,26 @@ export class ModelServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.listModels(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListModelsRequest, + protos.google.cloud.bigquery.v2.IListModelsResponse|null|undefined, + protos.google.cloud.bigquery.v2.IModel>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listModels values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listModels request %j', request); + return this.innerApiCalls + .listModels(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IModel[], + protos.google.cloud.bigquery.v2.IListModelsRequest|null, + protos.google.cloud.bigquery.v2.IListModelsResponse + ]) => { + this._log.info('listModels values %j', response); + return [response, input, output]; + }); } /** @@ -714,6 +786,7 @@ export class ModelServiceClient { const defaultCallSettings = this._defaults['listModels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listModels stream %j', request); return this.descriptors.page.listModels.createStream( this.innerApiCalls.listModels as GaxCall, request, @@ -766,6 +839,7 @@ export class ModelServiceClient { const defaultCallSettings = this._defaults['listModels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listModels iterate %j', request); return this.descriptors.page.listModels.asyncIterate( this.innerApiCalls['listModels'] as GaxCall, request as {}, @@ -782,6 +856,7 @@ export class ModelServiceClient { close(): Promise { if (this.modelServiceStub && !this._terminated) { return this.modelServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline index d792cf6d9..359706dac 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class ProjectServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -407,7 +409,24 @@ export class ProjectServiceClient { 'project_id': request.projectId ?? '', }); this.initialize(); - return this.innerApiCalls.getServiceAccount(request, options, callback); + this._log.info('getServiceAccount request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IGetServiceAccountResponse, + protos.google.cloud.bigquery.v2.IGetServiceAccountRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getServiceAccount response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getServiceAccount(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IGetServiceAccountResponse, + protos.google.cloud.bigquery.v2.IGetServiceAccountRequest|undefined, {}|undefined + ]) => { + this._log.info('getServiceAccount response %j', response); + return [response, options, rawResponse]; + }); } @@ -420,6 +439,7 @@ export class ProjectServiceClient { close(): Promise { if (this.projectServiceStub && !this._terminated) { return this.projectServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline index b558edef2..e4ce41e38 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class RoutineServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -421,7 +423,24 @@ export class RoutineServiceClient { 'routine_id': request.routineId ?? '', }); this.initialize(); - return this.innerApiCalls.getRoutine(request, options, callback); + this._log.info('getRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IGetRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IGetRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('getRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new routine in the dataset. @@ -496,7 +515,24 @@ export class RoutineServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.insertRoutine(request, options, callback); + this._log.info('insertRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IInsertRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IInsertRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('insertRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing routine. The update method replaces the @@ -575,7 +611,24 @@ export class RoutineServiceClient { 'routine_id': request.routineId ?? '', }); this.initialize(); - return this.innerApiCalls.updateRoutine(request, options, callback); + this._log.info('updateRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IUpdateRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IUpdateRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('updateRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Patches information in an existing routine. The patch method does a partial @@ -652,7 +705,24 @@ export class RoutineServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.patchRoutine(request, options, callback); + this._log.info('patchRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IPatchRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.IRoutine, + protos.google.cloud.bigquery.v2.IPatchRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('patchRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the routine specified by routineId from the dataset. @@ -728,7 +798,24 @@ export class RoutineServiceClient { 'routine_id': request.routineId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteRoutine(request, options, callback); + this._log.info('deleteRoutine request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteRoutineRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteRoutine response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteRoutine(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteRoutineRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteRoutine response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -823,7 +910,26 @@ export class RoutineServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.listRoutines(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListRoutinesRequest, + protos.google.cloud.bigquery.v2.IListRoutinesResponse|null|undefined, + protos.google.cloud.bigquery.v2.IRoutine>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRoutines values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRoutines request %j', request); + return this.innerApiCalls + .listRoutines(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IRoutine[], + protos.google.cloud.bigquery.v2.IListRoutinesRequest|null, + protos.google.cloud.bigquery.v2.IListRoutinesResponse + ]) => { + this._log.info('listRoutines values %j', response); + return [response, input, output]; + }); } /** @@ -872,6 +978,7 @@ export class RoutineServiceClient { const defaultCallSettings = this._defaults['listRoutines']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRoutines stream %j', request); return this.descriptors.page.listRoutines.createStream( this.innerApiCalls.listRoutines as GaxCall, request, @@ -928,6 +1035,7 @@ export class RoutineServiceClient { const defaultCallSettings = this._defaults['listRoutines']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRoutines iterate %j', request); return this.descriptors.page.listRoutines.asyncIterate( this.innerApiCalls['listRoutines'] as GaxCall, request as {}, @@ -944,6 +1052,7 @@ export class RoutineServiceClient { close(): Promise { if (this.routineServiceStub && !this._terminated) { return this.routineServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline index 0c7fb4647..ee0767eae 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class RowAccessPolicyServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -430,7 +432,26 @@ export class RowAccessPolicyServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.listRowAccessPolicies(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesRequest, + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesResponse|null|undefined, + protos.google.cloud.bigquery.v2.IRowAccessPolicy>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRowAccessPolicies values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRowAccessPolicies request %j', request); + return this.innerApiCalls + .listRowAccessPolicies(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IRowAccessPolicy[], + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesRequest|null, + protos.google.cloud.bigquery.v2.IListRowAccessPoliciesResponse + ]) => { + this._log.info('listRowAccessPolicies values %j', response); + return [response, input, output]; + }); } /** @@ -478,6 +499,7 @@ export class RowAccessPolicyServiceClient { const defaultCallSettings = this._defaults['listRowAccessPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRowAccessPolicies stream %j', request); return this.descriptors.page.listRowAccessPolicies.createStream( this.innerApiCalls.listRowAccessPolicies as GaxCall, request, @@ -533,6 +555,7 @@ export class RowAccessPolicyServiceClient { const defaultCallSettings = this._defaults['listRowAccessPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRowAccessPolicies iterate %j', request); return this.descriptors.page.listRowAccessPolicies.asyncIterate( this.innerApiCalls['listRowAccessPolicies'] as GaxCall, request as {}, @@ -549,6 +572,7 @@ export class RowAccessPolicyServiceClient { close(): Promise { if (this.rowAccessPolicyServiceStub && !this._terminated) { return this.rowAccessPolicyServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline index ada67bad9..0b69c6b14 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class TableServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('bigquery'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -434,7 +436,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.getTable(request, options, callback); + this._log.info('getTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IGetTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IGetTableRequest|undefined, {}|undefined + ]) => { + this._log.info('getTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new, empty table in the dataset. @@ -509,7 +528,24 @@ export class TableServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.insertTable(request, options, callback); + this._log.info('insertTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IInsertTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('insertTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.insertTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IInsertTableRequest|undefined, {}|undefined + ]) => { + this._log.info('insertTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing table. The update method replaces the @@ -592,7 +628,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.patchTable(request, options, callback); + this._log.info('patchTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('patchTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.patchTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, {}|undefined + ]) => { + this._log.info('patchTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates information in an existing table. The update method replaces the @@ -674,7 +727,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.updateTable(request, options, callback); + this._log.info('updateTable request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.bigquery.v2.ITable, + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, {}|undefined + ]) => { + this._log.info('updateTable response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes the table specified by tableId from the dataset. @@ -751,7 +821,24 @@ export class TableServiceClient { 'table_id': request.tableId ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTable(request, options, callback); + this._log.info('deleteTable request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteTableRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTable response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTable(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.bigquery.v2.IDeleteTableRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTable response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -842,7 +929,26 @@ export class TableServiceClient { 'dataset_id': request.datasetId ?? '', }); this.initialize(); - return this.innerApiCalls.listTables(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.bigquery.v2.IListTablesRequest, + protos.google.cloud.bigquery.v2.ITableList|null|undefined, + protos.google.cloud.bigquery.v2.IListFormatTable>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTables values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTables request %j', request); + return this.innerApiCalls + .listTables(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.bigquery.v2.IListFormatTable[], + protos.google.cloud.bigquery.v2.IListTablesRequest|null, + protos.google.cloud.bigquery.v2.ITableList + ]) => { + this._log.info('listTables values %j', response); + return [response, input, output]; + }); } /** @@ -887,6 +993,7 @@ export class TableServiceClient { const defaultCallSettings = this._defaults['listTables']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTables stream %j', request); return this.descriptors.page.listTables.createStream( this.innerApiCalls.listTables as GaxCall, request, @@ -939,6 +1046,7 @@ export class TableServiceClient { const defaultCallSettings = this._defaults['listTables']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTables iterate %j', request); return this.descriptors.page.listTables.asyncIterate( this.innerApiCalls['listTables'] as GaxCall, request as {}, @@ -955,6 +1063,7 @@ export class TableServiceClient { close(): Promise { if (this.tableServiceStub && !this._terminated) { return this.tableServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline index 362334295..024e9da63 100644 --- a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline +++ b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class AddressesClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('compute'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -436,14 +438,25 @@ export class AddressesClient { 'address': request.address ?? '', }); this.initialize(); - return this.innerApiCalls.delete(request, options, callback) - .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + this._log.info('delete request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { + this._log.info('delete response %j', response); + callback(error, response, nextRequest, rawResponse); + } + : undefined; + return this.innerApiCalls.delete(request, options, wrappedCallback) + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { + this._log.info('delete response %j', response); + return [ + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; - }); + }); } /** * Creates an address resource in the specified project by using the data included in the request. @@ -529,14 +542,25 @@ export class AddressesClient { 'region': request.region ?? '', }); this.initialize(); - return this.innerApiCalls.insert(request, options, callback) - .then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + this._log.info('insert request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IOperation>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { + this._log.info('insert response %j', response); + callback(error, response, nextRequest, rawResponse); + } + : undefined; + return this.innerApiCalls.insert(request, options, wrappedCallback) + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { + this._log.info('insert response %j', response); + return [ + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; - }); + }); } @@ -596,6 +620,7 @@ export class AddressesClient { const defaultCallSettings = this._defaults['aggregatedList']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('aggregatedList iterate %j', request); return this.descriptors.page.aggregatedList.asyncIterate( this.innerApiCalls['aggregatedList'] as GaxCall, request as {}, @@ -696,7 +721,26 @@ export class AddressesClient { 'region': request.region ?? '', }); this.initialize(); - return this.innerApiCalls.list(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.compute.v1.IListAddressesRequest, + protos.google.cloud.compute.v1.IAddressList|null|undefined, + protos.google.cloud.compute.v1.IAddress>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('list values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('list request %j', request); + return this.innerApiCalls + .list(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.compute.v1.IAddress[], + protos.google.cloud.compute.v1.IListAddressesRequest|null, + protos.google.cloud.compute.v1.IAddressList + ]) => { + this._log.info('list values %j', response); + return [response, input, output]; + }); } /** @@ -753,6 +797,7 @@ export class AddressesClient { const defaultCallSettings = this._defaults['list']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('list stream %j', request); return this.descriptors.page.list.createStream( this.innerApiCalls.list as GaxCall, request, @@ -817,6 +862,7 @@ export class AddressesClient { const defaultCallSettings = this._defaults['list']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('list iterate %j', request); return this.descriptors.page.list.asyncIterate( this.innerApiCalls['list'] as GaxCall, request as {}, @@ -833,6 +879,7 @@ export class AddressesClient { close(): Promise { if (this.addressesStub && !this._terminated) { return this.addressesStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline b/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline index 3d8ed5946..c9cd919aa 100644 --- a/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline +++ b/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class RegionOperationsClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('compute'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -412,7 +414,24 @@ export class RegionOperationsClient { 'operation': request.operation ?? '', }); this.initialize(); - return this.innerApiCalls.get(request, options, callback); + this._log.info('get request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IGetRegionOperationRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('get response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.get(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IGetRegionOperationRequest|undefined, {}|undefined + ]) => { + this._log.info('get response %j', response); + return [response, options, rawResponse]; + }); } /** * Waits for the specified Operation resource to return as `DONE` or for the request to approach the 2 minute deadline, and retrieves the specified Operation resource. This method differs from the `GET` method in that it waits for no more than the default deadline (2 minutes) and then returns the current state of the operation, which might be `DONE` or still in progress. @@ -492,7 +511,24 @@ export class RegionOperationsClient { 'operation': request.operation ?? '', }); this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + this._log.info('wait request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IWaitRegionOperationRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IWaitRegionOperationRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } @@ -505,6 +541,7 @@ export class RegionOperationsClient { close(): Promise { if (this.regionOperationsStub && !this._terminated) { return this.regionOperationsStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline b/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline index b3cd633df..040453741 100644 --- a/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline +++ b/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -64,6 +65,7 @@ export class DeprecatedServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('deprecatedtest'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -400,7 +402,24 @@ export class DeprecatedServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.fastFibonacci(request, options, callback); + this._log.info('fastFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('fastFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('fastFibonacci response %j', response); + return [response, options, rawResponse]; + }); } /** * Calculates Fibonacci on the provided value, slowly. @@ -467,7 +486,24 @@ export class DeprecatedServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); this.warn('DEP$DeprecatedService-$SlowFibonacci','SlowFibonacci is deprecated and may be removed in a future version.', 'DeprecationWarning'); - return this.innerApiCalls.slowFibonacci(request, options, callback); + this._log.info('slowFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('slowFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('slowFibonacci response %j', response); + return [response, options, rawResponse]; + }); } @@ -480,6 +516,7 @@ export class DeprecatedServiceClient { close(): Promise { if (this.deprecatedServiceStub && !this._terminated) { return this.deprecatedServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline index b26e7c57f..ba271a6ef 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -64,6 +65,7 @@ export class ComplianceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -450,7 +452,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBody(request, options, callback); + this._log.info('repeatDataBody request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBody response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBody response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -530,7 +549,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyInfo(request, options, callback); + this._log.info('repeatDataBodyInfo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyInfo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyInfo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -609,7 +645,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataQuery(request, options, callback); + this._log.info('repeatDataQuery request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataQuery response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataQuery response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -698,7 +751,24 @@ export class ComplianceClient { 'info.f_kingdom': request.info!.fKingdom ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataSimplePath(request, options, callback); + this._log.info('repeatDataSimplePath request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataSimplePath response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataSimplePath response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a path resource. @@ -783,7 +853,24 @@ export class ComplianceClient { 'info.f_bool': request.info!.fBool ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathResource(request, options, callback); + this._log.info('repeatDataPathResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathResource response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a trailing resource. @@ -867,7 +954,24 @@ export class ComplianceClient { 'info.f_child.f_string': request.info!.fChild!.fString ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathTrailingResource(request, options, callback); + this._log.info('repeatDataPathTrailingResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PUT method. @@ -945,7 +1049,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPut(request, options, callback); + this._log.info('repeatDataBodyPut request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPut response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPut response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PATCH method. @@ -1023,7 +1144,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPatch(request, options, callback); + this._log.info('repeatDataBodyPatch request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPatch response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPatch response %j', response); + return [response, options, rawResponse]; + }); } /** * This method requests an enum value from the server. Depending on the contents of EnumRequest, the enum value returned will be a known enum declared in the @@ -1093,7 +1231,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.getEnum(request, options, callback); + this._log.info('getEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|undefined, {}|undefined + ]) => { + this._log.info('getEnum response %j', response); + return [response, options, rawResponse]; + }); } /** * This method is used to verify that clients can round-trip enum values, which is particularly important for unknown enum values over REST. VerifyEnum() @@ -1165,7 +1320,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.verifyEnum(request, options, callback); + this._log.info('verifyEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|undefined, {}|undefined + ]) => { + this._log.info('verifyEnum response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -1551,6 +1723,7 @@ export class ComplianceClient { close(): Promise { if (this.complianceStub && !this._terminated) { return this.complianceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline index 02f4ca314..573db1266 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -68,6 +69,7 @@ export class EchoClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -588,7 +590,24 @@ export class EchoClient { routingParameter ); this.initialize(); - return this.innerApiCalls.echo(request, options, callback); + this._log.info('echo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + ]) => { + this._log.info('echo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method returns error details in a repeated "google.protobuf.Any" @@ -662,7 +681,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.echoErrorDetails(request, options, callback); + this._log.info('echoErrorDetails request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echoErrorDetails response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + ]) => { + this._log.info('echoErrorDetails response %j', response); + return [response, options, rawResponse]; + }); } /** * This is similar to the PagedExpand except that it uses @@ -735,7 +771,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpandLegacy(request, options, callback); + this._log.info('pagedExpandLegacy request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pagedExpandLegacy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + ]) => { + this._log.info('pagedExpandLegacy response %j', response); + return [response, options, rawResponse]; + }); } /** * This method will block (wait) for the requested amount of time @@ -807,7 +860,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.block(request, options, callback); + this._log.info('block request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('block response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.block(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + ]) => { + this._log.info('block response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -840,6 +910,7 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); + this._log.info('expand stream %j', options); return this.innerApiCalls.expand(request, options); } @@ -886,6 +957,7 @@ export class EchoClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('collect stream %j', options); return this.innerApiCalls.collect(null, options, callback); } @@ -909,6 +981,7 @@ export class EchoClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('chat stream %j', options); return this.innerApiCalls.chat(null, options); } @@ -985,7 +1058,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('wait request %j', request); + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `wait()`. @@ -999,6 +1089,7 @@ export class EchoClient { * region_tag:localhost_v1beta1_generated_Echo_Wait_async */ async checkWaitProgress(name: string): Promise>{ + this._log.info('wait long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.wait, this._gaxModule.createDefaultBackoffSettings()); @@ -1077,7 +1168,26 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpand(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IPagedExpandRequest, + protos.google.showcase.v1beta1.IPagedExpandResponse|null|undefined, + protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('pagedExpand values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('pagedExpand request %j', request); + return this.innerApiCalls + .pagedExpand(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IEchoResponse[], + protos.google.showcase.v1beta1.IPagedExpandRequest|null, + protos.google.showcase.v1beta1.IPagedExpandResponse + ]) => { + this._log.info('pagedExpand values %j', response); + return [response, input, output]; + }); } /** @@ -1112,6 +1222,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand stream %j', request); return this.descriptors.page.pagedExpand.createStream( this.innerApiCalls.pagedExpand as GaxCall, request, @@ -1154,6 +1265,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand iterate %j', request); return this.descriptors.page.pagedExpand.asyncIterate( this.innerApiCalls['pagedExpand'] as GaxCall, request as {}, @@ -1543,6 +1655,7 @@ export class EchoClient { close(): Promise { if (this.echoStub && !this._terminated) { return this.echoStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline index 3afd63fae..fd2a41091 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class IdentityClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -443,7 +445,24 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createUser(request, options, callback); + this._log.info('createUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('createUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the User with the given uri. @@ -513,7 +532,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getUser(request, options, callback); + this._log.info('getUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|undefined, {}|undefined + ]) => { + this._log.info('getUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a user. @@ -586,7 +622,24 @@ export class IdentityClient { 'user.name': request.user!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateUser(request, options, callback); + this._log.info('updateUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('updateUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a user, their profile, and all of their authored messages. @@ -656,7 +709,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteUser(request, options, callback); + this._log.info('deleteUser request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteUser response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -732,7 +802,26 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listUsers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListUsersRequest, + protos.google.showcase.v1beta1.IListUsersResponse|null|undefined, + protos.google.showcase.v1beta1.IUser>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUsers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUsers request %j', request); + return this.innerApiCalls + .listUsers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IUser[], + protos.google.showcase.v1beta1.IListUsersRequest|null, + protos.google.showcase.v1beta1.IListUsersResponse + ]) => { + this._log.info('listUsers values %j', response); + return [response, input, output]; + }); } /** @@ -768,6 +857,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers stream %j', request); return this.descriptors.page.listUsers.createStream( this.innerApiCalls.listUsers as GaxCall, request, @@ -811,6 +901,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers iterate %j', request); return this.descriptors.page.listUsers.asyncIterate( this.innerApiCalls['listUsers'] as GaxCall, request as {}, @@ -1200,6 +1291,7 @@ export class IdentityClient { close(): Promise { if (this.identityStub && !this._terminated) { return this.identityStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline index 33aea7ad4..23383aed2 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class MessagingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -491,7 +493,24 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createRoom(request, options, callback); + this._log.info('createRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('createRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Room with the given resource name. @@ -561,7 +580,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getRoom(request, options, callback); + this._log.info('getRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('getRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a room. @@ -634,7 +670,24 @@ export class MessagingClient { 'room.name': request.room!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateRoom(request, options, callback); + this._log.info('updateRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('updateRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a room and all of its blurbs. @@ -704,7 +757,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteRoom(request, options, callback); + this._log.info('deleteRoom request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a blurb. If the parent is a room, the blurb is understood to be a @@ -779,7 +849,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createBlurb(request, options, callback); + this._log.info('createBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('createBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Blurb with the given resource name. @@ -849,7 +936,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getBlurb(request, options, callback); + this._log.info('getBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('getBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a blurb. @@ -922,7 +1026,24 @@ export class MessagingClient { 'blurb.name': request.blurb!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateBlurb(request, options, callback); + this._log.info('updateBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('updateBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a blurb. @@ -992,7 +1113,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteBlurb(request, options, callback); + this._log.info('deleteBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1028,6 +1166,7 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); + this._log.info('streamBlurbs stream %j', options); return this.innerApiCalls.streamBlurbs(request, options); } @@ -1073,6 +1212,7 @@ export class MessagingClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('sendBlurbs stream %j', options); return this.innerApiCalls.sendBlurbs(null, options, callback); } @@ -1097,6 +1237,7 @@ export class MessagingClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('connect stream %j', options); return this.innerApiCalls.connect(null, options); } @@ -1185,7 +1326,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.searchBlurbs(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('searchBlurbs response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('searchBlurbs request %j', request); + return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ]) => { + this._log.info('searchBlurbs response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `searchBlurbs()`. @@ -1199,6 +1357,7 @@ export class MessagingClient { * region_tag:localhost_v1beta1_generated_Messaging_SearchBlurbs_async */ async checkSearchBlurbsProgress(name: string): Promise>{ + this._log.info('searchBlurbs long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.searchBlurbs, this._gaxModule.createDefaultBackoffSettings()); @@ -1277,7 +1436,26 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listRooms(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListRoomsRequest, + protos.google.showcase.v1beta1.IListRoomsResponse|null|undefined, + protos.google.showcase.v1beta1.IRoom>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRooms values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRooms request %j', request); + return this.innerApiCalls + .listRooms(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IRoom[], + protos.google.showcase.v1beta1.IListRoomsRequest|null, + protos.google.showcase.v1beta1.IListRoomsResponse + ]) => { + this._log.info('listRooms values %j', response); + return [response, input, output]; + }); } /** @@ -1313,6 +1491,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms stream %j', request); return this.descriptors.page.listRooms.createStream( this.innerApiCalls.listRooms as GaxCall, request, @@ -1356,6 +1535,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms iterate %j', request); return this.descriptors.page.listRooms.asyncIterate( this.innerApiCalls['listRooms'] as GaxCall, request as {}, @@ -1444,7 +1624,26 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listBlurbs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListBlurbsRequest, + protos.google.showcase.v1beta1.IListBlurbsResponse|null|undefined, + protos.google.showcase.v1beta1.IBlurb>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listBlurbs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listBlurbs request %j', request); + return this.innerApiCalls + .listBlurbs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IBlurb[], + protos.google.showcase.v1beta1.IListBlurbsRequest|null, + protos.google.showcase.v1beta1.IListBlurbsResponse + ]) => { + this._log.info('listBlurbs values %j', response); + return [response, input, output]; + }); } /** @@ -1488,6 +1687,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs stream %j', request); return this.descriptors.page.listBlurbs.createStream( this.innerApiCalls.listBlurbs as GaxCall, request, @@ -1539,6 +1739,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs iterate %j', request); return this.descriptors.page.listBlurbs.asyncIterate( this.innerApiCalls['listBlurbs'] as GaxCall, request as {}, @@ -1928,6 +2129,7 @@ export class MessagingClient { close(): Promise { if (this.messagingStub && !this._terminated) { return this.messagingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline index 488d18461..e4d25f378 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -61,6 +62,7 @@ export class SequenceServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -432,7 +434,24 @@ export class SequenceServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSequence(request, options, callback); + this._log.info('createSequence request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('createSequence response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves a sequence. @@ -501,7 +520,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSequenceReport(request, options, callback); + this._log.info('getSequenceReport request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSequenceReport response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, {}|undefined + ]) => { + this._log.info('getSequenceReport response %j', response); + return [response, options, rawResponse]; + }); } /** * Attempts a sequence. @@ -570,7 +606,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.attemptSequence(request, options, callback); + this._log.info('attemptSequence request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('attemptSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('attemptSequence response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -956,6 +1009,7 @@ export class SequenceServiceClient { close(): Promise { if (this.sequenceServiceStub && !this._terminated) { return this.sequenceServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline index 0e8acbc64..a4acdba67 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -63,6 +64,7 @@ export class TestingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -448,7 +450,24 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSession(request, options, callback); + this._log.info('createSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('createSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a testing session. @@ -518,7 +537,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSession(request, options, callback); + this._log.info('getSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('getSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Delete a test session. @@ -588,7 +624,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteSession(request, options, callback); + this._log.info('deleteSession request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Report on the status of a session. @@ -660,7 +713,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.reportSession(request, options, callback); + this._log.info('reportSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('reportSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.reportSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('reportSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Explicitly decline to implement a test. @@ -735,7 +805,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTest(request, options, callback); + this._log.info('deleteTest request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTest response %j', response); + return [response, options, rawResponse]; + }); } /** * Register a response to a test. @@ -812,7 +899,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.verifyTest(request, options, callback); + this._log.info('verifyTest request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, {}|undefined + ]) => { + this._log.info('verifyTest response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -885,7 +989,26 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listSessions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListSessionsRequest, + protos.google.showcase.v1beta1.IListSessionsResponse|null|undefined, + protos.google.showcase.v1beta1.ISession>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSessions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listSessions request %j', request); + return this.innerApiCalls + .listSessions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ISession[], + protos.google.showcase.v1beta1.IListSessionsRequest|null, + protos.google.showcase.v1beta1.IListSessionsResponse + ]) => { + this._log.info('listSessions values %j', response); + return [response, input, output]; + }); } /** @@ -918,6 +1041,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions stream %j', request); return this.descriptors.page.listSessions.createStream( this.innerApiCalls.listSessions as GaxCall, request, @@ -958,6 +1082,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions iterate %j', request); return this.descriptors.page.listSessions.asyncIterate( this.innerApiCalls['listSessions'] as GaxCall, request as {}, @@ -1041,7 +1166,26 @@ export class TestingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listTests(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListTestsRequest, + protos.google.showcase.v1beta1.IListTestsResponse|null|undefined, + protos.google.showcase.v1beta1.ITest>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTests values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTests request %j', request); + return this.innerApiCalls + .listTests(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ITest[], + protos.google.showcase.v1beta1.IListTestsRequest|null, + protos.google.showcase.v1beta1.IListTestsResponse + ]) => { + this._log.info('listTests values %j', response); + return [response, input, output]; + }); } /** @@ -1081,6 +1225,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests stream %j', request); return this.descriptors.page.listTests.createStream( this.innerApiCalls.listTests as GaxCall, request, @@ -1128,6 +1273,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests iterate %j', request); return this.descriptors.page.listTests.asyncIterate( this.innerApiCalls['listTests'] as GaxCall, request as {}, @@ -1517,6 +1663,7 @@ export class TestingClient { close(): Promise { if (this.testingStub && !this._terminated) { return this.testingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline b/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline index 57e9864bb..bba5433d3 100644 --- a/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline +++ b/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -70,6 +71,7 @@ export class DlpServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('dlp'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -486,7 +488,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.inspectContent(request, options, callback); + this._log.info('inspectContent request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectContentResponse, + protos.google.privacy.dlp.v2.IInspectContentRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('inspectContent response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.inspectContent(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectContentResponse, + protos.google.privacy.dlp.v2.IInspectContentRequest|undefined, {}|undefined + ]) => { + this._log.info('inspectContent response %j', response); + return [response, options, rawResponse]; + }); } /** * Redacts potentially sensitive info from an image. @@ -576,7 +595,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.redactImage(request, options, callback); + this._log.info('redactImage request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IRedactImageResponse, + protos.google.privacy.dlp.v2.IRedactImageRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('redactImage response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.redactImage(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IRedactImageResponse, + protos.google.privacy.dlp.v2.IRedactImageRequest|undefined, {}|undefined + ]) => { + this._log.info('redactImage response %j', response); + return [response, options, rawResponse]; + }); } /** * De-identifies potentially sensitive info from a ContentItem. @@ -679,7 +715,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.deidentifyContent(request, options, callback); + this._log.info('deidentifyContent request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyContentResponse, + protos.google.privacy.dlp.v2.IDeidentifyContentRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deidentifyContent response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deidentifyContent(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyContentResponse, + protos.google.privacy.dlp.v2.IDeidentifyContentRequest|undefined, {}|undefined + ]) => { + this._log.info('deidentifyContent response %j', response); + return [response, options, rawResponse]; + }); } /** * Re-identifies content that has been de-identified. @@ -784,7 +837,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.reidentifyContent(request, options, callback); + this._log.info('reidentifyContent request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IReidentifyContentResponse, + protos.google.privacy.dlp.v2.IReidentifyContentRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('reidentifyContent response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.reidentifyContent(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IReidentifyContentResponse, + protos.google.privacy.dlp.v2.IReidentifyContentRequest|undefined, {}|undefined + ]) => { + this._log.info('reidentifyContent response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns a list of the sensitive information types that the DLP API @@ -864,7 +934,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listInfoTypes(request, options, callback); + this._log.info('listInfoTypes request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IListInfoTypesResponse, + protos.google.privacy.dlp.v2.IListInfoTypesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('listInfoTypes response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.listInfoTypes(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IListInfoTypesResponse, + protos.google.privacy.dlp.v2.IListInfoTypesRequest|undefined, {}|undefined + ]) => { + this._log.info('listInfoTypes response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates an InspectTemplate for re-using frequently used configuration @@ -948,7 +1035,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createInspectTemplate(request, options, callback); + this._log.info('createInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.ICreateInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.ICreateInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('createInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the InspectTemplate. @@ -1025,7 +1129,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateInspectTemplate(request, options, callback); + this._log.info('updateInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IUpdateInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IUpdateInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('updateInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets an InspectTemplate. @@ -1098,7 +1219,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getInspectTemplate(request, options, callback); + this._log.info('getInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IGetInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IInspectTemplate, + protos.google.privacy.dlp.v2.IGetInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('getInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an InspectTemplate. @@ -1171,7 +1309,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteInspectTemplate(request, options, callback); + this._log.info('deleteInspectTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteInspectTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteInspectTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteInspectTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteInspectTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteInspectTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a DeidentifyTemplate for re-using frequently used configuration @@ -1256,7 +1411,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createDeidentifyTemplate(request, options, callback); + this._log.info('createDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.ICreateDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.ICreateDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('createDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the DeidentifyTemplate. @@ -1334,7 +1506,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateDeidentifyTemplate(request, options, callback); + this._log.info('updateDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IUpdateDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IUpdateDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('updateDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a DeidentifyTemplate. @@ -1408,7 +1597,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getDeidentifyTemplate(request, options, callback); + this._log.info('getDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IGetDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate, + protos.google.privacy.dlp.v2.IGetDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('getDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a DeidentifyTemplate. @@ -1482,7 +1688,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteDeidentifyTemplate(request, options, callback); + this._log.info('deleteDeidentifyTemplate request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDeidentifyTemplateRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteDeidentifyTemplate response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteDeidentifyTemplate(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDeidentifyTemplateRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteDeidentifyTemplate response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a job trigger to run DLP actions such as scanning storage for @@ -1565,7 +1788,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createJobTrigger(request, options, callback); + this._log.info('createJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.ICreateJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.ICreateJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('createJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a job trigger. @@ -1641,7 +1881,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateJobTrigger(request, options, callback); + this._log.info('updateJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IUpdateJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IUpdateJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('updateJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a job trigger. @@ -1713,7 +1970,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getJobTrigger(request, options, callback); + this._log.info('getJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IGetJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IJobTrigger, + protos.google.privacy.dlp.v2.IGetJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('getJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a job trigger. @@ -1785,7 +2059,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteJobTrigger(request, options, callback); + this._log.info('deleteJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Activate a job trigger. Causes the immediate execute of a trigger @@ -1857,7 +2148,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.activateJobTrigger(request, options, callback); + this._log.info('activateJobTrigger request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IActivateJobTriggerRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('activateJobTrigger response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.activateJobTrigger(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IActivateJobTriggerRequest|undefined, {}|undefined + ]) => { + this._log.info('activateJobTrigger response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new job to inspect storage or calculate risk metrics. @@ -1946,7 +2254,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createDlpJob(request, options, callback); + this._log.info('createDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.ICreateDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.ICreateDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('createDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the latest state of a long-running DlpJob. @@ -2018,7 +2343,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getDlpJob(request, options, callback); + this._log.info('getDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IGetDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IDlpJob, + protos.google.privacy.dlp.v2.IGetDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('getDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a long-running DlpJob. This method indicates that the client is @@ -2092,7 +2434,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteDlpJob(request, options, callback); + this._log.info('deleteDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Starts asynchronous cancellation on a long-running DlpJob. The server @@ -2166,7 +2525,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.cancelDlpJob(request, options, callback); + this._log.info('cancelDlpJob request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.ICancelDlpJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('cancelDlpJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.cancelDlpJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.ICancelDlpJobRequest|undefined, {}|undefined + ]) => { + this._log.info('cancelDlpJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a pre-built stored infoType to be used for inspection. @@ -2250,7 +2626,24 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.createStoredInfoType(request, options, callback); + this._log.info('createStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.ICreateStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.ICreateStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('createStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the stored infoType by creating a new version. The existing version @@ -2331,7 +2724,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateStoredInfoType(request, options, callback); + this._log.info('updateStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IUpdateStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IUpdateStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('updateStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a stored infoType. @@ -2405,7 +2815,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getStoredInfoType(request, options, callback); + this._log.info('getStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IGetStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.privacy.dlp.v2.IStoredInfoType, + protos.google.privacy.dlp.v2.IGetStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('getStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a stored infoType. @@ -2479,7 +2906,24 @@ export class DlpServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteStoredInfoType(request, options, callback); + this._log.info('deleteStoredInfoType request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteStoredInfoTypeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteStoredInfoType response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteStoredInfoType(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.privacy.dlp.v2.IDeleteStoredInfoTypeRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteStoredInfoType response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -2581,7 +3025,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listInspectTemplates(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListInspectTemplatesRequest, + protos.google.privacy.dlp.v2.IListInspectTemplatesResponse|null|undefined, + protos.google.privacy.dlp.v2.IInspectTemplate>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listInspectTemplates values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listInspectTemplates request %j', request); + return this.innerApiCalls + .listInspectTemplates(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IInspectTemplate[], + protos.google.privacy.dlp.v2.IListInspectTemplatesRequest|null, + protos.google.privacy.dlp.v2.IListInspectTemplatesResponse + ]) => { + this._log.info('listInspectTemplates values %j', response); + return [response, input, output]; + }); } /** @@ -2642,6 +3105,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listInspectTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInspectTemplates stream %j', request); return this.descriptors.page.listInspectTemplates.createStream( this.innerApiCalls.listInspectTemplates as GaxCall, request, @@ -2710,6 +3174,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listInspectTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInspectTemplates iterate %j', request); return this.descriptors.page.listInspectTemplates.asyncIterate( this.innerApiCalls['listInspectTemplates'] as GaxCall, request as {}, @@ -2816,7 +3281,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listDeidentifyTemplates(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesRequest, + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesResponse|null|undefined, + protos.google.privacy.dlp.v2.IDeidentifyTemplate>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listDeidentifyTemplates values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listDeidentifyTemplates request %j', request); + return this.innerApiCalls + .listDeidentifyTemplates(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IDeidentifyTemplate[], + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesRequest|null, + protos.google.privacy.dlp.v2.IListDeidentifyTemplatesResponse + ]) => { + this._log.info('listDeidentifyTemplates values %j', response); + return [response, input, output]; + }); } /** @@ -2877,6 +3361,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDeidentifyTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDeidentifyTemplates stream %j', request); return this.descriptors.page.listDeidentifyTemplates.createStream( this.innerApiCalls.listDeidentifyTemplates as GaxCall, request, @@ -2945,6 +3430,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDeidentifyTemplates']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDeidentifyTemplates iterate %j', request); return this.descriptors.page.listDeidentifyTemplates.asyncIterate( this.innerApiCalls['listDeidentifyTemplates'] as GaxCall, request as {}, @@ -3076,7 +3562,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listJobTriggers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListJobTriggersRequest, + protos.google.privacy.dlp.v2.IListJobTriggersResponse|null|undefined, + protos.google.privacy.dlp.v2.IJobTrigger>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listJobTriggers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listJobTriggers request %j', request); + return this.innerApiCalls + .listJobTriggers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IJobTrigger[], + protos.google.privacy.dlp.v2.IListJobTriggersRequest|null, + protos.google.privacy.dlp.v2.IListJobTriggersResponse + ]) => { + this._log.info('listJobTriggers values %j', response); + return [response, input, output]; + }); } /** @@ -3163,6 +3668,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listJobTriggers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobTriggers stream %j', request); return this.descriptors.page.listJobTriggers.createStream( this.innerApiCalls.listJobTriggers as GaxCall, request, @@ -3257,6 +3763,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listJobTriggers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listJobTriggers iterate %j', request); return this.descriptors.page.listJobTriggers.asyncIterate( this.innerApiCalls['listJobTriggers'] as GaxCall, request as {}, @@ -3391,7 +3898,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listDlpJobs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListDlpJobsRequest, + protos.google.privacy.dlp.v2.IListDlpJobsResponse|null|undefined, + protos.google.privacy.dlp.v2.IDlpJob>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listDlpJobs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listDlpJobs request %j', request); + return this.innerApiCalls + .listDlpJobs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IDlpJob[], + protos.google.privacy.dlp.v2.IListDlpJobsRequest|null, + protos.google.privacy.dlp.v2.IListDlpJobsResponse + ]) => { + this._log.info('listDlpJobs values %j', response); + return [response, input, output]; + }); } /** @@ -3480,6 +4006,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDlpJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDlpJobs stream %j', request); return this.descriptors.page.listDlpJobs.createStream( this.innerApiCalls.listDlpJobs as GaxCall, request, @@ -3576,6 +4103,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listDlpJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listDlpJobs iterate %j', request); return this.descriptors.page.listDlpJobs.asyncIterate( this.innerApiCalls['listDlpJobs'] as GaxCall, request as {}, @@ -3683,7 +4211,26 @@ export class DlpServiceClient { 'location_id': request.locationId ?? '', }); this.initialize(); - return this.innerApiCalls.listStoredInfoTypes(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.privacy.dlp.v2.IListStoredInfoTypesRequest, + protos.google.privacy.dlp.v2.IListStoredInfoTypesResponse|null|undefined, + protos.google.privacy.dlp.v2.IStoredInfoType>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listStoredInfoTypes values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listStoredInfoTypes request %j', request); + return this.innerApiCalls + .listStoredInfoTypes(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.privacy.dlp.v2.IStoredInfoType[], + protos.google.privacy.dlp.v2.IListStoredInfoTypesRequest|null, + protos.google.privacy.dlp.v2.IListStoredInfoTypesResponse + ]) => { + this._log.info('listStoredInfoTypes values %j', response); + return [response, input, output]; + }); } /** @@ -3745,6 +4292,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listStoredInfoTypes']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listStoredInfoTypes stream %j', request); return this.descriptors.page.listStoredInfoTypes.createStream( this.innerApiCalls.listStoredInfoTypes as GaxCall, request, @@ -3814,6 +4362,7 @@ export class DlpServiceClient { const defaultCallSettings = this._defaults['listStoredInfoTypes']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listStoredInfoTypes iterate %j', request); return this.descriptors.page.listStoredInfoTypes.asyncIterate( this.innerApiCalls['listStoredInfoTypes'] as GaxCall, request as {}, @@ -4167,6 +4716,7 @@ export class DlpServiceClient { close(): Promise { if (this.dlpServiceStub && !this._terminated) { return this.dlpServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline b/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline index 6d6963d09..071f0102e 100644 --- a/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline +++ b/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -72,6 +73,7 @@ export class KeyManagementServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('kms'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -430,7 +432,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getKeyRing(request, options, callback); + this._log.info('getKeyRing request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.IGetKeyRingRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getKeyRing response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getKeyRing(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.IGetKeyRingRequest|undefined, {}|undefined + ]) => { + this._log.info('getKeyRing response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns metadata for a given {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey}, as well as its @@ -501,7 +520,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getCryptoKey(request, options, callback); + this._log.info('getCryptoKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IGetCryptoKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getCryptoKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getCryptoKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IGetCryptoKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('getCryptoKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns metadata for a given {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion}. @@ -571,7 +607,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getCryptoKeyVersion(request, options, callback); + this._log.info('getCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IGetCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IGetCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('getCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns the public key for the given {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion}. The @@ -645,7 +698,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getPublicKey(request, options, callback); + this._log.info('getPublicKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IPublicKey, + protos.google.cloud.kms.v1.IGetPublicKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getPublicKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getPublicKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IPublicKey, + protos.google.cloud.kms.v1.IGetPublicKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('getPublicKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns metadata for a given {@link protos.google.cloud.kms.v1.ImportJob|ImportJob}. @@ -715,7 +785,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getImportJob(request, options, callback); + this._log.info('getImportJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.IGetImportJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getImportJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getImportJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.IGetImportJobRequest|undefined, {}|undefined + ]) => { + this._log.info('getImportJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.KeyRing|KeyRing} in a given Project and Location. @@ -791,7 +878,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createKeyRing(request, options, callback); + this._log.info('createKeyRing request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.ICreateKeyRingRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createKeyRing response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createKeyRing(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IKeyRing, + protos.google.cloud.kms.v1.ICreateKeyRingRequest|undefined, {}|undefined + ]) => { + this._log.info('createKeyRing response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey} within a {@link protos.google.cloud.kms.v1.KeyRing|KeyRing}. @@ -877,7 +981,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createCryptoKey(request, options, callback); + this._log.info('createCryptoKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.ICreateCryptoKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createCryptoKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createCryptoKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.ICreateCryptoKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('createCryptoKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} in a {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey}. @@ -954,7 +1075,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createCryptoKeyVersion(request, options, callback); + this._log.info('createCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.ICreateCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.ICreateCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('createCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Imports a new {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} into an existing {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey} using the @@ -1056,7 +1194,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.importCryptoKeyVersion(request, options, callback); + this._log.info('importCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IImportCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('importCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.importCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IImportCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('importCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a new {@link protos.google.cloud.kms.v1.ImportJob|ImportJob} within a {@link protos.google.cloud.kms.v1.KeyRing|KeyRing}. @@ -1134,7 +1289,24 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createImportJob(request, options, callback); + this._log.info('createImportJob request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.ICreateImportJobRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createImportJob response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createImportJob(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IImportJob, + protos.google.cloud.kms.v1.ICreateImportJobRequest|undefined, {}|undefined + ]) => { + this._log.info('createImportJob response %j', response); + return [response, options, rawResponse]; + }); } /** * Update a {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey}. @@ -1206,7 +1378,24 @@ export class KeyManagementServiceClient { 'crypto_key.name': request.cryptoKey!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCryptoKey(request, options, callback); + this._log.info('updateCryptoKey request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCryptoKey response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCryptoKey(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCryptoKey response %j', response); + return [response, options, rawResponse]; + }); } /** * Update a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion}'s metadata. @@ -1284,7 +1473,24 @@ export class KeyManagementServiceClient { 'crypto_key_version.name': request.cryptoKeyVersion!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCryptoKeyVersion(request, options, callback); + this._log.info('updateCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IUpdateCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IUpdateCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Encrypts data, so that it can only be recovered by a call to {@link protos.google.cloud.kms.v1.KeyManagementService.Decrypt|Decrypt}. @@ -1379,7 +1585,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.encrypt(request, options, callback); + this._log.info('encrypt request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IEncryptResponse, + protos.google.cloud.kms.v1.IEncryptRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('encrypt response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.encrypt(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IEncryptResponse, + protos.google.cloud.kms.v1.IEncryptRequest|undefined, {}|undefined + ]) => { + this._log.info('encrypt response %j', response); + return [response, options, rawResponse]; + }); } /** * Decrypts data that was protected by {@link protos.google.cloud.kms.v1.KeyManagementService.Encrypt|Encrypt}. The {@link protos.google.cloud.kms.v1.CryptoKey.purpose|CryptoKey.purpose} @@ -1457,7 +1680,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.decrypt(request, options, callback); + this._log.info('decrypt request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IDecryptResponse, + protos.google.cloud.kms.v1.IDecryptRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('decrypt response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.decrypt(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IDecryptResponse, + protos.google.cloud.kms.v1.IDecryptRequest|undefined, {}|undefined + ]) => { + this._log.info('decrypt response %j', response); + return [response, options, rawResponse]; + }); } /** * Signs data using a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} with {@link protos.google.cloud.kms.v1.CryptoKey.purpose|CryptoKey.purpose} @@ -1533,7 +1773,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.asymmetricSign(request, options, callback); + this._log.info('asymmetricSign request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IAsymmetricSignResponse, + protos.google.cloud.kms.v1.IAsymmetricSignRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('asymmetricSign response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.asymmetricSign(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IAsymmetricSignResponse, + protos.google.cloud.kms.v1.IAsymmetricSignRequest|undefined, {}|undefined + ]) => { + this._log.info('asymmetricSign response %j', response); + return [response, options, rawResponse]; + }); } /** * Decrypts data that was encrypted with a public key retrieved from @@ -1609,7 +1866,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.asymmetricDecrypt(request, options, callback); + this._log.info('asymmetricDecrypt request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.IAsymmetricDecryptResponse, + protos.google.cloud.kms.v1.IAsymmetricDecryptRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('asymmetricDecrypt response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.asymmetricDecrypt(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.IAsymmetricDecryptResponse, + protos.google.cloud.kms.v1.IAsymmetricDecryptRequest|undefined, {}|undefined + ]) => { + this._log.info('asymmetricDecrypt response %j', response); + return [response, options, rawResponse]; + }); } /** * Update the version of a {@link protos.google.cloud.kms.v1.CryptoKey|CryptoKey} that will be used in {@link protos.google.cloud.kms.v1.KeyManagementService.Encrypt|Encrypt}. @@ -1683,7 +1957,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCryptoKeyPrimaryVersion(request, options, callback); + this._log.info('updateCryptoKeyPrimaryVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyPrimaryVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCryptoKeyPrimaryVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCryptoKeyPrimaryVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKey, + protos.google.cloud.kms.v1.IUpdateCryptoKeyPrimaryVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCryptoKeyPrimaryVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Schedule a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} for destruction. @@ -1764,7 +2055,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.destroyCryptoKeyVersion(request, options, callback); + this._log.info('destroyCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IDestroyCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('destroyCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.destroyCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IDestroyCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('destroyCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** * Restore a {@link protos.google.cloud.kms.v1.CryptoKeyVersion|CryptoKeyVersion} in the @@ -1840,7 +2148,24 @@ export class KeyManagementServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.restoreCryptoKeyVersion(request, options, callback); + this._log.info('restoreCryptoKeyVersion request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IRestoreCryptoKeyVersionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('restoreCryptoKeyVersion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.restoreCryptoKeyVersion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion, + protos.google.cloud.kms.v1.IRestoreCryptoKeyVersionRequest|undefined, {}|undefined + ]) => { + this._log.info('restoreCryptoKeyVersion response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1930,7 +2255,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listKeyRings(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListKeyRingsRequest, + protos.google.cloud.kms.v1.IListKeyRingsResponse|null|undefined, + protos.google.cloud.kms.v1.IKeyRing>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listKeyRings values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listKeyRings request %j', request); + return this.innerApiCalls + .listKeyRings(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.IKeyRing[], + protos.google.cloud.kms.v1.IListKeyRingsRequest|null, + protos.google.cloud.kms.v1.IListKeyRingsResponse + ]) => { + this._log.info('listKeyRings values %j', response); + return [response, input, output]; + }); } /** @@ -1980,6 +2324,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listKeyRings']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listKeyRings stream %j', request); return this.descriptors.page.listKeyRings.createStream( this.innerApiCalls.listKeyRings as GaxCall, request, @@ -2037,6 +2382,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listKeyRings']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listKeyRings iterate %j', request); return this.descriptors.page.listKeyRings.asyncIterate( this.innerApiCalls['listKeyRings'] as GaxCall, request as {}, @@ -2132,7 +2478,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listCryptoKeys(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListCryptoKeysRequest, + protos.google.cloud.kms.v1.IListCryptoKeysResponse|null|undefined, + protos.google.cloud.kms.v1.ICryptoKey>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listCryptoKeys values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listCryptoKeys request %j', request); + return this.innerApiCalls + .listCryptoKeys(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.ICryptoKey[], + protos.google.cloud.kms.v1.IListCryptoKeysRequest|null, + protos.google.cloud.kms.v1.IListCryptoKeysResponse + ]) => { + this._log.info('listCryptoKeys values %j', response); + return [response, input, output]; + }); } /** @@ -2184,6 +2549,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeys']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeys stream %j', request); return this.descriptors.page.listCryptoKeys.createStream( this.innerApiCalls.listCryptoKeys as GaxCall, request, @@ -2243,6 +2609,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeys']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeys iterate %j', request); return this.descriptors.page.listCryptoKeys.asyncIterate( this.innerApiCalls['listCryptoKeys'] as GaxCall, request as {}, @@ -2339,7 +2706,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listCryptoKeyVersions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListCryptoKeyVersionsRequest, + protos.google.cloud.kms.v1.IListCryptoKeyVersionsResponse|null|undefined, + protos.google.cloud.kms.v1.ICryptoKeyVersion>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listCryptoKeyVersions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listCryptoKeyVersions request %j', request); + return this.innerApiCalls + .listCryptoKeyVersions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.ICryptoKeyVersion[], + protos.google.cloud.kms.v1.IListCryptoKeyVersionsRequest|null, + protos.google.cloud.kms.v1.IListCryptoKeyVersionsResponse + ]) => { + this._log.info('listCryptoKeyVersions values %j', response); + return [response, input, output]; + }); } /** @@ -2392,6 +2778,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeyVersions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeyVersions stream %j', request); return this.descriptors.page.listCryptoKeyVersions.createStream( this.innerApiCalls.listCryptoKeyVersions as GaxCall, request, @@ -2452,6 +2839,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listCryptoKeyVersions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listCryptoKeyVersions iterate %j', request); return this.descriptors.page.listCryptoKeyVersions.asyncIterate( this.innerApiCalls['listCryptoKeyVersions'] as GaxCall, request as {}, @@ -2545,7 +2933,26 @@ export class KeyManagementServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listImportJobs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.kms.v1.IListImportJobsRequest, + protos.google.cloud.kms.v1.IListImportJobsResponse|null|undefined, + protos.google.cloud.kms.v1.IImportJob>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listImportJobs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listImportJobs request %j', request); + return this.innerApiCalls + .listImportJobs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.kms.v1.IImportJob[], + protos.google.cloud.kms.v1.IListImportJobsRequest|null, + protos.google.cloud.kms.v1.IListImportJobsResponse + ]) => { + this._log.info('listImportJobs values %j', response); + return [response, input, output]; + }); } /** @@ -2595,6 +3002,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listImportJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listImportJobs stream %j', request); return this.descriptors.page.listImportJobs.createStream( this.innerApiCalls.listImportJobs as GaxCall, request, @@ -2652,6 +3060,7 @@ export class KeyManagementServiceClient { const defaultCallSettings = this._defaults['listImportJobs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listImportJobs iterate %j', request); return this.descriptors.page.listImportJobs.asyncIterate( this.innerApiCalls['listImportJobs'] as GaxCall, request as {}, @@ -2806,6 +3215,7 @@ export class KeyManagementServiceClient { close(): Promise { if (this.keyManagementServiceStub && !this._terminated) { return this.keyManagementServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.iamClient.close(); diff --git a/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline b/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline index 706eded33..8d80b64e0 100644 --- a/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class ConfigServiceV2Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('logging'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -555,7 +557,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getBucket(request, options, callback); + this._log.info('getBucket request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IGetBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IGetBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('getBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a log bucket that can be used to store log entries. After a bucket @@ -640,7 +659,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createBucket(request, options, callback); + this._log.info('createBucket request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.ICreateBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.ICreateBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('createBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a log bucket. This method replaces the following fields in the @@ -739,7 +775,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateBucket(request, options, callback); + this._log.info('updateBucket request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IUpdateBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogBucket, + protos.google.logging.v2.IUpdateBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('updateBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a log bucket. @@ -822,7 +875,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteBucket(request, options, callback); + this._log.info('deleteBucket request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Undeletes a log bucket. A bucket that has been deleted can be undeleted @@ -902,7 +972,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.undeleteBucket(request, options, callback); + this._log.info('undeleteBucket request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IUndeleteBucketRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('undeleteBucket response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.undeleteBucket(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IUndeleteBucketRequest|undefined, {}|undefined + ]) => { + this._log.info('undeleteBucket response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a view on a log bucket.. @@ -978,7 +1065,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getView(request, options, callback); + this._log.info('getView request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IGetViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IGetViewRequest|undefined, {}|undefined + ]) => { + this._log.info('getView response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a view over log entries in a log bucket. A bucket may contain a @@ -1059,7 +1163,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createView(request, options, callback); + this._log.info('createView request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogView, + protos.google.logging.v2.ICreateViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogView, + protos.google.logging.v2.ICreateViewRequest|undefined, {}|undefined + ]) => { + this._log.info('createView response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a view on a log bucket. This method replaces the following fields @@ -1150,7 +1271,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateView(request, options, callback); + this._log.info('updateView request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IUpdateViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogView, + protos.google.logging.v2.IUpdateViewRequest|undefined, {}|undefined + ]) => { + this._log.info('updateView response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a view on a log bucket. @@ -1229,7 +1367,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteView(request, options, callback); + this._log.info('deleteView request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteViewRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteView response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteView(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteViewRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteView response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a sink. @@ -1308,7 +1463,24 @@ export class ConfigServiceV2Client { 'sink_name': request.sinkName ?? '', }); this.initialize(); - return this.innerApiCalls.getSink(request, options, callback); + this._log.info('getSink request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IGetSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IGetSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('getSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a sink that exports specified log entries to a destination. The @@ -1406,7 +1578,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createSink(request, options, callback); + this._log.info('createSink request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.ICreateSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.ICreateSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('createSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a sink. This method replaces the following fields in the existing @@ -1522,7 +1711,24 @@ export class ConfigServiceV2Client { 'sink_name': request.sinkName ?? '', }); this.initialize(); - return this.innerApiCalls.updateSink(request, options, callback); + this._log.info('updateSink request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IUpdateSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogSink, + protos.google.logging.v2.IUpdateSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('updateSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a sink. If the sink has a unique `writer_identity`, then that @@ -1603,7 +1809,24 @@ export class ConfigServiceV2Client { 'sink_name': request.sinkName ?? '', }); this.initialize(); - return this.innerApiCalls.deleteSink(request, options, callback); + this._log.info('deleteSink request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteSinkRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSink response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteSink(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteSinkRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteSink response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the description of an exclusion in the _Default sink. @@ -1682,7 +1905,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getExclusion(request, options, callback); + this._log.info('getExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IGetExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IGetExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('getExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new exclusion in the _Default sink in a specified parent @@ -1767,7 +2007,24 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createExclusion(request, options, callback); + this._log.info('createExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.ICreateExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.ICreateExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('createExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Changes one or more properties of an existing exclusion in the _Default @@ -1858,7 +2115,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateExclusion(request, options, callback); + this._log.info('updateExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IUpdateExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogExclusion, + protos.google.logging.v2.IUpdateExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('updateExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an exclusion in the _Default sink. @@ -1937,7 +2211,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteExclusion(request, options, callback); + this._log.info('deleteExclusion request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteExclusionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteExclusion response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteExclusion(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteExclusionRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteExclusion response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the Logging CMEK settings for the given resource. @@ -2030,7 +2321,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getCmekSettings(request, options, callback); + this._log.info('getCmekSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IGetCmekSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getCmekSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getCmekSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IGetCmekSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('getCmekSettings response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the Log Router CMEK settings for the given resource. @@ -2141,7 +2449,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateCmekSettings(request, options, callback); + this._log.info('updateCmekSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IUpdateCmekSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateCmekSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateCmekSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ICmekSettings, + protos.google.logging.v2.IUpdateCmekSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('updateCmekSettings response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the Log Router settings for the given resource. @@ -2234,7 +2559,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSettings(request, options, callback); + this._log.info('getSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IGetSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IGetSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('getSettings response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates the Log Router settings for the given resource. @@ -2343,7 +2685,24 @@ export class ConfigServiceV2Client { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateSettings(request, options, callback); + this._log.info('updateSettings request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IUpdateSettingsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateSettings response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateSettings(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ISettings, + protos.google.logging.v2.IUpdateSettingsRequest|undefined, {}|undefined + ]) => { + this._log.info('updateSettings response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -2420,7 +2779,24 @@ export class ConfigServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.copyLogEntries(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.logging.v2.ICopyLogEntriesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('copyLogEntries response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('copyLogEntries request %j', request); + return this.innerApiCalls.copyLogEntries(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.logging.v2.ICopyLogEntriesRequest|undefined, {}|undefined + ]) => { + this._log.info('copyLogEntries response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `copyLogEntries()`. @@ -2434,6 +2810,7 @@ export class ConfigServiceV2Client { * region_tag:logging_v2_generated_ConfigServiceV2_CopyLogEntries_async */ async checkCopyLogEntriesProgress(name: string): Promise>{ + this._log.info('copyLogEntries long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.copyLogEntries, this._gaxModule.createDefaultBackoffSettings()); @@ -2530,7 +2907,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listBuckets(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListBucketsRequest, + protos.google.logging.v2.IListBucketsResponse|null|undefined, + protos.google.logging.v2.ILogBucket>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listBuckets values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listBuckets request %j', request); + return this.innerApiCalls + .listBuckets(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogBucket[], + protos.google.logging.v2.IListBucketsRequest|null, + protos.google.logging.v2.IListBucketsResponse + ]) => { + this._log.info('listBuckets values %j', response); + return [response, input, output]; + }); } /** @@ -2584,6 +2980,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listBuckets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBuckets stream %j', request); return this.descriptors.page.listBuckets.createStream( this.innerApiCalls.listBuckets as GaxCall, request, @@ -2645,6 +3042,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listBuckets']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBuckets iterate %j', request); return this.descriptors.page.listBuckets.asyncIterate( this.innerApiCalls['listBuckets'] as GaxCall, request as {}, @@ -2736,7 +3134,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listViews(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListViewsRequest, + protos.google.logging.v2.IListViewsResponse|null|undefined, + protos.google.logging.v2.ILogView>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listViews values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listViews request %j', request); + return this.innerApiCalls + .listViews(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogView[], + protos.google.logging.v2.IListViewsRequest|null, + protos.google.logging.v2.IListViewsResponse + ]) => { + this._log.info('listViews values %j', response); + return [response, input, output]; + }); } /** @@ -2784,6 +3201,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listViews']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listViews stream %j', request); return this.descriptors.page.listViews.createStream( this.innerApiCalls.listViews as GaxCall, request, @@ -2839,6 +3257,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listViews']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listViews iterate %j', request); return this.descriptors.page.listViews.asyncIterate( this.innerApiCalls['listViews'] as GaxCall, request as {}, @@ -2932,7 +3351,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listSinks(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListSinksRequest, + protos.google.logging.v2.IListSinksResponse|null|undefined, + protos.google.logging.v2.ILogSink>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSinks values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listSinks request %j', request); + return this.innerApiCalls + .listSinks(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogSink[], + protos.google.logging.v2.IListSinksRequest|null, + protos.google.logging.v2.IListSinksResponse + ]) => { + this._log.info('listSinks values %j', response); + return [response, input, output]; + }); } /** @@ -2982,6 +3420,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listSinks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSinks stream %j', request); return this.descriptors.page.listSinks.createStream( this.innerApiCalls.listSinks as GaxCall, request, @@ -3039,6 +3478,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listSinks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSinks iterate %j', request); return this.descriptors.page.listSinks.asyncIterate( this.innerApiCalls['listSinks'] as GaxCall, request as {}, @@ -3132,7 +3572,26 @@ export class ConfigServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listExclusions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListExclusionsRequest, + protos.google.logging.v2.IListExclusionsResponse|null|undefined, + protos.google.logging.v2.ILogExclusion>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listExclusions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listExclusions request %j', request); + return this.innerApiCalls + .listExclusions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogExclusion[], + protos.google.logging.v2.IListExclusionsRequest|null, + protos.google.logging.v2.IListExclusionsResponse + ]) => { + this._log.info('listExclusions values %j', response); + return [response, input, output]; + }); } /** @@ -3182,6 +3641,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listExclusions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listExclusions stream %j', request); return this.descriptors.page.listExclusions.createStream( this.innerApiCalls.listExclusions as GaxCall, request, @@ -3239,6 +3699,7 @@ export class ConfigServiceV2Client { const defaultCallSettings = this._defaults['listExclusions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listExclusions iterate %j', request); return this.descriptors.page.listExclusions.asyncIterate( this.innerApiCalls['listExclusions'] as GaxCall, request as {}, @@ -4413,6 +4874,7 @@ export class ConfigServiceV2Client { close(): Promise { if (this.configServiceV2Stub && !this._terminated) { return this.configServiceV2Stub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline index 1698174e2..fe8b7f791 100644 --- a/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline +++ b/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class LoggingServiceV2Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('logging'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -561,7 +563,24 @@ export class LoggingServiceV2Client { 'log_name': request.logName ?? '', }); this.initialize(); - return this.innerApiCalls.deleteLog(request, options, callback); + this._log.info('deleteLog request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteLog response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteLog(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteLog response %j', response); + return [response, options, rawResponse]; + }); } /** * Writes log entries to Logging. This API method is the @@ -697,7 +716,24 @@ export class LoggingServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.writeLogEntries(request, options, callback); + this._log.info('writeLogEntries request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.IWriteLogEntriesResponse, + protos.google.logging.v2.IWriteLogEntriesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('writeLogEntries response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.writeLogEntries(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.IWriteLogEntriesResponse, + protos.google.logging.v2.IWriteLogEntriesRequest|undefined, {}|undefined + ]) => { + this._log.info('writeLogEntries response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -719,6 +755,7 @@ export class LoggingServiceV2Client { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('tailLogEntries stream %j', options); return this.innerApiCalls.tailLogEntries(null, options); } @@ -833,7 +870,26 @@ export class LoggingServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listLogEntries(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListLogEntriesRequest, + protos.google.logging.v2.IListLogEntriesResponse|null|undefined, + protos.google.logging.v2.ILogEntry>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listLogEntries values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listLogEntries request %j', request); + return this.innerApiCalls + .listLogEntries(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogEntry[], + protos.google.logging.v2.IListLogEntriesRequest|null, + protos.google.logging.v2.IListLogEntriesResponse + ]) => { + this._log.info('listLogEntries values %j', response); + return [response, input, output]; + }); } /** @@ -904,6 +960,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogEntries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogEntries stream %j', request); return this.descriptors.page.listLogEntries.createStream( this.innerApiCalls.listLogEntries as GaxCall, request, @@ -982,6 +1039,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogEntries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogEntries iterate %j', request); return this.descriptors.page.listLogEntries.asyncIterate( this.innerApiCalls['listLogEntries'] as GaxCall, request as {}, @@ -1063,7 +1121,26 @@ export class LoggingServiceV2Client { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listMonitoredResourceDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListMonitoredResourceDescriptorsRequest, + protos.google.logging.v2.IListMonitoredResourceDescriptorsResponse|null|undefined, + protos.google.api.IMonitoredResourceDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listMonitoredResourceDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listMonitoredResourceDescriptors request %j', request); + return this.innerApiCalls + .listMonitoredResourceDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMonitoredResourceDescriptor[], + protos.google.logging.v2.IListMonitoredResourceDescriptorsRequest|null, + protos.google.logging.v2.IListMonitoredResourceDescriptorsResponse + ]) => { + this._log.info('listMonitoredResourceDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -1101,6 +1178,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors stream %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.createStream( this.innerApiCalls.listMonitoredResourceDescriptors as GaxCall, request, @@ -1146,6 +1224,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors iterate %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.asyncIterate( this.innerApiCalls['listMonitoredResourceDescriptors'] as GaxCall, request as {}, @@ -1254,7 +1333,26 @@ export class LoggingServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listLogs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListLogsRequest, + protos.google.logging.v2.IListLogsResponse|null|undefined, + string>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listLogs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listLogs request %j', request); + return this.innerApiCalls + .listLogs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + string[], + protos.google.logging.v2.IListLogsRequest|null, + protos.google.logging.v2.IListLogsResponse + ]) => { + this._log.info('listLogs values %j', response); + return [response, input, output]; + }); } /** @@ -1318,6 +1416,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogs stream %j', request); return this.descriptors.page.listLogs.createStream( this.innerApiCalls.listLogs as GaxCall, request, @@ -1389,6 +1488,7 @@ export class LoggingServiceV2Client { const defaultCallSettings = this._defaults['listLogs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogs iterate %j', request); return this.descriptors.page.listLogs.asyncIterate( this.innerApiCalls['listLogs'] as GaxCall, request as {}, @@ -2527,6 +2627,7 @@ export class LoggingServiceV2Client { close(): Promise { if (this.loggingServiceV2Stub && !this._terminated) { return this.loggingServiceV2Stub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline b/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline index 7155ecdf0..f54103c93 100644 --- a/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline +++ b/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class MetricsServiceV2Client { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('logging'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -513,7 +515,24 @@ export class MetricsServiceV2Client { 'metric_name': request.metricName ?? '', }); this.initialize(); - return this.innerApiCalls.getLogMetric(request, options, callback); + this._log.info('getLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IGetLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IGetLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('getLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a logs-based metric. @@ -590,7 +609,24 @@ export class MetricsServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createLogMetric(request, options, callback); + this._log.info('createLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.ICreateLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.ICreateLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('createLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates or updates a logs-based metric. @@ -668,7 +704,24 @@ export class MetricsServiceV2Client { 'metric_name': request.metricName ?? '', }); this.initialize(); - return this.innerApiCalls.updateLogMetric(request, options, callback); + this._log.info('updateLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IUpdateLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.logging.v2.ILogMetric, + protos.google.logging.v2.IUpdateLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('updateLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a logs-based metric. @@ -740,7 +793,24 @@ export class MetricsServiceV2Client { 'metric_name': request.metricName ?? '', }); this.initialize(); - return this.innerApiCalls.deleteLogMetric(request, options, callback); + this._log.info('deleteLogMetric request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogMetricRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteLogMetric response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteLogMetric(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.logging.v2.IDeleteLogMetricRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteLogMetric response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -827,7 +897,26 @@ export class MetricsServiceV2Client { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listLogMetrics(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.logging.v2.IListLogMetricsRequest, + protos.google.logging.v2.IListLogMetricsResponse|null|undefined, + protos.google.logging.v2.ILogMetric>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listLogMetrics values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listLogMetrics request %j', request); + return this.innerApiCalls + .listLogMetrics(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.logging.v2.ILogMetric[], + protos.google.logging.v2.IListLogMetricsRequest|null, + protos.google.logging.v2.IListLogMetricsResponse + ]) => { + this._log.info('listLogMetrics values %j', response); + return [response, input, output]; + }); } /** @@ -874,6 +963,7 @@ export class MetricsServiceV2Client { const defaultCallSettings = this._defaults['listLogMetrics']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogMetrics stream %j', request); return this.descriptors.page.listLogMetrics.createStream( this.innerApiCalls.listLogMetrics as GaxCall, request, @@ -928,6 +1018,7 @@ export class MetricsServiceV2Client { const defaultCallSettings = this._defaults['listLogMetrics']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listLogMetrics iterate %j', request); return this.descriptors.page.listLogMetrics.asyncIterate( this.innerApiCalls['listLogMetrics'] as GaxCall, request as {}, @@ -2066,6 +2157,7 @@ export class MetricsServiceV2Client { close(): Promise { if (this.metricsServiceV2Stub && !this._terminated) { return this.metricsServiceV2Stub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline index ab671a08d..efec6bf01 100644 --- a/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -70,6 +71,7 @@ export class AlertPolicyServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -501,7 +503,24 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getAlertPolicy(request, options, callback); + this._log.info('getAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IGetAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IGetAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('getAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new alerting policy. @@ -582,7 +601,24 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createAlertPolicy(request, options, callback); + this._log.info('createAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.ICreateAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.ICreateAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('createAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an alerting policy. @@ -656,7 +692,24 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteAlertPolicy(request, options, callback); + this._log.info('deleteAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an alerting policy. You can either replace the entire policy with @@ -754,7 +807,24 @@ export class AlertPolicyServiceClient { 'alert_policy.name': request.alertPolicy!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateAlertPolicy(request, options, callback); + this._log.info('updateAlertPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IUpdateAlertPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateAlertPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateAlertPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IAlertPolicy, + protos.google.monitoring.v3.IUpdateAlertPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('updateAlertPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -857,7 +927,26 @@ export class AlertPolicyServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listAlertPolicies(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListAlertPoliciesRequest, + protos.google.monitoring.v3.IListAlertPoliciesResponse|null|undefined, + protos.google.monitoring.v3.IAlertPolicy>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listAlertPolicies values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listAlertPolicies request %j', request); + return this.innerApiCalls + .listAlertPolicies(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IAlertPolicy[], + protos.google.monitoring.v3.IListAlertPoliciesRequest|null, + protos.google.monitoring.v3.IListAlertPoliciesResponse + ]) => { + this._log.info('listAlertPolicies values %j', response); + return [response, input, output]; + }); } /** @@ -920,6 +1009,7 @@ export class AlertPolicyServiceClient { const defaultCallSettings = this._defaults['listAlertPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listAlertPolicies stream %j', request); return this.descriptors.page.listAlertPolicies.createStream( this.innerApiCalls.listAlertPolicies as GaxCall, request, @@ -990,6 +1080,7 @@ export class AlertPolicyServiceClient { const defaultCallSettings = this._defaults['listAlertPolicies']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listAlertPolicies iterate %j', request); return this.descriptors.page.listAlertPolicies.asyncIterate( this.innerApiCalls['listAlertPolicies'] as GaxCall, request as {}, @@ -1951,6 +2042,7 @@ export class AlertPolicyServiceClient { close(): Promise { if (this.alertPolicyServiceStub && !this._terminated) { return this.alertPolicyServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline index 9598ac246..2ea434288 100644 --- a/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -73,6 +74,7 @@ export class GroupServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -505,7 +507,24 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getGroup(request, options, callback); + this._log.info('getGroup request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IGetGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IGetGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('getGroup response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new group. @@ -581,7 +600,24 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createGroup(request, options, callback); + this._log.info('createGroup request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.ICreateGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.ICreateGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('createGroup response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an existing group. @@ -655,7 +691,24 @@ export class GroupServiceClient { 'group.name': request.group!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateGroup(request, options, callback); + this._log.info('updateGroup request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IUpdateGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGroup, + protos.google.monitoring.v3.IUpdateGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('updateGroup response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an existing group. @@ -730,7 +783,24 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteGroup(request, options, callback); + this._log.info('deleteGroup request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteGroupRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteGroup response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteGroup(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteGroupRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteGroup response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -828,7 +898,26 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listGroups(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListGroupsRequest, + protos.google.monitoring.v3.IListGroupsResponse|null|undefined, + protos.google.monitoring.v3.IGroup>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listGroups values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listGroups request %j', request); + return this.innerApiCalls + .listGroups(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IGroup[], + protos.google.monitoring.v3.IListGroupsRequest|null, + protos.google.monitoring.v3.IListGroupsResponse + ]) => { + this._log.info('listGroups values %j', response); + return [response, input, output]; + }); } /** @@ -886,6 +975,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroups']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroups stream %j', request); return this.descriptors.page.listGroups.createStream( this.innerApiCalls.listGroups as GaxCall, request, @@ -951,6 +1041,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroups']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroups iterate %j', request); return this.descriptors.page.listGroups.asyncIterate( this.innerApiCalls['listGroups'] as GaxCall, request as {}, @@ -1050,7 +1141,26 @@ export class GroupServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listGroupMembers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListGroupMembersRequest, + protos.google.monitoring.v3.IListGroupMembersResponse|null|undefined, + protos.google.api.IMonitoredResource>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listGroupMembers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listGroupMembers request %j', request); + return this.innerApiCalls + .listGroupMembers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMonitoredResource[], + protos.google.monitoring.v3.IListGroupMembersRequest|null, + protos.google.monitoring.v3.IListGroupMembersResponse + ]) => { + this._log.info('listGroupMembers values %j', response); + return [response, input, output]; + }); } /** @@ -1106,6 +1216,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroupMembers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroupMembers stream %j', request); return this.descriptors.page.listGroupMembers.createStream( this.innerApiCalls.listGroupMembers as GaxCall, request, @@ -1169,6 +1280,7 @@ export class GroupServiceClient { const defaultCallSettings = this._defaults['listGroupMembers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGroupMembers iterate %j', request); return this.descriptors.page.listGroupMembers.asyncIterate( this.innerApiCalls['listGroupMembers'] as GaxCall, request as {}, @@ -2130,6 +2242,7 @@ export class GroupServiceClient { close(): Promise { if (this.groupServiceStub && !this._terminated) { return this.groupServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline index 07ebcbbab..47ea4a00b 100644 --- a/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -63,6 +64,7 @@ export class MetricServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -518,7 +520,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getMonitoredResourceDescriptor(request, options, callback); + this._log.info('getMonitoredResourceDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.api.IMonitoredResourceDescriptor, + protos.google.monitoring.v3.IGetMonitoredResourceDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getMonitoredResourceDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getMonitoredResourceDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.api.IMonitoredResourceDescriptor, + protos.google.monitoring.v3.IGetMonitoredResourceDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('getMonitoredResourceDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a single metric descriptor. This method does not require a Stackdriver account. @@ -591,7 +610,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getMetricDescriptor(request, options, callback); + this._log.info('getMetricDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.IGetMetricDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getMetricDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getMetricDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.IGetMetricDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('getMetricDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new metric descriptor. @@ -667,7 +703,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createMetricDescriptor(request, options, callback); + this._log.info('createMetricDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.ICreateMetricDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createMetricDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createMetricDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.api.IMetricDescriptor, + protos.google.monitoring.v3.ICreateMetricDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('createMetricDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a metric descriptor. Only user-created @@ -741,7 +794,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteMetricDescriptor(request, options, callback); + this._log.info('deleteMetricDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteMetricDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteMetricDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteMetricDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteMetricDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteMetricDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates or adds data to one or more time series. @@ -823,7 +893,24 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createTimeSeries(request, options, callback); + this._log.info('createTimeSeries request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ICreateTimeSeriesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createTimeSeries response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createTimeSeries(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ICreateTimeSeriesRequest|undefined, {}|undefined + ]) => { + this._log.info('createTimeSeries response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -914,7 +1001,26 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listMonitoredResourceDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsRequest, + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsResponse|null|undefined, + protos.google.api.IMonitoredResourceDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listMonitoredResourceDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listMonitoredResourceDescriptors request %j', request); + return this.innerApiCalls + .listMonitoredResourceDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMonitoredResourceDescriptor[], + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsRequest|null, + protos.google.monitoring.v3.IListMonitoredResourceDescriptorsResponse + ]) => { + this._log.info('listMonitoredResourceDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -965,6 +1071,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors stream %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.createStream( this.innerApiCalls.listMonitoredResourceDescriptors as GaxCall, request, @@ -1023,6 +1130,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMonitoredResourceDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMonitoredResourceDescriptors iterate %j', request); return this.descriptors.page.listMonitoredResourceDescriptors.asyncIterate( this.innerApiCalls['listMonitoredResourceDescriptors'] as GaxCall, request as {}, @@ -1118,7 +1226,26 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listMetricDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListMetricDescriptorsRequest, + protos.google.monitoring.v3.IListMetricDescriptorsResponse|null|undefined, + protos.google.api.IMetricDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listMetricDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listMetricDescriptors request %j', request); + return this.innerApiCalls + .listMetricDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.api.IMetricDescriptor[], + protos.google.monitoring.v3.IListMetricDescriptorsRequest|null, + protos.google.monitoring.v3.IListMetricDescriptorsResponse + ]) => { + this._log.info('listMetricDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -1170,6 +1297,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMetricDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMetricDescriptors stream %j', request); return this.descriptors.page.listMetricDescriptors.createStream( this.innerApiCalls.listMetricDescriptors as GaxCall, request, @@ -1229,6 +1357,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listMetricDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listMetricDescriptors iterate %j', request); return this.descriptors.page.listMetricDescriptors.asyncIterate( this.innerApiCalls['listMetricDescriptors'] as GaxCall, request as {}, @@ -1342,7 +1471,26 @@ export class MetricServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listTimeSeries(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListTimeSeriesRequest, + protos.google.monitoring.v3.IListTimeSeriesResponse|null|undefined, + protos.google.monitoring.v3.ITimeSeries>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTimeSeries values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTimeSeries request %j', request); + return this.innerApiCalls + .listTimeSeries(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.ITimeSeries[], + protos.google.monitoring.v3.IListTimeSeriesRequest|null, + protos.google.monitoring.v3.IListTimeSeriesResponse + ]) => { + this._log.info('listTimeSeries values %j', response); + return [response, input, output]; + }); } /** @@ -1412,6 +1560,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listTimeSeries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTimeSeries stream %j', request); return this.descriptors.page.listTimeSeries.createStream( this.innerApiCalls.listTimeSeries as GaxCall, request, @@ -1489,6 +1638,7 @@ export class MetricServiceClient { const defaultCallSettings = this._defaults['listTimeSeries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTimeSeries iterate %j', request); return this.descriptors.page.listTimeSeries.asyncIterate( this.innerApiCalls['listTimeSeries'] as GaxCall, request as {}, @@ -2666,6 +2816,7 @@ export class MetricServiceClient { close(): Promise { if (this.metricServiceStub && !this._terminated) { return this.metricServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline index bbd8752be..c89e90950 100644 --- a/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -63,6 +64,7 @@ export class NotificationChannelServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -496,7 +498,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getNotificationChannelDescriptor(request, options, callback); + this._log.info('getNotificationChannelDescriptor request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannelDescriptor, + protos.google.monitoring.v3.IGetNotificationChannelDescriptorRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getNotificationChannelDescriptor response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getNotificationChannelDescriptor(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannelDescriptor, + protos.google.monitoring.v3.IGetNotificationChannelDescriptorRequest|undefined, {}|undefined + ]) => { + this._log.info('getNotificationChannelDescriptor response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a single notification channel. The channel includes the relevant @@ -571,7 +590,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getNotificationChannel(request, options, callback); + this._log.info('getNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IGetNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IGetNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('getNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new notification channel, representing a single notification @@ -651,7 +687,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.createNotificationChannel(request, options, callback); + this._log.info('createNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.ICreateNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.ICreateNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('createNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a notification channel. Fields not specified in the field mask @@ -727,7 +780,24 @@ export class NotificationChannelServiceClient { 'notification_channel.name': request.notificationChannel!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateNotificationChannel(request, options, callback); + this._log.info('updateNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IUpdateNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IUpdateNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('updateNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a notification channel. @@ -803,7 +873,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteNotificationChannel(request, options, callback); + this._log.info('deleteNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** * Causes a verification code to be delivered to the channel. The code @@ -874,7 +961,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.sendNotificationChannelVerificationCode(request, options, callback); + this._log.info('sendNotificationChannelVerificationCode request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ISendNotificationChannelVerificationCodeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('sendNotificationChannelVerificationCode response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.sendNotificationChannelVerificationCode(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.ISendNotificationChannelVerificationCodeRequest|undefined, {}|undefined + ]) => { + this._log.info('sendNotificationChannelVerificationCode response %j', response); + return [response, options, rawResponse]; + }); } /** * Requests a verification code for an already verified channel that can then @@ -976,7 +1080,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getNotificationChannelVerificationCode(request, options, callback); + this._log.info('getNotificationChannelVerificationCode request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeResponse, + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getNotificationChannelVerificationCode response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getNotificationChannelVerificationCode(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeResponse, + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeRequest|undefined, {}|undefined + ]) => { + this._log.info('getNotificationChannelVerificationCode response %j', response); + return [response, options, rawResponse]; + }); } /** * Verifies a `NotificationChannel` by proving receipt of the code @@ -1056,7 +1177,24 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.verifyNotificationChannel(request, options, callback); + this._log.info('verifyNotificationChannel request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IVerifyNotificationChannelRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyNotificationChannel response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyNotificationChannel(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.INotificationChannel, + protos.google.monitoring.v3.IVerifyNotificationChannelRequest|undefined, {}|undefined + ]) => { + this._log.info('verifyNotificationChannel response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1149,7 +1287,26 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listNotificationChannelDescriptors(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListNotificationChannelDescriptorsRequest, + protos.google.monitoring.v3.IListNotificationChannelDescriptorsResponse|null|undefined, + protos.google.monitoring.v3.INotificationChannelDescriptor>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listNotificationChannelDescriptors values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listNotificationChannelDescriptors request %j', request); + return this.innerApiCalls + .listNotificationChannelDescriptors(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.INotificationChannelDescriptor[], + protos.google.monitoring.v3.IListNotificationChannelDescriptorsRequest|null, + protos.google.monitoring.v3.IListNotificationChannelDescriptorsResponse + ]) => { + this._log.info('listNotificationChannelDescriptors values %j', response); + return [response, input, output]; + }); } /** @@ -1201,6 +1358,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannelDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannelDescriptors stream %j', request); return this.descriptors.page.listNotificationChannelDescriptors.createStream( this.innerApiCalls.listNotificationChannelDescriptors as GaxCall, request, @@ -1260,6 +1418,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannelDescriptors']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannelDescriptors iterate %j', request); return this.descriptors.page.listNotificationChannelDescriptors.asyncIterate( this.innerApiCalls['listNotificationChannelDescriptors'] as GaxCall, request as {}, @@ -1366,7 +1525,26 @@ export class NotificationChannelServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.listNotificationChannels(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListNotificationChannelsRequest, + protos.google.monitoring.v3.IListNotificationChannelsResponse|null|undefined, + protos.google.monitoring.v3.INotificationChannel>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listNotificationChannels values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listNotificationChannels request %j', request); + return this.innerApiCalls + .listNotificationChannels(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.INotificationChannel[], + protos.google.monitoring.v3.IListNotificationChannelsRequest|null, + protos.google.monitoring.v3.IListNotificationChannelsResponse + ]) => { + this._log.info('listNotificationChannels values %j', response); + return [response, input, output]; + }); } /** @@ -1429,6 +1607,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannels stream %j', request); return this.descriptors.page.listNotificationChannels.createStream( this.innerApiCalls.listNotificationChannels as GaxCall, request, @@ -1499,6 +1678,7 @@ export class NotificationChannelServiceClient { const defaultCallSettings = this._defaults['listNotificationChannels']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listNotificationChannels iterate %j', request); return this.descriptors.page.listNotificationChannels.asyncIterate( this.innerApiCalls['listNotificationChannels'] as GaxCall, request as {}, @@ -2460,6 +2640,7 @@ export class NotificationChannelServiceClient { close(): Promise { if (this.notificationChannelServiceStub && !this._terminated) { return this.notificationChannelServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline index a6ef1153b..8926240be 100644 --- a/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class ServiceMonitoringServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -502,7 +504,24 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createService(request, options, callback); + this._log.info('createService request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.ICreateServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.ICreateServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('createService response %j', response); + return [response, options, rawResponse]; + }); } /** * Get the named `Service`. @@ -573,7 +592,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getService(request, options, callback); + this._log.info('getService request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IGetServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IGetServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('getService response %j', response); + return [response, options, rawResponse]; + }); } /** * Update this `Service`. @@ -646,7 +682,24 @@ export class ServiceMonitoringServiceClient { 'service.name': request.service!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateService(request, options, callback); + this._log.info('updateService request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IUpdateServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IService, + protos.google.monitoring.v3.IUpdateServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('updateService response %j', response); + return [response, options, rawResponse]; + }); } /** * Soft delete this `Service`. @@ -717,7 +770,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteService(request, options, callback); + this._log.info('deleteService request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteService response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteService(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteService response %j', response); + return [response, options, rawResponse]; + }); } /** * Create a `ServiceLevelObjective` for the given `Service`. @@ -796,7 +866,24 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createServiceLevelObjective(request, options, callback); + this._log.info('createServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.ICreateServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.ICreateServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('createServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** * Get a `ServiceLevelObjective` by name. @@ -873,7 +960,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getServiceLevelObjective(request, options, callback); + this._log.info('getServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IGetServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IGetServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('getServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** * Update the given `ServiceLevelObjective`. @@ -946,7 +1050,24 @@ export class ServiceMonitoringServiceClient { 'service_level_objective.name': request.serviceLevelObjective!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateServiceLevelObjective(request, options, callback); + this._log.info('updateServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IUpdateServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IServiceLevelObjective, + protos.google.monitoring.v3.IUpdateServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('updateServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** * Delete the given `ServiceLevelObjective`. @@ -1018,7 +1139,24 @@ export class ServiceMonitoringServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteServiceLevelObjective(request, options, callback); + this._log.info('deleteServiceLevelObjective request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceLevelObjectiveRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteServiceLevelObjective response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteServiceLevelObjective(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteServiceLevelObjectiveRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteServiceLevelObjective response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1118,7 +1256,26 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listServices(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListServicesRequest, + protos.google.monitoring.v3.IListServicesResponse|null|undefined, + protos.google.monitoring.v3.IService>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listServices values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listServices request %j', request); + return this.innerApiCalls + .listServices(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IService[], + protos.google.monitoring.v3.IListServicesRequest|null, + protos.google.monitoring.v3.IListServicesResponse + ]) => { + this._log.info('listServices values %j', response); + return [response, input, output]; + }); } /** @@ -1178,6 +1335,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServices']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServices stream %j', request); return this.descriptors.page.listServices.createStream( this.innerApiCalls.listServices as GaxCall, request, @@ -1245,6 +1403,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServices']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServices iterate %j', request); return this.descriptors.page.listServices.asyncIterate( this.innerApiCalls['listServices'] as GaxCall, request as {}, @@ -1339,7 +1498,26 @@ export class ServiceMonitoringServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listServiceLevelObjectives(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListServiceLevelObjectivesRequest, + protos.google.monitoring.v3.IListServiceLevelObjectivesResponse|null|undefined, + protos.google.monitoring.v3.IServiceLevelObjective>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listServiceLevelObjectives values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listServiceLevelObjectives request %j', request); + return this.innerApiCalls + .listServiceLevelObjectives(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IServiceLevelObjective[], + protos.google.monitoring.v3.IListServiceLevelObjectivesRequest|null, + protos.google.monitoring.v3.IListServiceLevelObjectivesResponse + ]) => { + this._log.info('listServiceLevelObjectives values %j', response); + return [response, input, output]; + }); } /** @@ -1390,6 +1568,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServiceLevelObjectives']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServiceLevelObjectives stream %j', request); return this.descriptors.page.listServiceLevelObjectives.createStream( this.innerApiCalls.listServiceLevelObjectives as GaxCall, request, @@ -1448,6 +1627,7 @@ export class ServiceMonitoringServiceClient { const defaultCallSettings = this._defaults['listServiceLevelObjectives']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listServiceLevelObjectives iterate %j', request); return this.descriptors.page.listServiceLevelObjectives.asyncIterate( this.innerApiCalls['listServiceLevelObjectives'] as GaxCall, request as {}, @@ -2409,6 +2589,7 @@ export class ServiceMonitoringServiceClient { close(): Promise { if (this.serviceMonitoringServiceStub && !this._terminated) { return this.serviceMonitoringServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline index 98bfe00bf..1f675d04e 100644 --- a/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -69,6 +70,7 @@ export class UptimeCheckServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('monitoring'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -501,7 +503,24 @@ export class UptimeCheckServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getUptimeCheckConfig(request, options, callback); + this._log.info('getUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IGetUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IGetUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('getUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a new Uptime check configuration. @@ -574,7 +593,24 @@ export class UptimeCheckServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createUptimeCheckConfig(request, options, callback); + this._log.info('createUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.ICreateUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.ICreateUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('createUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates an Uptime check configuration. You can either replace the entire @@ -662,7 +698,24 @@ export class UptimeCheckServiceClient { 'uptime_check_config.name': request.uptimeCheckConfig!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateUptimeCheckConfig(request, options, callback); + this._log.info('updateUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IUpdateUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.monitoring.v3.IUptimeCheckConfig, + protos.google.monitoring.v3.IUpdateUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('updateUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes an Uptime check configuration. Note that this method will fail @@ -735,7 +788,24 @@ export class UptimeCheckServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteUptimeCheckConfig(request, options, callback); + this._log.info('deleteUptimeCheckConfig request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteUptimeCheckConfigRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteUptimeCheckConfig response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteUptimeCheckConfig(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.monitoring.v3.IDeleteUptimeCheckConfigRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteUptimeCheckConfig response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -822,7 +892,26 @@ export class UptimeCheckServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listUptimeCheckConfigs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListUptimeCheckConfigsRequest, + protos.google.monitoring.v3.IListUptimeCheckConfigsResponse|null|undefined, + protos.google.monitoring.v3.IUptimeCheckConfig>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUptimeCheckConfigs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUptimeCheckConfigs request %j', request); + return this.innerApiCalls + .listUptimeCheckConfigs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IUptimeCheckConfig[], + protos.google.monitoring.v3.IListUptimeCheckConfigsRequest|null, + protos.google.monitoring.v3.IListUptimeCheckConfigsResponse + ]) => { + this._log.info('listUptimeCheckConfigs values %j', response); + return [response, input, output]; + }); } /** @@ -868,6 +957,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckConfigs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckConfigs stream %j', request); return this.descriptors.page.listUptimeCheckConfigs.createStream( this.innerApiCalls.listUptimeCheckConfigs as GaxCall, request, @@ -921,6 +1011,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckConfigs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckConfigs iterate %j', request); return this.descriptors.page.listUptimeCheckConfigs.asyncIterate( this.innerApiCalls['listUptimeCheckConfigs'] as GaxCall, request as {}, @@ -1004,7 +1095,26 @@ export class UptimeCheckServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listUptimeCheckIps(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.monitoring.v3.IListUptimeCheckIpsRequest, + protos.google.monitoring.v3.IListUptimeCheckIpsResponse|null|undefined, + protos.google.monitoring.v3.IUptimeCheckIp>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUptimeCheckIps values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUptimeCheckIps request %j', request); + return this.innerApiCalls + .listUptimeCheckIps(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.monitoring.v3.IUptimeCheckIp[], + protos.google.monitoring.v3.IListUptimeCheckIpsRequest|null, + protos.google.monitoring.v3.IListUptimeCheckIpsResponse + ]) => { + this._log.info('listUptimeCheckIps values %j', response); + return [response, input, output]; + }); } /** @@ -1044,6 +1154,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckIps']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckIps stream %j', request); return this.descriptors.page.listUptimeCheckIps.createStream( this.innerApiCalls.listUptimeCheckIps as GaxCall, request, @@ -1091,6 +1202,7 @@ export class UptimeCheckServiceClient { const defaultCallSettings = this._defaults['listUptimeCheckIps']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUptimeCheckIps iterate %j', request); return this.descriptors.page.listUptimeCheckIps.asyncIterate( this.innerApiCalls['listUptimeCheckIps'] as GaxCall, request as {}, @@ -2052,6 +2164,7 @@ export class UptimeCheckServiceClient { close(): Promise { if (this.uptimeCheckServiceStub && !this._terminated) { return this.uptimeCheckServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline b/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline index b289f880f..63ac02577 100644 --- a/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline +++ b/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class NamingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('naming'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -440,7 +442,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.paginatedMethodStream(request, options, callback); + this._log.info('paginatedMethodStream request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('paginatedMethodStream response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.paginatedMethodStream(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('paginatedMethodStream response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -502,7 +521,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.paginatedMethodAsync(request, options, callback); + this._log.info('paginatedMethodAsync request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('paginatedMethodAsync response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.paginatedMethodAsync(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('paginatedMethodAsync response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -564,7 +600,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.checkLongRunningProgress(request, options, callback); + this._log.info('checkLongRunningProgress request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('checkLongRunningProgress response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.checkLongRunningProgress(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('checkLongRunningProgress response %j', response); + return [response, options, rawResponse]; + }); } /** * Problem #3: RPCs that conflict with auto-generated methods @@ -627,7 +680,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.initialize(request, options, callback); + this._log.info('initialize request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('initialize response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.initialize(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('initialize response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -689,7 +759,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.servicePath(request, options, callback); + this._log.info('servicePath request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('servicePath response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.servicePath(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('servicePath response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -751,7 +838,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.apiEndpoint(request, options, callback); + this._log.info('apiEndpoint request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('apiEndpoint response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.apiEndpoint(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('apiEndpoint response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -813,7 +917,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.port(request, options, callback); + this._log.info('port request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('port response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.port(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('port response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -875,7 +996,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.scopes(request, options, callback); + this._log.info('scopes request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('scopes response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.scopes(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('scopes response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -937,7 +1075,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.getProjectId(request, options, callback); + this._log.info('getProjectId request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getProjectId response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getProjectId(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('getProjectId response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -1000,7 +1155,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.getReservedWord(request, options, callback); + this._log.info('getReservedWord request %j', request); + const wrappedCallback: Callback< + protos.google.naming.v1beta1.IReservedWord, + protos.google.naming.v1beta1.IGetReservedWordRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getReservedWord response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getReservedWord(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.naming.v1beta1.IReservedWord, + protos.google.naming.v1beta1.IGetReservedWordRequest|undefined, {}|undefined + ]) => { + this._log.info('getReservedWord response %j', response); + return [response, options, rawResponse]; + }); } /** * @@ -1062,7 +1234,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.createAbcdeSomething(request, options, callback); + this._log.info('createABCDESomething request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createABCDESomething response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createAbcdeSomething(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('createABCDESomething response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1128,7 +1317,24 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.longRunning(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.protobuf.IEmpty|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('longRunning response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('longRunning request %j', request); + return this.innerApiCalls.longRunning(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.protobuf.IEmpty|undefined, {}|undefined + ]) => { + this._log.info('longRunning response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `longRunning()`. @@ -1142,6 +1348,7 @@ export class NamingClient { * region_tag:localhost_v1beta1_generated_Naming_LongRunning_async */ async checkLongRunningProgress1(name: string): Promise>{ + this._log.info('longRunning long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.longRunning, this._gaxModule.createDefaultBackoffSettings()); @@ -1217,7 +1424,26 @@ export class NamingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); - return this.innerApiCalls.paginatedMethod(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.naming.v1beta1.IPaginatedMethodRequest, + protos.google.naming.v1beta1.IPaginatedMethodResponse|null|undefined, + protos.google.protobuf.IEmpty>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('paginatedMethod values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('paginatedMethod request %j', request); + return this.innerApiCalls + .paginatedMethod(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.protobuf.IEmpty[], + protos.google.naming.v1beta1.IPaginatedMethodRequest|null, + protos.google.naming.v1beta1.IPaginatedMethodResponse + ]) => { + this._log.info('paginatedMethod values %j', response); + return [response, input, output]; + }); } /** @@ -1249,6 +1475,7 @@ export class NamingClient { const defaultCallSettings = this._defaults['paginatedMethod']; const callSettings = defaultCallSettings.merge(options); this.initialize1(); + this._log.info('paginatedMethod stream %j', request); return this.descriptors.page.paginatedMethod.createStream( this.innerApiCalls.paginatedMethod as GaxCall, request, @@ -1288,6 +1515,7 @@ export class NamingClient { const defaultCallSettings = this._defaults['paginatedMethod']; const callSettings = defaultCallSettings.merge(options); this.initialize1(); + this._log.info('paginatedMethod iterate %j', request); return this.descriptors.page.paginatedMethod.asyncIterate( this.innerApiCalls['paginatedMethod'] as GaxCall, request as {}, @@ -1379,6 +1607,7 @@ export class NamingClient { close(): Promise { if (this.namingStub && !this._terminated) { return this.namingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline index 7938c9be2..256f25dbc 100644 --- a/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -76,6 +77,7 @@ export class CloudRedisClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('redis'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -506,7 +508,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getInstance(request, options, callback); + this._log.info('getInstance request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.redis.v1beta1.IInstance, + protos.google.cloud.redis.v1beta1.IGetInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.redis.v1beta1.IInstance, + protos.google.cloud.redis.v1beta1.IGetInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('getInstance response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -603,7 +622,24 @@ export class CloudRedisClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('createInstance request %j', request); + return this.innerApiCalls.createInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('createInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `createInstance()`. @@ -617,6 +653,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_CreateInstance_async */ async checkCreateInstanceProgress(name: string): Promise>{ + this._log.info('createInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.createInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -706,7 +743,24 @@ export class CloudRedisClient { 'instance.name': request.instance!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('updateInstance request %j', request); + return this.innerApiCalls.updateInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('updateInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `updateInstance()`. @@ -720,6 +774,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_UpdateInstance_async */ async checkUpdateInstanceProgress(name: string): Promise>{ + this._log.info('updateInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.updateInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -806,7 +861,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.importInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IImportInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('importInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('importInstance request %j', request); + return this.innerApiCalls.importInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IImportInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('importInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `importInstance()`. @@ -820,6 +892,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_ImportInstance_async */ async checkImportInstanceProgress(name: string): Promise>{ + this._log.info('importInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.importInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -904,7 +977,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.exportInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IExportInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('exportInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('exportInstance request %j', request); + return this.innerApiCalls.exportInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IExportInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('exportInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `exportInstance()`. @@ -918,6 +1008,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_ExportInstance_async */ async checkExportInstanceProgress(name: string): Promise>{ + this._log.info('exportInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.exportInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -999,7 +1090,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.failoverInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('failoverInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('failoverInstance request %j', request); + return this.innerApiCalls.failoverInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('failoverInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `failoverInstance()`. @@ -1013,6 +1121,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_FailoverInstance_async */ async checkFailoverInstanceProgress(name: string): Promise>{ + this._log.info('failoverInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.failoverInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -1091,7 +1200,24 @@ export class CloudRedisClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteInstance(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteInstance response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('deleteInstance request %j', request); + return this.innerApiCalls.deleteInstance(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteInstance response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `deleteInstance()`. @@ -1105,6 +1231,7 @@ export class CloudRedisClient { * region_tag:redis_v1beta1_generated_CloudRedis_DeleteInstance_async */ async checkDeleteInstanceProgress(name: string): Promise>{ + this._log.info('deleteInstance long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.deleteInstance, this._gaxModule.createDefaultBackoffSettings()); @@ -1203,7 +1330,26 @@ export class CloudRedisClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listInstances(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.redis.v1beta1.IListInstancesRequest, + protos.google.cloud.redis.v1beta1.IListInstancesResponse|null|undefined, + protos.google.cloud.redis.v1beta1.IInstance>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listInstances values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listInstances request %j', request); + return this.innerApiCalls + .listInstances(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.redis.v1beta1.IInstance[], + protos.google.cloud.redis.v1beta1.IListInstancesRequest|null, + protos.google.cloud.redis.v1beta1.IListInstancesResponse + ]) => { + this._log.info('listInstances values %j', response); + return [response, input, output]; + }); } /** @@ -1252,6 +1398,7 @@ export class CloudRedisClient { const defaultCallSettings = this._defaults['listInstances']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInstances stream %j', request); return this.descriptors.page.listInstances.createStream( this.innerApiCalls.listInstances as GaxCall, request, @@ -1308,6 +1455,7 @@ export class CloudRedisClient { const defaultCallSettings = this._defaults['listInstances']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listInstances iterate %j', request); return this.descriptors.page.listInstances.asyncIterate( this.innerApiCalls['listInstances'] as GaxCall, request as {}, @@ -1587,6 +1735,7 @@ export class CloudRedisClient { close(): Promise { if (this.cloudRedisStub && !this._terminated) { return this.cloudRedisStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline b/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline index 8da5a2b95..b345426b7 100644 --- a/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline +++ b/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -63,6 +64,7 @@ export class TestServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('routingtest'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -419,7 +421,24 @@ export class TestServiceClient { routingParameter ); this.initialize(); - return this.innerApiCalls.fastFibonacci(request, options, callback); + this._log.info('fastFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('fastFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('fastFibonacci response %j', response); + return [response, options, rawResponse]; + }); } /** * Calculates Fibonacci on the provided value, randomly. @@ -516,7 +535,24 @@ export class TestServiceClient { routingParameter ); this.initialize(); - return this.innerApiCalls.randomFibonacci(request, options, callback); + this._log.info('randomFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('randomFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.randomFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('randomFibonacci response %j', response); + return [response, options, rawResponse]; + }); } /** * Calculates Fibonacci on the provided value, slowly. @@ -623,7 +659,24 @@ export class TestServiceClient { routingParameter ); this.initialize(); - return this.innerApiCalls.slowFibonacci(request, options, callback); + this._log.info('slowFibonacci request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('slowFibonacci response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + ]) => { + this._log.info('slowFibonacci response %j', response); + return [response, options, rawResponse]; + }); } @@ -636,6 +689,7 @@ export class TestServiceClient { close(): Promise { if (this.testServiceStub && !this._terminated) { return this.testServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline index 63065e86c..099be8cb9 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -64,6 +65,7 @@ export class ComplianceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -453,7 +455,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBody(request, options, callback); + this._log.info('repeatDataBody request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBody response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBody response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -533,7 +552,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyInfo(request, options, callback); + this._log.info('repeatDataBodyInfo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyInfo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyInfo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -612,7 +648,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataQuery(request, options, callback); + this._log.info('repeatDataQuery request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataQuery response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataQuery response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request. This method exercises @@ -701,7 +754,24 @@ export class ComplianceClient { 'info.f_kingdom': request.info!.fKingdom ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataSimplePath(request, options, callback); + this._log.info('repeatDataSimplePath request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataSimplePath response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataSimplePath response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a path resource. @@ -786,7 +856,24 @@ export class ComplianceClient { 'info.f_bool': request.info!.fBool ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathResource(request, options, callback); + this._log.info('repeatDataPathResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathResource response %j', response); + return [response, options, rawResponse]; + }); } /** * Same as RepeatDataSimplePath, but with a trailing resource. @@ -870,7 +957,24 @@ export class ComplianceClient { 'info.f_child.f_string': request.info!.fChild!.fString ?? '', }); this.initialize(); - return this.innerApiCalls.repeatDataPathTrailingResource(request, options, callback); + this._log.info('repeatDataPathTrailingResource request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataPathTrailingResource response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PUT method. @@ -948,7 +1052,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPut(request, options, callback); + this._log.info('repeatDataBodyPut request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPut response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPut response %j', response); + return [response, options, rawResponse]; + }); } /** * This method echoes the ComplianceData request, using the HTTP PATCH method. @@ -1026,7 +1147,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.repeatDataBodyPatch(request, options, callback); + this._log.info('repeatDataBodyPatch request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('repeatDataBodyPatch response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRepeatResponse, + protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + ]) => { + this._log.info('repeatDataBodyPatch response %j', response); + return [response, options, rawResponse]; + }); } /** * This method requests an enum value from the server. Depending on the contents of EnumRequest, the enum value returned will be a known enum declared in the @@ -1096,7 +1234,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.getEnum(request, options, callback); + this._log.info('getEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumRequest|undefined, {}|undefined + ]) => { + this._log.info('getEnum response %j', response); + return [response, options, rawResponse]; + }); } /** * This method is used to verify that clients can round-trip enum values, which is particularly important for unknown enum values over REST. VerifyEnum() @@ -1168,7 +1323,24 @@ export class ComplianceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.verifyEnum(request, options, callback); + this._log.info('verifyEnum request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyEnum response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEnumResponse, + protos.google.showcase.v1beta1.IEnumResponse|undefined, {}|undefined + ]) => { + this._log.info('verifyEnum response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -1554,6 +1726,7 @@ export class ComplianceClient { close(): Promise { if (this.complianceStub && !this._terminated) { return this.complianceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline index bd7feb25e..8784e65d7 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -68,6 +69,7 @@ export class EchoClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -597,7 +599,24 @@ export class EchoClient { routingParameter ); this.initialize(); - return this.innerApiCalls.echo(request, options, callback); + this._log.info('echo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + ]) => { + this._log.info('echo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method returns error details in a repeated "google.protobuf.Any" @@ -671,7 +690,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.echoErrorDetails(request, options, callback); + this._log.info('echoErrorDetails request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echoErrorDetails response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + ]) => { + this._log.info('echoErrorDetails response %j', response); + return [response, options, rawResponse]; + }); } /** * This is similar to the PagedExpand except that it uses @@ -744,7 +780,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpandLegacy(request, options, callback); + this._log.info('pagedExpandLegacy request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pagedExpandLegacy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + ]) => { + this._log.info('pagedExpandLegacy response %j', response); + return [response, options, rawResponse]; + }); } /** * This method will block (wait) for the requested amount of time @@ -816,7 +869,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.block(request, options, callback); + this._log.info('block request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('block response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.block(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + ]) => { + this._log.info('block response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -849,6 +919,7 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); + this._log.info('expand stream %j', options); return this.innerApiCalls.expand(request, options); } @@ -895,6 +966,7 @@ export class EchoClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('collect stream %j', options); return this.innerApiCalls.collect(null, options, callback); } @@ -918,6 +990,7 @@ export class EchoClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('chat stream %j', options); return this.innerApiCalls.chat(null, options); } @@ -994,7 +1067,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('wait request %j', request); + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `wait()`. @@ -1008,6 +1098,7 @@ export class EchoClient { * region_tag:localhost_v1beta1_generated_Echo_Wait_async */ async checkWaitProgress(name: string): Promise>{ + this._log.info('wait long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.wait, this._gaxModule.createDefaultBackoffSettings()); @@ -1086,7 +1177,26 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpand(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IPagedExpandRequest, + protos.google.showcase.v1beta1.IPagedExpandResponse|null|undefined, + protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('pagedExpand values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('pagedExpand request %j', request); + return this.innerApiCalls + .pagedExpand(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IEchoResponse[], + protos.google.showcase.v1beta1.IPagedExpandRequest|null, + protos.google.showcase.v1beta1.IPagedExpandResponse + ]) => { + this._log.info('pagedExpand values %j', response); + return [response, input, output]; + }); } /** @@ -1121,6 +1231,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand stream %j', request); return this.descriptors.page.pagedExpand.createStream( this.innerApiCalls.pagedExpand as GaxCall, request, @@ -1163,6 +1274,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand iterate %j', request); return this.descriptors.page.pagedExpand.asyncIterate( this.innerApiCalls['pagedExpand'] as GaxCall, request as {}, @@ -1552,6 +1664,7 @@ export class EchoClient { close(): Promise { if (this.echoStub && !this._terminated) { return this.echoStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline index d23770756..f376cf1c3 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class IdentityClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -446,7 +448,24 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createUser(request, options, callback); + this._log.info('createUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.ICreateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('createUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the User with the given uri. @@ -516,7 +535,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getUser(request, options, callback); + this._log.info('getUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IGetUserRequest|undefined, {}|undefined + ]) => { + this._log.info('getUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a user. @@ -589,7 +625,24 @@ export class IdentityClient { 'user.name': request.user!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateUser(request, options, callback); + this._log.info('updateUser request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IUser, + protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, {}|undefined + ]) => { + this._log.info('updateUser response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a user, their profile, and all of their authored messages. @@ -659,7 +712,24 @@ export class IdentityClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteUser(request, options, callback); + this._log.info('deleteUser request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteUser response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteUser(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteUser response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -735,7 +805,26 @@ export class IdentityClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listUsers(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListUsersRequest, + protos.google.showcase.v1beta1.IListUsersResponse|null|undefined, + protos.google.showcase.v1beta1.IUser>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listUsers values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listUsers request %j', request); + return this.innerApiCalls + .listUsers(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IUser[], + protos.google.showcase.v1beta1.IListUsersRequest|null, + protos.google.showcase.v1beta1.IListUsersResponse + ]) => { + this._log.info('listUsers values %j', response); + return [response, input, output]; + }); } /** @@ -771,6 +860,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers stream %j', request); return this.descriptors.page.listUsers.createStream( this.innerApiCalls.listUsers as GaxCall, request, @@ -814,6 +904,7 @@ export class IdentityClient { const defaultCallSettings = this._defaults['listUsers']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listUsers iterate %j', request); return this.descriptors.page.listUsers.asyncIterate( this.innerApiCalls['listUsers'] as GaxCall, request as {}, @@ -1203,6 +1294,7 @@ export class IdentityClient { close(): Promise { if (this.identityStub && !this._terminated) { return this.identityStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline index 8ed7b00d3..68010859e 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -65,6 +66,7 @@ export class MessagingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -497,7 +499,24 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createRoom(request, options, callback); + this._log.info('createRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('createRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Room with the given resource name. @@ -567,7 +586,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getRoom(request, options, callback); + this._log.info('getRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IGetRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('getRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a room. @@ -640,7 +676,24 @@ export class MessagingClient { 'room.name': request.room!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateRoom(request, options, callback); + this._log.info('updateRoom request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IRoom, + protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('updateRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a room and all of its blurbs. @@ -710,7 +763,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteRoom(request, options, callback); + this._log.info('deleteRoom request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteRoom response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteRoom response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a blurb. If the parent is a room, the blurb is understood to be a @@ -785,7 +855,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createBlurb(request, options, callback); + this._log.info('createBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('createBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves the Blurb with the given resource name. @@ -855,7 +942,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getBlurb(request, options, callback); + this._log.info('getBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('getBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a blurb. @@ -928,7 +1032,24 @@ export class MessagingClient { 'blurb.name': request.blurb!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateBlurb(request, options, callback); + this._log.info('updateBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlurb, + protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('updateBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a blurb. @@ -998,7 +1119,24 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteBlurb(request, options, callback); + this._log.info('deleteBlurb request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteBlurb response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteBlurb response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1034,6 +1172,7 @@ export class MessagingClient { 'name': request.name ?? '', }); this.initialize(); + this._log.info('streamBlurbs stream %j', options); return this.innerApiCalls.streamBlurbs(request, options); } @@ -1079,6 +1218,7 @@ export class MessagingClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('sendBlurbs stream %j', options); return this.innerApiCalls.sendBlurbs(null, options, callback); } @@ -1103,6 +1243,7 @@ export class MessagingClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('connect stream %j', options); return this.innerApiCalls.connect(null, options); } @@ -1191,7 +1332,24 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.searchBlurbs(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('searchBlurbs response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('searchBlurbs request %j', request); + return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ]) => { + this._log.info('searchBlurbs response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `searchBlurbs()`. @@ -1205,6 +1363,7 @@ export class MessagingClient { * region_tag:localhost_v1beta1_generated_Messaging_SearchBlurbs_async */ async checkSearchBlurbsProgress(name: string): Promise>{ + this._log.info('searchBlurbs long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.searchBlurbs, this._gaxModule.createDefaultBackoffSettings()); @@ -1283,7 +1442,26 @@ export class MessagingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listRooms(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListRoomsRequest, + protos.google.showcase.v1beta1.IListRoomsResponse|null|undefined, + protos.google.showcase.v1beta1.IRoom>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listRooms values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listRooms request %j', request); + return this.innerApiCalls + .listRooms(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IRoom[], + protos.google.showcase.v1beta1.IListRoomsRequest|null, + protos.google.showcase.v1beta1.IListRoomsResponse + ]) => { + this._log.info('listRooms values %j', response); + return [response, input, output]; + }); } /** @@ -1319,6 +1497,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms stream %j', request); return this.descriptors.page.listRooms.createStream( this.innerApiCalls.listRooms as GaxCall, request, @@ -1362,6 +1541,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listRooms']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listRooms iterate %j', request); return this.descriptors.page.listRooms.asyncIterate( this.innerApiCalls['listRooms'] as GaxCall, request as {}, @@ -1450,7 +1630,26 @@ export class MessagingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listBlurbs(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListBlurbsRequest, + protos.google.showcase.v1beta1.IListBlurbsResponse|null|undefined, + protos.google.showcase.v1beta1.IBlurb>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listBlurbs values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listBlurbs request %j', request); + return this.innerApiCalls + .listBlurbs(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IBlurb[], + protos.google.showcase.v1beta1.IListBlurbsRequest|null, + protos.google.showcase.v1beta1.IListBlurbsResponse + ]) => { + this._log.info('listBlurbs values %j', response); + return [response, input, output]; + }); } /** @@ -1494,6 +1693,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs stream %j', request); return this.descriptors.page.listBlurbs.createStream( this.innerApiCalls.listBlurbs as GaxCall, request, @@ -1545,6 +1745,7 @@ export class MessagingClient { const defaultCallSettings = this._defaults['listBlurbs']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listBlurbs iterate %j', request); return this.descriptors.page.listBlurbs.asyncIterate( this.innerApiCalls['listBlurbs'] as GaxCall, request as {}, @@ -1934,6 +2135,7 @@ export class MessagingClient { close(): Promise { if (this.messagingStub && !this._terminated) { return this.messagingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline index 963ef9c86..284b67a23 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -61,6 +62,7 @@ export class SequenceServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -435,7 +437,24 @@ export class SequenceServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSequence(request, options, callback); + this._log.info('createSequence request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequence, + protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('createSequence response %j', response); + return [response, options, rawResponse]; + }); } /** * Retrieves a sequence. @@ -504,7 +523,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSequenceReport(request, options, callback); + this._log.info('getSequenceReport request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSequenceReport response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISequenceReport, + protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, {}|undefined + ]) => { + this._log.info('getSequenceReport response %j', response); + return [response, options, rawResponse]; + }); } /** * Attempts a sequence. @@ -573,7 +609,24 @@ export class SequenceServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.attemptSequence(request, options, callback); + this._log.info('attemptSequence request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('attemptSequence response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, {}|undefined + ]) => { + this._log.info('attemptSequence response %j', response); + return [response, options, rawResponse]; + }); } // -------------------- @@ -959,6 +1012,7 @@ export class SequenceServiceClient { close(): Promise { if (this.sequenceServiceStub && !this._terminated) { return this.sequenceServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline index 61309e3d5..0c3004dad 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -63,6 +64,7 @@ export class TestingClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -451,7 +453,24 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.createSession(request, options, callback); + this._log.info('createSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('createSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a testing session. @@ -521,7 +540,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getSession(request, options, callback); + this._log.info('getSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.ISession, + protos.google.showcase.v1beta1.IGetSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('getSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Delete a test session. @@ -591,7 +627,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteSession(request, options, callback); + this._log.info('deleteSession request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Report on the status of a session. @@ -663,7 +716,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.reportSession(request, options, callback); + this._log.info('reportSession request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('reportSession response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.reportSession(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IReportSessionResponse, + protos.google.showcase.v1beta1.IReportSessionRequest|undefined, {}|undefined + ]) => { + this._log.info('reportSession response %j', response); + return [response, options, rawResponse]; + }); } /** * Explicitly decline to implement a test. @@ -738,7 +808,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTest(request, options, callback); + this._log.info('deleteTest request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTest response %j', response); + return [response, options, rawResponse]; + }); } /** * Register a response to a test. @@ -815,7 +902,24 @@ export class TestingClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.verifyTest(request, options, callback); + this._log.info('verifyTest request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('verifyTest response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.verifyTest(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IVerifyTestResponse, + protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, {}|undefined + ]) => { + this._log.info('verifyTest response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -888,7 +992,26 @@ export class TestingClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listSessions(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListSessionsRequest, + protos.google.showcase.v1beta1.IListSessionsResponse|null|undefined, + protos.google.showcase.v1beta1.ISession>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSessions values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listSessions request %j', request); + return this.innerApiCalls + .listSessions(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ISession[], + protos.google.showcase.v1beta1.IListSessionsRequest|null, + protos.google.showcase.v1beta1.IListSessionsResponse + ]) => { + this._log.info('listSessions values %j', response); + return [response, input, output]; + }); } /** @@ -921,6 +1044,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions stream %j', request); return this.descriptors.page.listSessions.createStream( this.innerApiCalls.listSessions as GaxCall, request, @@ -961,6 +1085,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listSessions']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listSessions iterate %j', request); return this.descriptors.page.listSessions.asyncIterate( this.innerApiCalls['listSessions'] as GaxCall, request as {}, @@ -1044,7 +1169,26 @@ export class TestingClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listTests(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IListTestsRequest, + protos.google.showcase.v1beta1.IListTestsResponse|null|undefined, + protos.google.showcase.v1beta1.ITest>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTests values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTests request %j', request); + return this.innerApiCalls + .listTests(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.ITest[], + protos.google.showcase.v1beta1.IListTestsRequest|null, + protos.google.showcase.v1beta1.IListTestsResponse + ]) => { + this._log.info('listTests values %j', response); + return [response, input, output]; + }); } /** @@ -1084,6 +1228,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests stream %j', request); return this.descriptors.page.listTests.createStream( this.innerApiCalls.listTests as GaxCall, request, @@ -1131,6 +1276,7 @@ export class TestingClient { const defaultCallSettings = this._defaults['listTests']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTests iterate %j', request); return this.descriptors.page.listTests.asyncIterate( this.innerApiCalls['listTests'] as GaxCall, request as {}, @@ -1520,6 +1666,7 @@ export class TestingClient { close(): Promise { if (this.testingStub && !this._terminated) { return this.testingStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline index d57828520..84c78d4ac 100644 --- a/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -28,6 +28,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -63,6 +64,7 @@ export class EchoClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('showcase'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -522,7 +524,24 @@ export class EchoClient { routingParameter ); this.initialize(); - return this.innerApiCalls.echo(request, options, callback); + this._log.info('echo request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoResponse, + protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + ]) => { + this._log.info('echo response %j', response); + return [response, options, rawResponse]; + }); } /** * This method returns error details in a repeated "google.protobuf.Any" @@ -596,7 +615,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.echoErrorDetails(request, options, callback); + this._log.info('echoErrorDetails request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('echoErrorDetails response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + ]) => { + this._log.info('echoErrorDetails response %j', response); + return [response, options, rawResponse]; + }); } /** * This is similar to the PagedExpand except that it uses @@ -669,7 +705,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpandLegacy(request, options, callback); + this._log.info('pagedExpandLegacy request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pagedExpandLegacy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IPagedExpandResponse, + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + ]) => { + this._log.info('pagedExpandLegacy response %j', response); + return [response, options, rawResponse]; + }); } /** * This method will block (wait) for the requested amount of time @@ -741,7 +794,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.block(request, options, callback); + this._log.info('block request %j', request); + const wrappedCallback: Callback< + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('block response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.block(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.showcase.v1beta1.IBlockResponse, + protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + ]) => { + this._log.info('block response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -774,6 +844,7 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); + this._log.info('expand stream %j', options); return this.innerApiCalls.expand(request, options); } @@ -820,6 +891,7 @@ export class EchoClient { } const options = optionsOrCallback as CallOptions; this.initialize(); + this._log.info('collect stream %j', options); return this.innerApiCalls.collect(null, options, callback); } @@ -843,6 +915,7 @@ export class EchoClient { options?: CallOptions): gax.CancellableStream { this.initialize(); + this._log.info('chat stream %j', options); return this.innerApiCalls.chat(null, options); } @@ -919,7 +992,24 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.wait(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('wait response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('wait request %j', request); + return this.innerApiCalls.wait(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ]) => { + this._log.info('wait response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `wait()`. @@ -933,6 +1023,7 @@ export class EchoClient { * region_tag:localhost_v1beta1_generated_Echo_Wait_async */ async checkWaitProgress(name: string): Promise>{ + this._log.info('wait long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.wait, this._gaxModule.createDefaultBackoffSettings()); @@ -1011,7 +1102,26 @@ export class EchoClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.pagedExpand(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.showcase.v1beta1.IPagedExpandRequest, + protos.google.showcase.v1beta1.IPagedExpandResponse|null|undefined, + protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('pagedExpand values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('pagedExpand request %j', request); + return this.innerApiCalls + .pagedExpand(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.showcase.v1beta1.IEchoResponse[], + protos.google.showcase.v1beta1.IPagedExpandRequest|null, + protos.google.showcase.v1beta1.IPagedExpandResponse + ]) => { + this._log.info('pagedExpand values %j', response); + return [response, input, output]; + }); } /** @@ -1046,6 +1156,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand stream %j', request); return this.descriptors.page.pagedExpand.createStream( this.innerApiCalls.pagedExpand as GaxCall, request, @@ -1088,6 +1199,7 @@ export class EchoClient { const defaultCallSettings = this._defaults['pagedExpand']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('pagedExpand iterate %j', request); return this.descriptors.page.pagedExpand.asyncIterate( this.innerApiCalls['pagedExpand'] as GaxCall, request as {}, @@ -1104,6 +1216,7 @@ export class EchoClient { close(): Promise { if (this.echoStub && !this._terminated) { return this.echoStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline b/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline index d7a432de5..f11ce9f82 100644 --- a/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline +++ b/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -63,6 +64,7 @@ export class CloudTasksClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('tasks'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -427,7 +429,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getQueue(request, options, callback); + this._log.info('getQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IGetQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IGetQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('getQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a queue. @@ -517,7 +536,24 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createQueue(request, options, callback); + this._log.info('createQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.ICreateQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.ICreateQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('createQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Updates a queue. @@ -611,7 +647,24 @@ export class CloudTasksClient { 'queue.name': request.queue!.name ?? '', }); this.initialize(); - return this.innerApiCalls.updateQueue(request, options, callback); + this._log.info('updateQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IUpdateQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.updateQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IUpdateQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('updateQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a queue. @@ -694,7 +747,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteQueue(request, options, callback); + this._log.info('deleteQueue request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Purges a queue by deleting all of its tasks. @@ -770,7 +840,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.purgeQueue(request, options, callback); + this._log.info('purgeQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPurgeQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('purgeQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.purgeQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPurgeQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('purgeQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Pauses the queue. @@ -847,7 +934,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.pauseQueue(request, options, callback); + this._log.info('pauseQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPauseQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pauseQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.pauseQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IPauseQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('pauseQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Resume a queue. @@ -930,7 +1034,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.resumeQueue(request, options, callback); + this._log.info('resumeQueue request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IResumeQueueRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('resumeQueue response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.resumeQueue(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.IQueue, + protos.google.cloud.tasks.v2.IResumeQueueRequest|undefined, {}|undefined + ]) => { + this._log.info('resumeQueue response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets the access control policy for a {@link protos.google.cloud.tasks.v2.Queue|Queue}. @@ -1012,7 +1133,24 @@ export class CloudTasksClient { 'resource': request.resource ?? '', }); this.initialize(); - return this.innerApiCalls.getIamPolicy(request, options, callback); + this._log.info('getIamPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.IGetIamPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getIamPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getIamPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.IGetIamPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('getIamPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Sets the access control policy for a {@link protos.google.cloud.tasks.v2.Queue|Queue}. Replaces any existing @@ -1098,7 +1236,24 @@ export class CloudTasksClient { 'resource': request.resource ?? '', }); this.initialize(); - return this.innerApiCalls.setIamPolicy(request, options, callback); + this._log.info('setIamPolicy request %j', request); + const wrappedCallback: Callback< + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.ISetIamPolicyRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('setIamPolicy response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.setIamPolicy(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.iam.v1.IPolicy, + protos.google.iam.v1.ISetIamPolicyRequest|undefined, {}|undefined + ]) => { + this._log.info('setIamPolicy response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns permissions that a caller has on a {@link protos.google.cloud.tasks.v2.Queue|Queue}. @@ -1180,7 +1335,24 @@ export class CloudTasksClient { 'resource': request.resource ?? '', }); this.initialize(); - return this.innerApiCalls.testIamPermissions(request, options, callback); + this._log.info('testIamPermissions request %j', request); + const wrappedCallback: Callback< + protos.google.iam.v1.ITestIamPermissionsResponse, + protos.google.iam.v1.ITestIamPermissionsRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('testIamPermissions response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.testIamPermissions(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.iam.v1.ITestIamPermissionsResponse, + protos.google.iam.v1.ITestIamPermissionsRequest|undefined, {}|undefined + ]) => { + this._log.info('testIamPermissions response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a task. @@ -1264,7 +1436,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getTask(request, options, callback); + this._log.info('getTask request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IGetTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IGetTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('getTask response %j', response); + return [response, options, rawResponse]; + }); } /** * Creates a task and adds it to a queue. @@ -1388,7 +1577,24 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createTask(request, options, callback); + this._log.info('createTask request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.ICreateTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.createTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.ICreateTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('createTask response %j', response); + return [response, options, rawResponse]; + }); } /** * Deletes a task. @@ -1463,7 +1669,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteTask(request, options, callback); + this._log.info('deleteTask request %j', request); + const wrappedCallback: Callback< + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.deleteTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.cloud.tasks.v2.IDeleteTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteTask response %j', response); + return [response, options, rawResponse]; + }); } /** * Forces a task to run now. @@ -1570,7 +1793,24 @@ export class CloudTasksClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.runTask(request, options, callback); + this._log.info('runTask request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IRunTaskRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('runTask response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.runTask(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.tasks.v2.ITask, + protos.google.cloud.tasks.v2.IRunTaskRequest|undefined, {}|undefined + ]) => { + this._log.info('runTask response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -1678,7 +1918,26 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listQueues(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.tasks.v2.IListQueuesRequest, + protos.google.cloud.tasks.v2.IListQueuesResponse|null|undefined, + protos.google.cloud.tasks.v2.IQueue>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listQueues values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listQueues request %j', request); + return this.innerApiCalls + .listQueues(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.tasks.v2.IQueue[], + protos.google.cloud.tasks.v2.IListQueuesRequest|null, + protos.google.cloud.tasks.v2.IListQueuesResponse + ]) => { + this._log.info('listQueues values %j', response); + return [response, input, output]; + }); } /** @@ -1744,6 +2003,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listQueues']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listQueues stream %j', request); return this.descriptors.page.listQueues.createStream( this.innerApiCalls.listQueues as GaxCall, request, @@ -1817,6 +2077,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listQueues']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listQueues iterate %j', request); return this.descriptors.page.listQueues.asyncIterate( this.innerApiCalls['listQueues'] as GaxCall, request as {}, @@ -1937,7 +2198,26 @@ export class CloudTasksClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listTasks(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.tasks.v2.IListTasksRequest, + protos.google.cloud.tasks.v2.IListTasksResponse|null|undefined, + protos.google.cloud.tasks.v2.ITask>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTasks values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listTasks request %j', request); + return this.innerApiCalls + .listTasks(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.tasks.v2.ITask[], + protos.google.cloud.tasks.v2.IListTasksRequest|null, + protos.google.cloud.tasks.v2.IListTasksResponse + ]) => { + this._log.info('listTasks values %j', response); + return [response, input, output]; + }); } /** @@ -2006,6 +2286,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listTasks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTasks stream %j', request); return this.descriptors.page.listTasks.createStream( this.innerApiCalls.listTasks as GaxCall, request, @@ -2082,6 +2363,7 @@ export class CloudTasksClient { const defaultCallSettings = this._defaults['listTasks']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listTasks iterate %j', request); return this.descriptors.page.listTasks.asyncIterate( this.innerApiCalls['listTasks'] as GaxCall, request as {}, @@ -2212,6 +2494,7 @@ export class CloudTasksClient { close(): Promise { if (this.cloudTasksStub && !this._terminated) { return this.cloudTasksStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline b/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline index 5a9102e85..23105aae8 100644 --- a/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline +++ b/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class TextToSpeechClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('text-to-speech'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -403,7 +405,24 @@ export class TextToSpeechClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.listVoices(request, options, callback); + this._log.info('listVoices request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.texttospeech.v1.IListVoicesResponse, + protos.google.cloud.texttospeech.v1.IListVoicesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('listVoices response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.listVoices(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.texttospeech.v1.IListVoicesResponse, + protos.google.cloud.texttospeech.v1.IListVoicesRequest|undefined, {}|undefined + ]) => { + this._log.info('listVoices response %j', response); + return [response, options, rawResponse]; + }); } /** * Synthesizes speech synchronously: receive results after all text input @@ -473,7 +492,24 @@ export class TextToSpeechClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.synthesizeSpeech(request, options, callback); + this._log.info('synthesizeSpeech request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechResponse, + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('synthesizeSpeech response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.synthesizeSpeech(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechResponse, + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechRequest|undefined, {}|undefined + ]) => { + this._log.info('synthesizeSpeech response %j', response); + return [response, options, rawResponse]; + }); } @@ -486,6 +522,7 @@ export class TextToSpeechClient { close(): Promise { if (this.textToSpeechStub && !this._terminated) { return this.textToSpeechStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); }); diff --git a/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline index 065a541b4..22e77102c 100644 --- a/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class TranslationServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('translation'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -527,7 +529,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.translateText(request, options, callback); + this._log.info('translateText request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.ITranslateTextResponse, + protos.google.cloud.translation.v3beta1.ITranslateTextRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('translateText response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.translateText(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.ITranslateTextResponse, + protos.google.cloud.translation.v3beta1.ITranslateTextRequest|undefined, {}|undefined + ]) => { + this._log.info('translateText response %j', response); + return [response, options, rawResponse]; + }); } /** * Detects the language of text within a request. @@ -631,7 +650,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.detectLanguage(request, options, callback); + this._log.info('detectLanguage request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.IDetectLanguageResponse, + protos.google.cloud.translation.v3beta1.IDetectLanguageRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('detectLanguage response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.detectLanguage(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.IDetectLanguageResponse, + protos.google.cloud.translation.v3beta1.IDetectLanguageRequest|undefined, {}|undefined + ]) => { + this._log.info('detectLanguage response %j', response); + return [response, options, rawResponse]; + }); } /** * Returns a list of supported languages for translation. @@ -732,7 +768,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.getSupportedLanguages(request, options, callback); + this._log.info('getSupportedLanguages request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.ISupportedLanguages, + protos.google.cloud.translation.v3beta1.IGetSupportedLanguagesRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSupportedLanguages response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getSupportedLanguages(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.ISupportedLanguages, + protos.google.cloud.translation.v3beta1.IGetSupportedLanguagesRequest|undefined, {}|undefined + ]) => { + this._log.info('getSupportedLanguages response %j', response); + return [response, options, rawResponse]; + }); } /** * Gets a glossary. Returns NOT_FOUND, if the glossary doesn't @@ -803,7 +856,24 @@ export class TranslationServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.getGlossary(request, options, callback); + this._log.info('getGlossary request %j', request); + const wrappedCallback: Callback< + protos.google.cloud.translation.v3beta1.IGlossary, + protos.google.cloud.translation.v3beta1.IGetGlossaryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getGlossary response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + return this.innerApiCalls.getGlossary(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.cloud.translation.v3beta1.IGlossary, + protos.google.cloud.translation.v3beta1.IGetGlossaryRequest|undefined, {}|undefined + ]) => { + this._log.info('getGlossary response %j', response); + return [response, options, rawResponse]; + }); } /** @@ -932,7 +1002,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.batchTranslateText(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('batchTranslateText response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('batchTranslateText request %j', request); + return this.innerApiCalls.batchTranslateText(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|undefined, {}|undefined + ]) => { + this._log.info('batchTranslateText response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `batchTranslateText()`. @@ -946,6 +1033,7 @@ export class TranslationServiceClient { * region_tag:translate_v3beta1_generated_TranslationService_BatchTranslateText_async */ async checkBatchTranslateTextProgress(name: string): Promise>{ + this._log.info('batchTranslateText long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.batchTranslateText, this._gaxModule.createDefaultBackoffSettings()); @@ -1024,7 +1112,24 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.createGlossary(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createGlossary response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('createGlossary request %j', request); + return this.innerApiCalls.createGlossary(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|undefined, {}|undefined + ]) => { + this._log.info('createGlossary response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `createGlossary()`. @@ -1038,6 +1143,7 @@ export class TranslationServiceClient { * region_tag:translate_v3beta1_generated_TranslationService_CreateGlossary_async */ async checkCreateGlossaryProgress(name: string): Promise>{ + this._log.info('createGlossary long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.createGlossary, this._gaxModule.createDefaultBackoffSettings()); @@ -1115,7 +1221,24 @@ export class TranslationServiceClient { 'name': request.name ?? '', }); this.initialize(); - return this.innerApiCalls.deleteGlossary(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteGlossary response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('deleteGlossary request %j', request); + return this.innerApiCalls.deleteGlossary(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|undefined, {}|undefined + ]) => { + this._log.info('deleteGlossary response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `deleteGlossary()`. @@ -1129,6 +1252,7 @@ export class TranslationServiceClient { * region_tag:translate_v3beta1_generated_TranslationService_DeleteGlossary_async */ async checkDeleteGlossaryProgress(name: string): Promise>{ + this._log.info('deleteGlossary long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.deleteGlossary, this._gaxModule.createDefaultBackoffSettings()); @@ -1220,7 +1344,26 @@ export class TranslationServiceClient { 'parent': request.parent ?? '', }); this.initialize(); - return this.innerApiCalls.listGlossaries(request, options, callback); + const wrappedCallback: PaginationCallback< + protos.google.cloud.translation.v3beta1.IListGlossariesRequest, + protos.google.cloud.translation.v3beta1.IListGlossariesResponse|null|undefined, + protos.google.cloud.translation.v3beta1.IGlossary>|undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listGlossaries values %j', values); + callback(error, values, nextPageRequest, rawResponse); + } + : undefined; + this._log.info('listGlossaries request %j', request); + return this.innerApiCalls + .listGlossaries(request, options, wrappedCallback) + ?.then(([response, input, output]: [ + protos.google.cloud.translation.v3beta1.IGlossary[], + protos.google.cloud.translation.v3beta1.IListGlossariesRequest|null, + protos.google.cloud.translation.v3beta1.IListGlossariesResponse + ]) => { + this._log.info('listGlossaries values %j', response); + return [response, input, output]; + }); } /** @@ -1268,6 +1411,7 @@ export class TranslationServiceClient { const defaultCallSettings = this._defaults['listGlossaries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGlossaries stream %j', request); return this.descriptors.page.listGlossaries.createStream( this.innerApiCalls.listGlossaries as GaxCall, request, @@ -1323,6 +1467,7 @@ export class TranslationServiceClient { const defaultCallSettings = this._defaults['listGlossaries']; const callSettings = defaultCallSettings.merge(options); this.initialize(); + this._log.info('listGlossaries iterate %j', request); return this.descriptors.page.listGlossaries.asyncIterate( this.innerApiCalls['listGlossaries'] as GaxCall, request as {}, @@ -1427,6 +1572,7 @@ export class TranslationServiceClient { close(): Promise { if (this.translationServiceStub && !this._terminated) { return this.translationServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); diff --git a/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline b/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline index 3375e9732..dd5e5f507 100644 --- a/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline +++ b/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline @@ -29,6 +29,7 @@ import {fileURLToPath} from 'url'; import {getJSON} from '../json-helper.cjs'; // @ts-ignore const dirname = path.dirname(fileURLToPath(import.meta.url)); +import * as logging from 'google-logging-utils'; /** * Client JSON configuration object, loaded from @@ -62,6 +63,7 @@ export class VideoIntelligenceServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('videointelligence'); auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -457,7 +459,24 @@ export class VideoIntelligenceServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); - return this.innerApiCalls.annotateVideo(request, options, callback); + const wrappedCallback: Callback< + protos.google.longrunning.IOperation, + protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('annotateVideo response %j', response); + callback(error, response, options, rawResponse); + } + : undefined; + this._log.info('annotateVideo request %j', request); + return this.innerApiCalls.annotateVideo(request, options, wrappedCallback) + ?.then(([response, options, rawResponse]: [ + protos.google.longrunning.IOperation, + protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|undefined, {}|undefined + ]) => { + this._log.info('annotateVideo response %j', response); + return [response, options, rawResponse]; + }); } /** * Check the status of the long running operation returned by `annotateVideo()`. @@ -471,6 +490,7 @@ export class VideoIntelligenceServiceClient { * region_tag:videointelligence_v1_generated_VideoIntelligenceService_AnnotateVideo_async */ async checkAnnotateVideoProgress(name: string): Promise>{ + this._log.info('annotateVideo long-running'); const request = new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest({name}); const [operation] = await this.operationsClient.getOperation(request); const decodeOperation = new this._gaxModule.Operation(operation, this.descriptors.longrunning.annotateVideo, this._gaxModule.createDefaultBackoffSettings()); @@ -486,6 +506,7 @@ export class VideoIntelligenceServiceClient { close(): Promise { if (this.videoIntelligenceServiceStub && !this._terminated) { return this.videoIntelligenceServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); this.operationsClient.close(); From 3949ae28261dcb2c09c2408b69e29e6deca576e8 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:43:56 -0500 Subject: [PATCH 11/24] wip: naming updates --- typescript/src/schema/api.ts | 2 +- typescript/test/unit/api.ts | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/typescript/src/schema/api.ts b/typescript/src/schema/api.ts index 7945f9ff1..79ea5cd57 100644 --- a/typescript/src/schema/api.ts +++ b/typescript/src/schema/api.ts @@ -99,7 +99,7 @@ export class API { // users specify the actual package name, if not, set it to product name. this.publishName = options.publishName || this.naming.productName.toKebabCase(); - this.loggingName = this.publishName.replace(/^@google-cloud\//, ''); + this.loggingName = this.publishName.match(/[^/]+\/(.*)/)?.[1] ?? this.publishName; this.handwrittenLayer = options.handwrittenLayer ?? false; this.rest = options.rest; this.diregapic = options.diregapic ?? false; diff --git a/typescript/test/unit/api.ts b/typescript/test/unit/api.ts index be6bea86d..bc55f7f5d 100644 --- a/typescript/test/unit/api.ts +++ b/typescript/test/unit/api.ts @@ -36,6 +36,32 @@ describe('src/schema/api.ts', () => { ]); }); + it('should correctly derive a valid logging name', () => { + const fd = {} as protos.google.protobuf.FileDescriptorProto; + fd.name = 'google/cloud/test/v1/test.proto'; + fd.package = 'google.cloud.test.v1'; + fd.service = [{} as protos.google.protobuf.ServiceDescriptorProto]; + fd.service[0].name = 'ZService'; + fd.service[0].options = { + '.google.api.defaultHost': 'hostname.example.com:443', + }; + + const api = new API([fd], 'google.cloud.test.v1', { + grpcServiceConfig: {} as protos.grpc.service_config.ServiceConfig, + }); + assert.deepStrictEqual(api.loggingName, 'google-cloud-test-v1'); + + const apiPlainName = new API([fd], 'google-test-cloud', { + grpcServiceConfig: {} as protos.grpc.service_config.ServiceConfig, + }); + assert.deepStrictEqual(apiPlainName.loggingName, 'google-test-cloud'); + + const apiOrgName = new API([fd], '@google-test/cloud', { + grpcServiceConfig: {} as protos.grpc.service_config.ServiceConfig, + }); + assert.deepStrictEqual(apiPlainName.loggingName, 'cloud'); + }); + it('throw error if an api does not have default host', () => { const fd = {} as protos.google.protobuf.FileDescriptorProto; fd.name = 'google/cloud/test/v1/test.proto'; From 924c84cdc09df4f2be3d8cc5779c05c1d63822ab Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Mon, 10 Feb 2025 22:23:10 +0000 Subject: [PATCH 12/24] tests: finish the unit test for loggingName --- typescript/test/unit/api.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/typescript/test/unit/api.ts b/typescript/test/unit/api.ts index bc55f7f5d..4be052b5b 100644 --- a/typescript/test/unit/api.ts +++ b/typescript/test/unit/api.ts @@ -49,17 +49,19 @@ describe('src/schema/api.ts', () => { const api = new API([fd], 'google.cloud.test.v1', { grpcServiceConfig: {} as protos.grpc.service_config.ServiceConfig, }); - assert.deepStrictEqual(api.loggingName, 'google-cloud-test-v1'); + assert.deepStrictEqual(api.loggingName, 'test'); - const apiPlainName = new API([fd], 'google-test-cloud', { + const apiPlainName = new API([fd], 'google.cloud.test.v1', { grpcServiceConfig: {} as protos.grpc.service_config.ServiceConfig, + publishName: 'google-test-cloud', }); assert.deepStrictEqual(apiPlainName.loggingName, 'google-test-cloud'); - const apiOrgName = new API([fd], '@google-test/cloud', { + const apiOrgName = new API([fd], 'google.cloud.test.v1', { grpcServiceConfig: {} as protos.grpc.service_config.ServiceConfig, + publishName: '@google-test/cloud', }); - assert.deepStrictEqual(apiPlainName.loggingName, 'cloud'); + assert.deepStrictEqual(apiOrgName.loggingName, 'cloud'); }); it('throw error if an api does not have default host', () => { From 08e40a6f963eeb1bce9bd6d25dc2ab7704fe2a38 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Feb 2025 17:56:52 +0000 Subject: [PATCH 13/24] chore: fix linter issue --- typescript/src/schema/api.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/typescript/src/schema/api.ts b/typescript/src/schema/api.ts index 79ea5cd57..acf9bb77b 100644 --- a/typescript/src/schema/api.ts +++ b/typescript/src/schema/api.ts @@ -99,7 +99,8 @@ export class API { // users specify the actual package name, if not, set it to product name. this.publishName = options.publishName || this.naming.productName.toKebabCase(); - this.loggingName = this.publishName.match(/[^/]+\/(.*)/)?.[1] ?? this.publishName; + this.loggingName = + this.publishName.match(/[^/]+\/(.*)/)?.[1] ?? this.publishName; this.handwrittenLayer = options.handwrittenLayer ?? false; this.rest = options.rest; this.diregapic = options.diregapic ?? false; From ec72bae8288ca3cc9cf7a18b4cbb2117df3dc799 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Feb 2025 21:15:50 +0000 Subject: [PATCH 14/24] fix: typescript compiler can't quite follow the flow control, bypass with bang --- .../typescript_gapic/src/$version/$service_client.ts.njk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index 050b6e8a7..d721a2ae8 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -667,7 +667,7 @@ export class {{ service.name }}Client { protos.google.cloud.compute.v1.IOperation>|undefined = callback ? (error, response, nextRequest, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback(error, response, nextRequest, rawResponse); + callback!(error, response, nextRequest, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) @@ -686,7 +686,7 @@ export class {{ service.name }}Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) @@ -863,7 +863,7 @@ export class {{ service.name }}Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('{{ method.name.toCamelCase() }} request %j', request); @@ -979,7 +979,7 @@ export class {{ service.name }}Client { {{ util.toInterface(method.pagingResponseType) }}>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('{{ method.name.toCamelCase() }} request %j', request); From 8ef2183c456e1e70253639931e21a08722964580 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Feb 2025 21:39:55 +0000 Subject: [PATCH 15/24] tests: update baselines for bang changes --- .../src/v1/asset_service_client.ts.baseline | 14 ++--- .../big_query_storage_client.ts.baseline | 8 +-- .../src/v2/dataset_service_client.ts.baseline | 14 ++--- .../src/v2/job_service_client.ts.baseline | 14 ++--- .../src/v2/model_service_client.ts.baseline | 8 +-- .../src/v2/project_service_client.ts.baseline | 2 +- .../src/v2/routine_service_client.ts.baseline | 12 ++-- ...w_access_policy_service_client.ts.baseline | 2 +- .../src/v2/table_service_client.ts.baseline | 12 ++-- .../src/v1/addresses_client.ts.baseline | 6 +- .../v1/region_operations_client.ts.baseline | 4 +- .../v1/deprecated_service_client.ts.baseline | 4 +- .../src/v1beta1/compliance_client.ts.baseline | 20 +++--- .../src/v1beta1/echo_client.ts.baseline | 12 ++-- .../src/v1beta1/identity_client.ts.baseline | 10 +-- .../src/v1beta1/messaging_client.ts.baseline | 22 +++---- .../sequence_service_client.ts.baseline | 6 +- .../src/v1beta1/testing_client.ts.baseline | 16 ++--- .../dlp/src/v2/dlp_service_client.ts.baseline | 62 +++++++++---------- .../key_management_service_client.ts.baseline | 46 +++++++------- .../v2/config_service_v2_client.ts.baseline | 52 ++++++++-------- .../v2/logging_service_v2_client.ts.baseline | 10 +-- .../v2/metrics_service_v2_client.ts.baseline | 10 +-- .../alert_policy_service_client.ts.baseline | 10 +-- .../src/v3/group_service_client.ts.baseline | 12 ++-- .../src/v3/metric_service_client.ts.baseline | 16 ++--- ...ication_channel_service_client.ts.baseline | 20 +++--- ...vice_monitoring_service_client.ts.baseline | 20 +++--- .../uptime_check_service_client.ts.baseline | 12 ++-- .../src/v1beta1/naming_client.ts.baseline | 26 ++++---- .../v1beta1/cloud_redis_client.ts.baseline | 16 ++--- .../src/v1/test_service_client.ts.baseline | 6 +- .../src/v1beta1/echo_client.ts.baseline | 12 ++-- .../src/v1beta1/compliance_client.ts.baseline | 20 +++--- .../src/v1beta1/echo_client.ts.baseline | 12 ++-- .../src/v1beta1/identity_client.ts.baseline | 10 +-- .../src/v1beta1/messaging_client.ts.baseline | 22 +++---- .../sequence_service_client.ts.baseline | 6 +- .../src/v1beta1/testing_client.ts.baseline | 16 ++--- .../src/v2/cloud_tasks_client.ts.baseline | 32 +++++----- .../src/v1/text_to_speech_client.ts.baseline | 4 +- .../translation_service_client.ts.baseline | 16 ++--- ...eo_intelligence_service_client.ts.baseline | 2 +- 43 files changed, 328 insertions(+), 328 deletions(-) diff --git a/baselines/asset/src/v1/asset_service_client.ts.baseline b/baselines/asset/src/v1/asset_service_client.ts.baseline index 7f5db814d..47fc717f0 100644 --- a/baselines/asset/src/v1/asset_service_client.ts.baseline +++ b/baselines/asset/src/v1/asset_service_client.ts.baseline @@ -460,7 +460,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('batchGetAssetsHistory response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.batchGetAssetsHistory(request, options, wrappedCallback) @@ -561,7 +561,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createFeed(request, options, wrappedCallback) @@ -651,7 +651,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getFeed(request, options, wrappedCallback) @@ -740,7 +740,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('listFeeds response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.listFeeds(request, options, wrappedCallback) @@ -835,7 +835,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateFeed(request, options, wrappedCallback) @@ -925,7 +925,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteFeed(request, options, wrappedCallback) @@ -1038,7 +1038,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('exportAssets response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('exportAssets request %j', request); diff --git a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline index 99d00700a..782f97f53 100644 --- a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline +++ b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline @@ -453,7 +453,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createReadSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createReadSession(request, options, wrappedCallback) @@ -547,7 +547,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('batchCreateReadSessionStreams response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.batchCreateReadSessionStreams(request, options, wrappedCallback) @@ -647,7 +647,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('finalizeStream response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.finalizeStream(request, options, wrappedCallback) @@ -754,7 +754,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('splitReadStream response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.splitReadStream(request, options, wrappedCallback) diff --git a/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline index c8a0b3a50..a1654635a 100644 --- a/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline @@ -409,7 +409,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getDataset(request, options, wrappedCallback) @@ -498,7 +498,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.insertDataset(request, options, wrappedCallback) @@ -594,7 +594,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.patchDataset(request, options, wrappedCallback) @@ -689,7 +689,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateDataset(request, options, wrappedCallback) @@ -786,7 +786,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteDataset(request, options, wrappedCallback) @@ -882,7 +882,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('undeleteDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.undeleteDataset(request, options, wrappedCallback) @@ -996,7 +996,7 @@ export class DatasetServiceClient { protos.google.cloud.bigquery.v2.IListFormatDataset>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listDatasets values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listDatasets request %j', request); diff --git a/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline index 1c5e3a719..2222cdade 100644 --- a/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline @@ -422,7 +422,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('cancelJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.cancelJob(request, options, wrappedCallback) @@ -525,7 +525,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getJob(request, options, wrappedCallback) @@ -624,7 +624,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.insertJob(request, options, wrappedCallback) @@ -722,7 +722,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteJob(request, options, wrappedCallback) @@ -847,7 +847,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getQueryResults response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getQueryResults(request, options, wrappedCallback) @@ -937,7 +937,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('query response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.query(request, options, wrappedCallback) @@ -1059,7 +1059,7 @@ export class JobServiceClient { protos.google.cloud.bigquery.v2.IListFormatJob>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listJobs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listJobs request %j', request); diff --git a/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline index 37d377b66..93a783014 100644 --- a/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline @@ -409,7 +409,7 @@ export class ModelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getModel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getModel(request, options, wrappedCallback) @@ -506,7 +506,7 @@ export class ModelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchModel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.patchModel(request, options, wrappedCallback) @@ -599,7 +599,7 @@ export class ModelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteModel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteModel(request, options, wrappedCallback) @@ -707,7 +707,7 @@ export class ModelServiceClient { protos.google.cloud.bigquery.v2.IModel>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listModels values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listModels request %j', request); diff --git a/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline index 2b731bbb0..d2165b506 100644 --- a/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline @@ -395,7 +395,7 @@ export class ProjectServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getServiceAccount response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getServiceAccount(request, options, wrappedCallback) diff --git a/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline index a82379835..28098ff47 100644 --- a/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline @@ -409,7 +409,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getRoutine(request, options, wrappedCallback) @@ -501,7 +501,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.insertRoutine(request, options, wrappedCallback) @@ -597,7 +597,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateRoutine(request, options, wrappedCallback) @@ -691,7 +691,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.patchRoutine(request, options, wrappedCallback) @@ -784,7 +784,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteRoutine(request, options, wrappedCallback) @@ -895,7 +895,7 @@ export class RoutineServiceClient { protos.google.cloud.bigquery.v2.IRoutine>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRoutines values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listRoutines request %j', request); diff --git a/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline index 93384da66..4bd8389dd 100644 --- a/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/row_access_policy_service_client.ts.baseline @@ -417,7 +417,7 @@ export class RowAccessPolicyServiceClient { protos.google.cloud.bigquery.v2.IRowAccessPolicy>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRowAccessPolicies values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listRowAccessPolicies request %j', request); diff --git a/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline index 15aa0095a..b3cdf1f5e 100644 --- a/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline @@ -422,7 +422,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getTable(request, options, wrappedCallback) @@ -514,7 +514,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.insertTable(request, options, wrappedCallback) @@ -614,7 +614,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.patchTable(request, options, wrappedCallback) @@ -713,7 +713,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateTable(request, options, wrappedCallback) @@ -807,7 +807,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteTable(request, options, wrappedCallback) @@ -914,7 +914,7 @@ export class TableServiceClient { protos.google.cloud.bigquery.v2.IListFormatTable>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTables values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listTables request %j', request); diff --git a/baselines/compute/src/v1/addresses_client.ts.baseline b/baselines/compute/src/v1/addresses_client.ts.baseline index f111778c3..56cb71071 100644 --- a/baselines/compute/src/v1/addresses_client.ts.baseline +++ b/baselines/compute/src/v1/addresses_client.ts.baseline @@ -424,7 +424,7 @@ export class AddressesClient { protos.google.cloud.compute.v1.IOperation>|undefined = callback ? (error, response, nextRequest, rawResponse) => { this._log.info('delete response %j', response); - callback(error, response, nextRequest, rawResponse); + callback!(error, response, nextRequest, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.delete(request, options, wrappedCallback) @@ -528,7 +528,7 @@ export class AddressesClient { protos.google.cloud.compute.v1.IOperation>|undefined = callback ? (error, response, nextRequest, rawResponse) => { this._log.info('insert response %j', response); - callback(error, response, nextRequest, rawResponse); + callback!(error, response, nextRequest, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.insert(request, options, wrappedCallback) @@ -706,7 +706,7 @@ export class AddressesClient { protos.google.cloud.compute.v1.IAddress>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('list values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('list request %j', request); diff --git a/baselines/compute/src/v1/region_operations_client.ts.baseline b/baselines/compute/src/v1/region_operations_client.ts.baseline index b031c58f3..7c629161f 100644 --- a/baselines/compute/src/v1/region_operations_client.ts.baseline +++ b/baselines/compute/src/v1/region_operations_client.ts.baseline @@ -400,7 +400,7 @@ export class RegionOperationsClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('get response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.get(request, options, wrappedCallback) @@ -497,7 +497,7 @@ export class RegionOperationsClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.wait(request, options, wrappedCallback) diff --git a/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline b/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline index b877f737f..2407b33b2 100644 --- a/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline +++ b/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline @@ -388,7 +388,7 @@ export class DeprecatedServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('fastFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) @@ -472,7 +472,7 @@ export class DeprecatedServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('slowFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) diff --git a/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline index aa8c75618..c61a0c42c 100644 --- a/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline @@ -438,7 +438,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBody response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) @@ -535,7 +535,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyInfo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) @@ -631,7 +631,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataQuery response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) @@ -737,7 +737,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataSimplePath response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) @@ -839,7 +839,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) @@ -940,7 +940,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathTrailingResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) @@ -1035,7 +1035,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPut response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) @@ -1130,7 +1130,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPatch response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) @@ -1217,7 +1217,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getEnum(request, options, wrappedCallback) @@ -1306,7 +1306,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) diff --git a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline index 88b861de0..5a6175bb9 100644 --- a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline @@ -576,7 +576,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.echo(request, options, wrappedCallback) @@ -667,7 +667,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echoErrorDetails response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) @@ -757,7 +757,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pagedExpandLegacy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) @@ -846,7 +846,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('block response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.block(request, options, wrappedCallback) @@ -1043,7 +1043,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('wait request %j', request); @@ -1153,7 +1153,7 @@ export class EchoClient { protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('pagedExpand values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('pagedExpand request %j', request); diff --git a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline index fc0d97e36..cdb7bbf85 100644 --- a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline @@ -431,7 +431,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createUser(request, options, wrappedCallback) @@ -518,7 +518,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getUser(request, options, wrappedCallback) @@ -608,7 +608,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateUser(request, options, wrappedCallback) @@ -695,7 +695,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteUser(request, options, wrappedCallback) @@ -787,7 +787,7 @@ export class IdentityClient { protos.google.showcase.v1beta1.IUser>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUsers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listUsers request %j', request); diff --git a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline index 9f38d2cdb..82971c8db 100644 --- a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline @@ -479,7 +479,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createRoom(request, options, wrappedCallback) @@ -566,7 +566,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getRoom(request, options, wrappedCallback) @@ -656,7 +656,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateRoom(request, options, wrappedCallback) @@ -743,7 +743,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) @@ -835,7 +835,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createBlurb(request, options, wrappedCallback) @@ -922,7 +922,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getBlurb(request, options, wrappedCallback) @@ -1012,7 +1012,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) @@ -1099,7 +1099,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) @@ -1311,7 +1311,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('searchBlurbs response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('searchBlurbs request %j', request); @@ -1421,7 +1421,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IRoom>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRooms values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listRooms request %j', request); @@ -1609,7 +1609,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IBlurb>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listBlurbs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listBlurbs request %j', request); diff --git a/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline index b2a537daa..3d12caa62 100644 --- a/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline @@ -420,7 +420,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createSequence(request, options, wrappedCallback) @@ -506,7 +506,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSequenceReport response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) @@ -592,7 +592,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('attemptSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) diff --git a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline index 9ed8af0ce..9c9ee25c9 100644 --- a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline @@ -436,7 +436,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createSession(request, options, wrappedCallback) @@ -523,7 +523,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getSession(request, options, wrappedCallback) @@ -610,7 +610,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteSession(request, options, wrappedCallback) @@ -699,7 +699,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('reportSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.reportSession(request, options, wrappedCallback) @@ -791,7 +791,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteTest(request, options, wrappedCallback) @@ -885,7 +885,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.verifyTest(request, options, wrappedCallback) @@ -974,7 +974,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ISession>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listSessions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listSessions request %j', request); @@ -1151,7 +1151,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ITest>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTests values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listTests request %j', request); diff --git a/baselines/dlp/src/v2/dlp_service_client.ts.baseline b/baselines/dlp/src/v2/dlp_service_client.ts.baseline index c354d64d7..7d0c435f2 100644 --- a/baselines/dlp/src/v2/dlp_service_client.ts.baseline +++ b/baselines/dlp/src/v2/dlp_service_client.ts.baseline @@ -474,7 +474,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('inspectContent response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.inspectContent(request, options, wrappedCallback) @@ -581,7 +581,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('redactImage response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.redactImage(request, options, wrappedCallback) @@ -701,7 +701,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deidentifyContent response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deidentifyContent(request, options, wrappedCallback) @@ -823,7 +823,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('reidentifyContent response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.reidentifyContent(request, options, wrappedCallback) @@ -920,7 +920,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('listInfoTypes response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.listInfoTypes(request, options, wrappedCallback) @@ -1021,7 +1021,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createInspectTemplate(request, options, wrappedCallback) @@ -1115,7 +1115,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateInspectTemplate(request, options, wrappedCallback) @@ -1205,7 +1205,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getInspectTemplate(request, options, wrappedCallback) @@ -1295,7 +1295,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteInspectTemplate(request, options, wrappedCallback) @@ -1397,7 +1397,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createDeidentifyTemplate(request, options, wrappedCallback) @@ -1492,7 +1492,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateDeidentifyTemplate(request, options, wrappedCallback) @@ -1583,7 +1583,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getDeidentifyTemplate(request, options, wrappedCallback) @@ -1674,7 +1674,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteDeidentifyTemplate(request, options, wrappedCallback) @@ -1774,7 +1774,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createJobTrigger(request, options, wrappedCallback) @@ -1867,7 +1867,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateJobTrigger(request, options, wrappedCallback) @@ -1956,7 +1956,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getJobTrigger(request, options, wrappedCallback) @@ -2045,7 +2045,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteJobTrigger(request, options, wrappedCallback) @@ -2134,7 +2134,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('activateJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.activateJobTrigger(request, options, wrappedCallback) @@ -2240,7 +2240,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createDlpJob(request, options, wrappedCallback) @@ -2329,7 +2329,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getDlpJob(request, options, wrappedCallback) @@ -2420,7 +2420,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteDlpJob(request, options, wrappedCallback) @@ -2511,7 +2511,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('cancelDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.cancelDlpJob(request, options, wrappedCallback) @@ -2612,7 +2612,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createStoredInfoType(request, options, wrappedCallback) @@ -2710,7 +2710,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateStoredInfoType(request, options, wrappedCallback) @@ -2801,7 +2801,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getStoredInfoType(request, options, wrappedCallback) @@ -2892,7 +2892,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteStoredInfoType(request, options, wrappedCallback) @@ -3010,7 +3010,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IInspectTemplate>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listInspectTemplates values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listInspectTemplates request %j', request); @@ -3266,7 +3266,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IDeidentifyTemplate>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listDeidentifyTemplates values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listDeidentifyTemplates request %j', request); @@ -3547,7 +3547,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IJobTrigger>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listJobTriggers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listJobTriggers request %j', request); @@ -3883,7 +3883,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IDlpJob>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listDlpJobs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listDlpJobs request %j', request); @@ -4196,7 +4196,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IStoredInfoType>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listStoredInfoTypes values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listStoredInfoTypes request %j', request); diff --git a/baselines/kms/src/v1/key_management_service_client.ts.baseline b/baselines/kms/src/v1/key_management_service_client.ts.baseline index 97858d6bf..f8cd96347 100644 --- a/baselines/kms/src/v1/key_management_service_client.ts.baseline +++ b/baselines/kms/src/v1/key_management_service_client.ts.baseline @@ -418,7 +418,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getKeyRing response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getKeyRing(request, options, wrappedCallback) @@ -506,7 +506,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getCryptoKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getCryptoKey(request, options, wrappedCallback) @@ -593,7 +593,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getCryptoKeyVersion(request, options, wrappedCallback) @@ -684,7 +684,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getPublicKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getPublicKey(request, options, wrappedCallback) @@ -771,7 +771,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getImportJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getImportJob(request, options, wrappedCallback) @@ -864,7 +864,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createKeyRing response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createKeyRing(request, options, wrappedCallback) @@ -967,7 +967,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createCryptoKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createCryptoKey(request, options, wrappedCallback) @@ -1061,7 +1061,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createCryptoKeyVersion(request, options, wrappedCallback) @@ -1180,7 +1180,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('importCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.importCryptoKeyVersion(request, options, wrappedCallback) @@ -1275,7 +1275,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createImportJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createImportJob(request, options, wrappedCallback) @@ -1364,7 +1364,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCryptoKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateCryptoKey(request, options, wrappedCallback) @@ -1459,7 +1459,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateCryptoKeyVersion(request, options, wrappedCallback) @@ -1571,7 +1571,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('encrypt response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.encrypt(request, options, wrappedCallback) @@ -1666,7 +1666,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('decrypt response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.decrypt(request, options, wrappedCallback) @@ -1759,7 +1759,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('asymmetricSign response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.asymmetricSign(request, options, wrappedCallback) @@ -1852,7 +1852,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('asymmetricDecrypt response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.asymmetricDecrypt(request, options, wrappedCallback) @@ -1943,7 +1943,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCryptoKeyPrimaryVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateCryptoKeyPrimaryVersion(request, options, wrappedCallback) @@ -2041,7 +2041,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('destroyCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.destroyCryptoKeyVersion(request, options, wrappedCallback) @@ -2134,7 +2134,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('restoreCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.restoreCryptoKeyVersion(request, options, wrappedCallback) @@ -2240,7 +2240,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.IKeyRing>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listKeyRings values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listKeyRings request %j', request); @@ -2463,7 +2463,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.ICryptoKey>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listCryptoKeys values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listCryptoKeys request %j', request); @@ -2691,7 +2691,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.ICryptoKeyVersion>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listCryptoKeyVersions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listCryptoKeyVersions request %j', request); @@ -2918,7 +2918,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.IImportJob>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listImportJobs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listImportJobs request %j', request); diff --git a/baselines/logging/src/v2/config_service_v2_client.ts.baseline b/baselines/logging/src/v2/config_service_v2_client.ts.baseline index 4615224f1..b88f1f30e 100644 --- a/baselines/logging/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/config_service_v2_client.ts.baseline @@ -543,7 +543,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getBucket(request, options, wrappedCallback) @@ -645,7 +645,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createBucket(request, options, wrappedCallback) @@ -761,7 +761,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateBucket(request, options, wrappedCallback) @@ -861,7 +861,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteBucket(request, options, wrappedCallback) @@ -958,7 +958,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('undeleteBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.undeleteBucket(request, options, wrappedCallback) @@ -1051,7 +1051,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getView(request, options, wrappedCallback) @@ -1149,7 +1149,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createView(request, options, wrappedCallback) @@ -1257,7 +1257,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateView(request, options, wrappedCallback) @@ -1353,7 +1353,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteView(request, options, wrappedCallback) @@ -1449,7 +1449,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getSink(request, options, wrappedCallback) @@ -1564,7 +1564,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createSink(request, options, wrappedCallback) @@ -1697,7 +1697,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateSink(request, options, wrappedCallback) @@ -1795,7 +1795,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteSink(request, options, wrappedCallback) @@ -1891,7 +1891,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getExclusion(request, options, wrappedCallback) @@ -1993,7 +1993,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createExclusion(request, options, wrappedCallback) @@ -2101,7 +2101,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateExclusion(request, options, wrappedCallback) @@ -2197,7 +2197,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteExclusion(request, options, wrappedCallback) @@ -2307,7 +2307,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getCmekSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getCmekSettings(request, options, wrappedCallback) @@ -2435,7 +2435,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCmekSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateCmekSettings(request, options, wrappedCallback) @@ -2545,7 +2545,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getSettings(request, options, wrappedCallback) @@ -2671,7 +2671,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateSettings(request, options, wrappedCallback) @@ -2764,7 +2764,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('copyLogEntries response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('copyLogEntries request %j', request); @@ -2892,7 +2892,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogBucket>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listBuckets values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listBuckets request %j', request); @@ -3119,7 +3119,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogView>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listViews values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listViews request %j', request); @@ -3336,7 +3336,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogSink>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listSinks values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listSinks request %j', request); @@ -3557,7 +3557,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogExclusion>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listExclusions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listExclusions request %j', request); diff --git a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline index 9f1f36ea7..583fbc707 100644 --- a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline @@ -549,7 +549,7 @@ export class LoggingServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteLog response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteLog(request, options, wrappedCallback) @@ -702,7 +702,7 @@ export class LoggingServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('writeLogEntries response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.writeLogEntries(request, options, wrappedCallback) @@ -855,7 +855,7 @@ export class LoggingServiceV2Client { protos.google.logging.v2.ILogEntry>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listLogEntries values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listLogEntries request %j', request); @@ -1106,7 +1106,7 @@ export class LoggingServiceV2Client { protos.google.api.IMonitoredResourceDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listMonitoredResourceDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listMonitoredResourceDescriptors request %j', request); @@ -1318,7 +1318,7 @@ export class LoggingServiceV2Client { string>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listLogs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listLogs request %j', request); diff --git a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline index 15cd6ad2a..f4b47057b 100644 --- a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline @@ -501,7 +501,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getLogMetric(request, options, wrappedCallback) @@ -595,7 +595,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createLogMetric(request, options, wrappedCallback) @@ -690,7 +690,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateLogMetric(request, options, wrappedCallback) @@ -779,7 +779,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteLogMetric(request, options, wrappedCallback) @@ -882,7 +882,7 @@ export class MetricsServiceV2Client { protos.google.logging.v2.ILogMetric>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listLogMetrics values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listLogMetrics request %j', request); diff --git a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline index d34a42bc3..91ee198b1 100644 --- a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline @@ -489,7 +489,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getAlertPolicy(request, options, wrappedCallback) @@ -587,7 +587,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createAlertPolicy(request, options, wrappedCallback) @@ -678,7 +678,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteAlertPolicy(request, options, wrappedCallback) @@ -793,7 +793,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateAlertPolicy(request, options, wrappedCallback) @@ -912,7 +912,7 @@ export class AlertPolicyServiceClient { protos.google.monitoring.v3.IAlertPolicy>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listAlertPolicies values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listAlertPolicies request %j', request); diff --git a/baselines/monitoring/src/v3/group_service_client.ts.baseline b/baselines/monitoring/src/v3/group_service_client.ts.baseline index 29b528b0a..a1499d78e 100644 --- a/baselines/monitoring/src/v3/group_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/group_service_client.ts.baseline @@ -493,7 +493,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getGroup(request, options, wrappedCallback) @@ -586,7 +586,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createGroup(request, options, wrappedCallback) @@ -677,7 +677,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateGroup(request, options, wrappedCallback) @@ -769,7 +769,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteGroup(request, options, wrappedCallback) @@ -883,7 +883,7 @@ export class GroupServiceClient { protos.google.monitoring.v3.IGroup>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listGroups values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listGroups request %j', request); @@ -1126,7 +1126,7 @@ export class GroupServiceClient { protos.google.api.IMonitoredResource>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listGroupMembers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listGroupMembers request %j', request); diff --git a/baselines/monitoring/src/v3/metric_service_client.ts.baseline b/baselines/monitoring/src/v3/metric_service_client.ts.baseline index 6912b3aa9..eba9f1059 100644 --- a/baselines/monitoring/src/v3/metric_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/metric_service_client.ts.baseline @@ -506,7 +506,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getMonitoredResourceDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getMonitoredResourceDescriptor(request, options, wrappedCallback) @@ -596,7 +596,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getMetricDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getMetricDescriptor(request, options, wrappedCallback) @@ -689,7 +689,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createMetricDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createMetricDescriptor(request, options, wrappedCallback) @@ -780,7 +780,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteMetricDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteMetricDescriptor(request, options, wrappedCallback) @@ -879,7 +879,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createTimeSeries response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createTimeSeries(request, options, wrappedCallback) @@ -986,7 +986,7 @@ export class MetricServiceClient { protos.google.api.IMonitoredResourceDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listMonitoredResourceDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listMonitoredResourceDescriptors request %j', request); @@ -1211,7 +1211,7 @@ export class MetricServiceClient { protos.google.api.IMetricDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listMetricDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listMetricDescriptors request %j', request); @@ -1456,7 +1456,7 @@ export class MetricServiceClient { protos.google.monitoring.v3.ITimeSeries>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTimeSeries values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listTimeSeries request %j', request); diff --git a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline index be2074f10..648ba91ad 100644 --- a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline @@ -484,7 +484,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getNotificationChannelDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getNotificationChannelDescriptor(request, options, wrappedCallback) @@ -576,7 +576,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getNotificationChannel(request, options, wrappedCallback) @@ -673,7 +673,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createNotificationChannel(request, options, wrappedCallback) @@ -766,7 +766,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateNotificationChannel(request, options, wrappedCallback) @@ -859,7 +859,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteNotificationChannel(request, options, wrappedCallback) @@ -947,7 +947,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('sendNotificationChannelVerificationCode response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.sendNotificationChannelVerificationCode(request, options, wrappedCallback) @@ -1066,7 +1066,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getNotificationChannelVerificationCode response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getNotificationChannelVerificationCode(request, options, wrappedCallback) @@ -1163,7 +1163,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.verifyNotificationChannel(request, options, wrappedCallback) @@ -1272,7 +1272,7 @@ export class NotificationChannelServiceClient { protos.google.monitoring.v3.INotificationChannelDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listNotificationChannelDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listNotificationChannelDescriptors request %j', request); @@ -1510,7 +1510,7 @@ export class NotificationChannelServiceClient { protos.google.monitoring.v3.INotificationChannel>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listNotificationChannels values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listNotificationChannels request %j', request); diff --git a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline index 3ae8c2f75..c95e881e2 100644 --- a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline @@ -490,7 +490,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createService(request, options, wrappedCallback) @@ -578,7 +578,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getService(request, options, wrappedCallback) @@ -668,7 +668,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateService(request, options, wrappedCallback) @@ -756,7 +756,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteService(request, options, wrappedCallback) @@ -852,7 +852,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createServiceLevelObjective(request, options, wrappedCallback) @@ -946,7 +946,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getServiceLevelObjective(request, options, wrappedCallback) @@ -1036,7 +1036,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateServiceLevelObjective(request, options, wrappedCallback) @@ -1125,7 +1125,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteServiceLevelObjective(request, options, wrappedCallback) @@ -1241,7 +1241,7 @@ export class ServiceMonitoringServiceClient { protos.google.monitoring.v3.IService>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listServices values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listServices request %j', request); @@ -1483,7 +1483,7 @@ export class ServiceMonitoringServiceClient { protos.google.monitoring.v3.IServiceLevelObjective>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listServiceLevelObjectives values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listServiceLevelObjectives request %j', request); diff --git a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline index 9e3393b25..cf466fc43 100644 --- a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline @@ -489,7 +489,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getUptimeCheckConfig(request, options, wrappedCallback) @@ -579,7 +579,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createUptimeCheckConfig(request, options, wrappedCallback) @@ -684,7 +684,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateUptimeCheckConfig(request, options, wrappedCallback) @@ -774,7 +774,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteUptimeCheckConfig(request, options, wrappedCallback) @@ -877,7 +877,7 @@ export class UptimeCheckServiceClient { protos.google.monitoring.v3.IUptimeCheckConfig>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUptimeCheckConfigs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listUptimeCheckConfigs request %j', request); @@ -1080,7 +1080,7 @@ export class UptimeCheckServiceClient { protos.google.monitoring.v3.IUptimeCheckIp>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUptimeCheckIps values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listUptimeCheckIps request %j', request); diff --git a/baselines/naming/src/v1beta1/naming_client.ts.baseline b/baselines/naming/src/v1beta1/naming_client.ts.baseline index 38d52f33c..65ef66245 100644 --- a/baselines/naming/src/v1beta1/naming_client.ts.baseline +++ b/baselines/naming/src/v1beta1/naming_client.ts.baseline @@ -428,7 +428,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('paginatedMethodStream response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.paginatedMethodStream(request, options, wrappedCallback) @@ -507,7 +507,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('paginatedMethodAsync response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.paginatedMethodAsync(request, options, wrappedCallback) @@ -586,7 +586,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('checkLongRunningProgress response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.checkLongRunningProgress(request, options, wrappedCallback) @@ -666,7 +666,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('initialize response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.initialize(request, options, wrappedCallback) @@ -745,7 +745,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('servicePath response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.servicePath(request, options, wrappedCallback) @@ -824,7 +824,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('apiEndpoint response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.apiEndpoint(request, options, wrappedCallback) @@ -903,7 +903,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('port response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.port(request, options, wrappedCallback) @@ -982,7 +982,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('scopes response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.scopes(request, options, wrappedCallback) @@ -1061,7 +1061,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getProjectId response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getProjectId(request, options, wrappedCallback) @@ -1141,7 +1141,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getReservedWord response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getReservedWord(request, options, wrappedCallback) @@ -1220,7 +1220,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createABCDESomething response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createAbcdeSomething(request, options, wrappedCallback) @@ -1302,7 +1302,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('longRunning response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('longRunning request %j', request); @@ -1409,7 +1409,7 @@ export class NamingClient { protos.google.protobuf.IEmpty>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('paginatedMethod values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('paginatedMethod request %j', request); diff --git a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline index 007bce1d3..3573639fa 100644 --- a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline @@ -494,7 +494,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getInstance(request, options, wrappedCallback) @@ -607,7 +607,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('createInstance request %j', request); @@ -728,7 +728,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('updateInstance request %j', request); @@ -846,7 +846,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('importInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('importInstance request %j', request); @@ -962,7 +962,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('exportInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('exportInstance request %j', request); @@ -1075,7 +1075,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('failoverInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('failoverInstance request %j', request); @@ -1185,7 +1185,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('deleteInstance request %j', request); @@ -1315,7 +1315,7 @@ export class CloudRedisClient { protos.google.cloud.redis.v1beta1.IInstance>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listInstances values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listInstances request %j', request); diff --git a/baselines/routingtest/src/v1/test_service_client.ts.baseline b/baselines/routingtest/src/v1/test_service_client.ts.baseline index af2676d6c..ef944e96e 100644 --- a/baselines/routingtest/src/v1/test_service_client.ts.baseline +++ b/baselines/routingtest/src/v1/test_service_client.ts.baseline @@ -407,7 +407,7 @@ export class TestServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('fastFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) @@ -521,7 +521,7 @@ export class TestServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('randomFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.randomFibonacci(request, options, wrappedCallback) @@ -645,7 +645,7 @@ export class TestServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('slowFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) diff --git a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline index e863f52ad..922912357 100644 --- a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline @@ -515,7 +515,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.echo(request, options, wrappedCallback) @@ -606,7 +606,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echoErrorDetails response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) @@ -696,7 +696,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pagedExpandLegacy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) @@ -785,7 +785,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('block response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.block(request, options, wrappedCallback) @@ -982,7 +982,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('wait request %j', request); @@ -1092,7 +1092,7 @@ export class EchoClient { protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('pagedExpand values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('pagedExpand request %j', request); diff --git a/baselines/showcase/src/v1beta1/compliance_client.ts.baseline b/baselines/showcase/src/v1beta1/compliance_client.ts.baseline index 3573b1214..6ba40a9c0 100644 --- a/baselines/showcase/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/compliance_client.ts.baseline @@ -441,7 +441,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBody response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) @@ -538,7 +538,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyInfo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) @@ -634,7 +634,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataQuery response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) @@ -740,7 +740,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataSimplePath response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) @@ -842,7 +842,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) @@ -943,7 +943,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathTrailingResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) @@ -1038,7 +1038,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPut response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) @@ -1133,7 +1133,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPatch response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) @@ -1220,7 +1220,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getEnum(request, options, wrappedCallback) @@ -1309,7 +1309,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) diff --git a/baselines/showcase/src/v1beta1/echo_client.ts.baseline b/baselines/showcase/src/v1beta1/echo_client.ts.baseline index adb38c737..7c8aa86d3 100644 --- a/baselines/showcase/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/echo_client.ts.baseline @@ -585,7 +585,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.echo(request, options, wrappedCallback) @@ -676,7 +676,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echoErrorDetails response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) @@ -766,7 +766,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pagedExpandLegacy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) @@ -855,7 +855,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('block response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.block(request, options, wrappedCallback) @@ -1052,7 +1052,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('wait request %j', request); @@ -1162,7 +1162,7 @@ export class EchoClient { protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('pagedExpand values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('pagedExpand request %j', request); diff --git a/baselines/showcase/src/v1beta1/identity_client.ts.baseline b/baselines/showcase/src/v1beta1/identity_client.ts.baseline index 5fbf697b6..b320a0b9a 100644 --- a/baselines/showcase/src/v1beta1/identity_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/identity_client.ts.baseline @@ -434,7 +434,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createUser(request, options, wrappedCallback) @@ -521,7 +521,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getUser(request, options, wrappedCallback) @@ -611,7 +611,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateUser(request, options, wrappedCallback) @@ -698,7 +698,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteUser(request, options, wrappedCallback) @@ -790,7 +790,7 @@ export class IdentityClient { protos.google.showcase.v1beta1.IUser>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUsers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listUsers request %j', request); diff --git a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline index 7fced8571..fc085f268 100644 --- a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline @@ -485,7 +485,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createRoom(request, options, wrappedCallback) @@ -572,7 +572,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getRoom(request, options, wrappedCallback) @@ -662,7 +662,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateRoom(request, options, wrappedCallback) @@ -749,7 +749,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) @@ -841,7 +841,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createBlurb(request, options, wrappedCallback) @@ -928,7 +928,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getBlurb(request, options, wrappedCallback) @@ -1018,7 +1018,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) @@ -1105,7 +1105,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) @@ -1317,7 +1317,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('searchBlurbs response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('searchBlurbs request %j', request); @@ -1427,7 +1427,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IRoom>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRooms values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listRooms request %j', request); @@ -1615,7 +1615,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IBlurb>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listBlurbs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listBlurbs request %j', request); diff --git a/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline b/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline index 68e8caf88..9f9bf111c 100644 --- a/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline @@ -423,7 +423,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createSequence(request, options, wrappedCallback) @@ -509,7 +509,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSequenceReport response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) @@ -595,7 +595,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('attemptSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) diff --git a/baselines/showcase/src/v1beta1/testing_client.ts.baseline b/baselines/showcase/src/v1beta1/testing_client.ts.baseline index 479127ec3..f95ef2358 100644 --- a/baselines/showcase/src/v1beta1/testing_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/testing_client.ts.baseline @@ -439,7 +439,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createSession(request, options, wrappedCallback) @@ -526,7 +526,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getSession(request, options, wrappedCallback) @@ -613,7 +613,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteSession(request, options, wrappedCallback) @@ -702,7 +702,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('reportSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.reportSession(request, options, wrappedCallback) @@ -794,7 +794,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteTest(request, options, wrappedCallback) @@ -888,7 +888,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.verifyTest(request, options, wrappedCallback) @@ -977,7 +977,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ISession>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listSessions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listSessions request %j', request); @@ -1154,7 +1154,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ITest>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTests values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listTests request %j', request); diff --git a/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline b/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline index 41883d1b9..a89f11ae3 100644 --- a/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline +++ b/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline @@ -415,7 +415,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getQueue(request, options, wrappedCallback) @@ -522,7 +522,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createQueue(request, options, wrappedCallback) @@ -633,7 +633,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.updateQueue(request, options, wrappedCallback) @@ -733,7 +733,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteQueue(request, options, wrappedCallback) @@ -826,7 +826,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('purgeQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.purgeQueue(request, options, wrappedCallback) @@ -920,7 +920,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pauseQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.pauseQueue(request, options, wrappedCallback) @@ -1020,7 +1020,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('resumeQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.resumeQueue(request, options, wrappedCallback) @@ -1119,7 +1119,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getIamPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getIamPolicy(request, options, wrappedCallback) @@ -1222,7 +1222,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('setIamPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.setIamPolicy(request, options, wrappedCallback) @@ -1321,7 +1321,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('testIamPermissions response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.testIamPermissions(request, options, wrappedCallback) @@ -1422,7 +1422,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getTask(request, options, wrappedCallback) @@ -1563,7 +1563,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.createTask(request, options, wrappedCallback) @@ -1655,7 +1655,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.deleteTask(request, options, wrappedCallback) @@ -1779,7 +1779,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('runTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.runTask(request, options, wrappedCallback) @@ -1903,7 +1903,7 @@ export class CloudTasksClient { protos.google.cloud.tasks.v2.IQueue>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listQueues values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listQueues request %j', request); @@ -2183,7 +2183,7 @@ export class CloudTasksClient { protos.google.cloud.tasks.v2.ITask>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTasks values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listTasks request %j', request); diff --git a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline index fa3022903..2a257ad0b 100644 --- a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline +++ b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline @@ -391,7 +391,7 @@ export class TextToSpeechClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('listVoices response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.listVoices(request, options, wrappedCallback) @@ -478,7 +478,7 @@ export class TextToSpeechClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('synthesizeSpeech response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.synthesizeSpeech(request, options, wrappedCallback) diff --git a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline index 3810e31b5..89b0170df 100644 --- a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline @@ -515,7 +515,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('translateText response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.translateText(request, options, wrappedCallback) @@ -636,7 +636,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('detectLanguage response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.detectLanguage(request, options, wrappedCallback) @@ -754,7 +754,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSupportedLanguages response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getSupportedLanguages(request, options, wrappedCallback) @@ -842,7 +842,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getGlossary response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; return this.innerApiCalls.getGlossary(request, options, wrappedCallback) @@ -987,7 +987,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('batchTranslateText response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('batchTranslateText request %j', request); @@ -1097,7 +1097,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createGlossary response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('createGlossary request %j', request); @@ -1206,7 +1206,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteGlossary response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('deleteGlossary request %j', request); @@ -1329,7 +1329,7 @@ export class TranslationServiceClient { protos.google.cloud.translation.v3beta1.IGlossary>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listGlossaries values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. } : undefined; this._log.info('listGlossaries request %j', request); diff --git a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline index 4cd4641da..e5778e8f6 100644 --- a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline +++ b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline @@ -444,7 +444,7 @@ export class VideoIntelligenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('annotateVideo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); // We verified callback above. } : undefined; this._log.info('annotateVideo request %j', request); From e365550267047d073f256eeec0517e0ee1033917 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Feb 2025 21:56:28 +0000 Subject: [PATCH 16/24] fix: esm updates to match cjs --- .../esm/src/$version/$service_client.ts.njk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk index 61c97a22d..15070ea25 100644 --- a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk +++ b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk @@ -219,6 +219,7 @@ export class {{ service.name }}Client { // Set useJWTAccessWithScope on the auth object. this.auth.useJWTAccessWithScope = true; {%- endif %} +import * as logging from 'google-logging-utils'; // Set defaultServicePath on the auth object. this.auth.defaultServicePath = this._servicePath; @@ -678,7 +679,7 @@ export class {{ service.name }}Client { protos.google.cloud.compute.v1.IOperation>|undefined = callback ? (error, response, nextRequest, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback(error, response, nextRequest, rawResponse); + callback!(error, response, nextRequest, rawResponse); } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) @@ -697,7 +698,7 @@ export class {{ service.name }}Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) @@ -874,7 +875,7 @@ export class {{ service.name }}Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; this._log.info('{{ method.name.toCamelCase() }} request %j', request); @@ -985,7 +986,7 @@ export class {{ service.name }}Client { {{ util.toInterface(method.pagingResponseType) }}>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('{{ method.name.toCamelCase() }} request %j', request); From c0700e5eb186fc8cd3f11a9e43e9b7aa36e1e0ac Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Feb 2025 22:31:50 +0000 Subject: [PATCH 17/24] fix: correct LRO function signatures --- .../src/$version/$service_client.ts.njk | 41 +++++++++---------- .../esm/src/$version/$service_client.ts.njk | 41 +++++++++---------- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index d721a2ae8..dd23009c5 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -662,21 +662,20 @@ export class {{ service.name }}Client { this._log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} const wrappedCallback: Callback< - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation>|undefined = callback - ? (error, response, nextRequest, rawResponse) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback!(error, response, nextRequest, rawResponse); // We verified callback above. + LROperation<{{ util.toInterface(method.outputInterface) }}, null>, + {{ util.toInterface(method.outputInterface) }}|undefined, {}|undefined>|undefined = callback + ? (error, response, rawResponse, _) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); + ?.then(([response, rawResponse, _]: [LROperation<{{ util.toInterface(method.outputInterface) }}, null>,{{ util.toInterface(method.outputInterface) }}|undefined,{}|undefined]) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + response, + rawResponse, + _ ]; }); {%- else %} @@ -858,22 +857,22 @@ export class {{ service.name }}Client { this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} const wrappedCallback: Callback< - {{ util.toInterface(method.outputInterface) }}, - {{ util.toInterface(method.inputInterface) }}|null|undefined, + LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType) }}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, + {{ util.toInterface(method.outputInterface) }}|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('{{ method.name.toCamelCase() }} request %j', request); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - {{ util.toInterface(method.outputInterface) }}, - {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType) }}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, + {{ util.toInterface(method.outputInterface) }}|undefined, {}|undefined ]) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); - return [response, options, rawResponse]; + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk index 15070ea25..989bfc02c 100644 --- a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk +++ b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk @@ -674,21 +674,20 @@ import * as logging from 'google-logging-utils'; this._log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} const wrappedCallback: Callback< - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation>|undefined = callback - ? (error, response, nextRequest, rawResponse) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback!(error, response, nextRequest, rawResponse); + LROperation<{{ util.toInterface(method.outputInterface) }}, null>, + {{ util.toInterface(method.outputInterface) }}|undefined, {}|undefined>|undefined = callback + ? (error, response, rawResponse, _) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); + ?.then(([response, rawResponse, _]: [LROperation<{{ util.toInterface(method.outputInterface) }}, null>,{{ util.toInterface(method.outputInterface) }}|undefined,{}|undefined]) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + response, + rawResponse, + _ ]; }); {%- else %} @@ -870,22 +869,22 @@ import * as logging from 'google-logging-utils'; this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} const wrappedCallback: Callback< - {{ util.toInterface(method.outputInterface) }}, - {{ util.toInterface(method.inputInterface) }}|null|undefined, + LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType) }}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, + {{ util.toInterface(method.outputInterface) }}|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); - callback!(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('{{ method.name.toCamelCase() }} request %j', request); return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - {{ util.toInterface(method.outputInterface) }}, - {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType) }}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, + {{ util.toInterface(method.outputInterface) }}|undefined, {}|undefined ]) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', response); - return [response, options, rawResponse]; + this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + return [response, rawResponse, _]; }); } /** From f742fc003e339ec8e272629bae55e5ce6d15e10e Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Feb 2025 22:53:35 +0000 Subject: [PATCH 18/24] tests: update esm baselines --- .../src/v1/asset_service_client.ts.baseline | 32 ++--- .../src/v1/asset_service_client.ts.baseline | 20 +-- .../big_query_storage_client.ts.baseline | 8 +- .../src/v2/dataset_service_client.ts.baseline | 14 +- .../esm/src/v2/job_service_client.ts.baseline | 14 +- .../src/v2/model_service_client.ts.baseline | 8 +- .../src/v2/project_service_client.ts.baseline | 2 +- .../src/v2/routine_service_client.ts.baseline | 12 +- ...w_access_policy_service_client.ts.baseline | 2 +- .../src/v2/table_service_client.ts.baseline | 12 +- .../esm/src/v1/addresses_client.ts.baseline | 44 +++---- .../v1/region_operations_client.ts.baseline | 4 +- .../src/v1/addresses_client.ts.baseline | 42 +++--- .../v1/deprecated_service_client.ts.baseline | 4 +- .../src/v1beta1/compliance_client.ts.baseline | 20 +-- .../esm/src/v1beta1/echo_client.ts.baseline | 30 ++--- .../src/v1beta1/identity_client.ts.baseline | 10 +- .../src/v1beta1/messaging_client.ts.baseline | 40 +++--- .../sequence_service_client.ts.baseline | 6 +- .../src/v1beta1/testing_client.ts.baseline | 16 +-- .../src/v1beta1/echo_client.ts.baseline | 20 +-- .../src/v1beta1/messaging_client.ts.baseline | 20 +-- .../esm/src/v2/dlp_service_client.ts.baseline | 62 ++++----- .../key_management_service_client.ts.baseline | 46 +++---- .../v2/config_service_v2_client.ts.baseline | 70 +++++----- .../v2/logging_service_v2_client.ts.baseline | 10 +- .../v2/metrics_service_v2_client.ts.baseline | 10 +- .../v2/config_service_v2_client.ts.baseline | 20 +-- .../alert_policy_service_client.ts.baseline | 10 +- .../src/v3/group_service_client.ts.baseline | 12 +- .../src/v3/metric_service_client.ts.baseline | 16 +-- ...ication_channel_service_client.ts.baseline | 20 +-- ...vice_monitoring_service_client.ts.baseline | 20 +-- .../uptime_check_service_client.ts.baseline | 12 +- .../esm/src/v1beta1/naming_client.ts.baseline | 44 +++---- .../src/v1beta1/naming_client.ts.baseline | 20 +-- .../v1beta1/cloud_redis_client.ts.baseline | 124 +++++++++--------- .../v1beta1/cloud_redis_client.ts.baseline | 120 ++++++++--------- .../src/v1/test_service_client.ts.baseline | 6 +- .../src/v1beta1/compliance_client.ts.baseline | 20 +-- .../esm/src/v1beta1/echo_client.ts.baseline | 30 ++--- .../src/v1beta1/identity_client.ts.baseline | 10 +- .../src/v1beta1/messaging_client.ts.baseline | 40 +++--- .../sequence_service_client.ts.baseline | 6 +- .../src/v1beta1/testing_client.ts.baseline | 16 +-- .../esm/src/v1beta1/echo_client.ts.baseline | 30 ++--- .../src/v1beta1/echo_client.ts.baseline | 20 +-- .../src/v1beta1/echo_client.ts.baseline | 20 +-- .../src/v1beta1/messaging_client.ts.baseline | 20 +-- .../esm/src/v2/cloud_tasks_client.ts.baseline | 32 ++--- .../src/v1/text_to_speech_client.ts.baseline | 4 +- .../translation_service_client.ts.baseline | 70 +++++----- .../translation_service_client.ts.baseline | 60 ++++----- ...eo_intelligence_service_client.ts.baseline | 20 +-- ...eo_intelligence_service_client.ts.baseline | 20 +-- 55 files changed, 708 insertions(+), 712 deletions(-) diff --git a/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline b/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline index f374e98b5..5e7b48e77 100644 --- a/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline +++ b/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline @@ -481,7 +481,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('batchGetAssetsHistory response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.batchGetAssetsHistory(request, options, wrappedCallback) @@ -582,7 +582,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createFeed(request, options, wrappedCallback) @@ -672,7 +672,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getFeed(request, options, wrappedCallback) @@ -761,7 +761,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('listFeeds response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.listFeeds(request, options, wrappedCallback) @@ -856,7 +856,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateFeed(request, options, wrappedCallback) @@ -946,7 +946,7 @@ export class AssetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteFeed response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteFeed(request, options, wrappedCallback) @@ -1054,22 +1054,22 @@ export class AssetServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.asset.v1.IExportAssetsRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('exportAssets response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('exportAssets response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('exportAssets request %j', request); return this.innerApiCalls.exportAssets(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.asset.v1.IExportAssetsRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('exportAssets response %j', response); - return [response, options, rawResponse]; + this._log.info('exportAssets response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/asset/src/v1/asset_service_client.ts.baseline b/baselines/asset/src/v1/asset_service_client.ts.baseline index 47fc717f0..b6ac32d33 100644 --- a/baselines/asset/src/v1/asset_service_client.ts.baseline +++ b/baselines/asset/src/v1/asset_service_client.ts.baseline @@ -1033,22 +1033,22 @@ export class AssetServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.asset.v1.IExportAssetsRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('exportAssets response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('exportAssets response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('exportAssets request %j', request); return this.innerApiCalls.exportAssets(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.asset.v1.IExportAssetsRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('exportAssets response %j', response); - return [response, options, rawResponse]; + this._log.info('exportAssets response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline b/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline index c797c4452..72da4a644 100644 --- a/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline +++ b/baselines/bigquery-storage-esm/esm/src/v1beta1/big_query_storage_client.ts.baseline @@ -474,7 +474,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createReadSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createReadSession(request, options, wrappedCallback) @@ -568,7 +568,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('batchCreateReadSessionStreams response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.batchCreateReadSessionStreams(request, options, wrappedCallback) @@ -668,7 +668,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('finalizeStream response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.finalizeStream(request, options, wrappedCallback) @@ -775,7 +775,7 @@ export class BigQueryStorageClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('splitReadStream response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.splitReadStream(request, options, wrappedCallback) diff --git a/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline index 30b8b0e17..1862af5f1 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/dataset_service_client.ts.baseline @@ -430,7 +430,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getDataset(request, options, wrappedCallback) @@ -519,7 +519,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.insertDataset(request, options, wrappedCallback) @@ -615,7 +615,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.patchDataset(request, options, wrappedCallback) @@ -710,7 +710,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateDataset(request, options, wrappedCallback) @@ -807,7 +807,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteDataset(request, options, wrappedCallback) @@ -903,7 +903,7 @@ export class DatasetServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('undeleteDataset response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.undeleteDataset(request, options, wrappedCallback) @@ -1017,7 +1017,7 @@ export class DatasetServiceClient { protos.google.cloud.bigquery.v2.IListFormatDataset>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listDatasets values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listDatasets request %j', request); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline index 042c37e7a..7f3e90194 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/job_service_client.ts.baseline @@ -443,7 +443,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('cancelJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.cancelJob(request, options, wrappedCallback) @@ -546,7 +546,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getJob(request, options, wrappedCallback) @@ -645,7 +645,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.insertJob(request, options, wrappedCallback) @@ -743,7 +743,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteJob(request, options, wrappedCallback) @@ -868,7 +868,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getQueryResults response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getQueryResults(request, options, wrappedCallback) @@ -958,7 +958,7 @@ export class JobServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('query response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.query(request, options, wrappedCallback) @@ -1080,7 +1080,7 @@ export class JobServiceClient { protos.google.cloud.bigquery.v2.IListFormatJob>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listJobs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listJobs request %j', request); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline index 6b7c4454d..bf3d1b04e 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/model_service_client.ts.baseline @@ -430,7 +430,7 @@ export class ModelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getModel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getModel(request, options, wrappedCallback) @@ -527,7 +527,7 @@ export class ModelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchModel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.patchModel(request, options, wrappedCallback) @@ -620,7 +620,7 @@ export class ModelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteModel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteModel(request, options, wrappedCallback) @@ -728,7 +728,7 @@ export class ModelServiceClient { protos.google.cloud.bigquery.v2.IModel>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listModels values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listModels request %j', request); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline index 11a03c153..9e2b1631b 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/project_service_client.ts.baseline @@ -416,7 +416,7 @@ export class ProjectServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getServiceAccount response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getServiceAccount(request, options, wrappedCallback) diff --git a/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline index be8845494..398bd9fdc 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/routine_service_client.ts.baseline @@ -430,7 +430,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getRoutine(request, options, wrappedCallback) @@ -522,7 +522,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.insertRoutine(request, options, wrappedCallback) @@ -618,7 +618,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateRoutine(request, options, wrappedCallback) @@ -712,7 +712,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.patchRoutine(request, options, wrappedCallback) @@ -805,7 +805,7 @@ export class RoutineServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteRoutine response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteRoutine(request, options, wrappedCallback) @@ -916,7 +916,7 @@ export class RoutineServiceClient { protos.google.cloud.bigquery.v2.IRoutine>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRoutines values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listRoutines request %j', request); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline index 85300121b..1d8c04858 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/row_access_policy_service_client.ts.baseline @@ -438,7 +438,7 @@ export class RowAccessPolicyServiceClient { protos.google.cloud.bigquery.v2.IRowAccessPolicy>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRowAccessPolicies values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listRowAccessPolicies request %j', request); diff --git a/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline b/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline index 582afce99..8deaa3d75 100644 --- a/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline +++ b/baselines/bigquery-v2-esm/esm/src/v2/table_service_client.ts.baseline @@ -443,7 +443,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getTable(request, options, wrappedCallback) @@ -535,7 +535,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('insertTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.insertTable(request, options, wrappedCallback) @@ -635,7 +635,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('patchTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.patchTable(request, options, wrappedCallback) @@ -734,7 +734,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateTable(request, options, wrappedCallback) @@ -828,7 +828,7 @@ export class TableServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTable response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteTable(request, options, wrappedCallback) @@ -935,7 +935,7 @@ export class TableServiceClient { protos.google.cloud.bigquery.v2.IListFormatTable>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTables values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listTables request %j', request); diff --git a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline index b97a57dde..8e0148b4e 100644 --- a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline +++ b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline @@ -440,21 +440,20 @@ export class AddressesClient { this.initialize(); this._log.info('delete request %j', request); const wrappedCallback: Callback< - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation>|undefined = callback - ? (error, response, nextRequest, rawResponse) => { - this._log.info('delete response %j', response); - callback(error, response, nextRequest, rawResponse); + LROperation, + protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback + ? (error, response, rawResponse, _) => { + this._log.info('delete response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; return this.innerApiCalls.delete(request, options, wrappedCallback) - ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - this._log.info('delete response %j', response); + ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + this._log.info('delete response %j', rawResponse); return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + response, + rawResponse, + _ ]; }); } @@ -544,21 +543,20 @@ export class AddressesClient { this.initialize(); this._log.info('insert request %j', request); const wrappedCallback: Callback< - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation>|undefined = callback - ? (error, response, nextRequest, rawResponse) => { - this._log.info('insert response %j', response); - callback(error, response, nextRequest, rawResponse); + LROperation, + protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback + ? (error, response, rawResponse, _) => { + this._log.info('insert response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; return this.innerApiCalls.insert(request, options, wrappedCallback) - ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - this._log.info('insert response %j', response); + ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + this._log.info('insert response %j', rawResponse); return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + response, + rawResponse, + _ ]; }); } @@ -727,7 +725,7 @@ export class AddressesClient { protos.google.cloud.compute.v1.IAddress>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('list values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('list request %j', request); diff --git a/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline b/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline index f4c5b2a6c..701e5d349 100644 --- a/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline +++ b/baselines/compute-esm/esm/src/v1/region_operations_client.ts.baseline @@ -421,7 +421,7 @@ export class RegionOperationsClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('get response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.get(request, options, wrappedCallback) @@ -518,7 +518,7 @@ export class RegionOperationsClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.wait(request, options, wrappedCallback) diff --git a/baselines/compute/src/v1/addresses_client.ts.baseline b/baselines/compute/src/v1/addresses_client.ts.baseline index 56cb71071..7f72c2c55 100644 --- a/baselines/compute/src/v1/addresses_client.ts.baseline +++ b/baselines/compute/src/v1/addresses_client.ts.baseline @@ -419,21 +419,20 @@ export class AddressesClient { this.initialize(); this._log.info('delete request %j', request); const wrappedCallback: Callback< - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation>|undefined = callback - ? (error, response, nextRequest, rawResponse) => { - this._log.info('delete response %j', response); - callback!(error, response, nextRequest, rawResponse); // We verified callback above. + LROperation, + protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback + ? (error, response, rawResponse, _) => { + this._log.info('delete response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; return this.innerApiCalls.delete(request, options, wrappedCallback) - ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - this._log.info('delete response %j', response); + ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + this._log.info('delete response %j', rawResponse); return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + response, + rawResponse, + _ ]; }); } @@ -523,21 +522,20 @@ export class AddressesClient { this.initialize(); this._log.info('insert request %j', request); const wrappedCallback: Callback< - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IOperation>|undefined = callback - ? (error, response, nextRequest, rawResponse) => { - this._log.info('insert response %j', response); - callback!(error, response, nextRequest, rawResponse); // We verified callback above. + LROperation, + protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback + ? (error, response, rawResponse, _) => { + this._log.info('insert response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; return this.innerApiCalls.insert(request, options, wrappedCallback) - ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { - this._log.info('insert response %j', response); + ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + this._log.info('insert response %j', rawResponse); return [ - { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, - operation, - rawResponse + response, + rawResponse, + _ ]; }); } diff --git a/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline b/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline index cc2bb8264..7e6cc0fcf 100644 --- a/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline +++ b/baselines/deprecatedtest-esm/esm/src/v1/deprecated_service_client.ts.baseline @@ -409,7 +409,7 @@ export class DeprecatedServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('fastFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) @@ -493,7 +493,7 @@ export class DeprecatedServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('slowFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline index d87110e66..3bd9e846b 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/compliance_client.ts.baseline @@ -459,7 +459,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBody response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) @@ -556,7 +556,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyInfo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) @@ -652,7 +652,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataQuery response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) @@ -758,7 +758,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataSimplePath response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) @@ -860,7 +860,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) @@ -961,7 +961,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathTrailingResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) @@ -1056,7 +1056,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPut response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) @@ -1151,7 +1151,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPatch response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) @@ -1238,7 +1238,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getEnum(request, options, wrappedCallback) @@ -1327,7 +1327,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline index f8bcc1d52..fbab8e93c 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -597,7 +597,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.echo(request, options, wrappedCallback) @@ -688,7 +688,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echoErrorDetails response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) @@ -778,7 +778,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pagedExpandLegacy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) @@ -867,7 +867,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('block response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.block(request, options, wrappedCallback) @@ -1059,22 +1059,22 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('wait response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('wait request %j', request); return this.innerApiCalls.wait(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('wait response %j', response); - return [response, options, rawResponse]; + this._log.info('wait response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1174,7 +1174,7 @@ export class EchoClient { protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('pagedExpand values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('pagedExpand request %j', request); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline index 48806c2b1..e6bf3242f 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/identity_client.ts.baseline @@ -452,7 +452,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createUser(request, options, wrappedCallback) @@ -539,7 +539,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getUser(request, options, wrappedCallback) @@ -629,7 +629,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateUser(request, options, wrappedCallback) @@ -716,7 +716,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteUser(request, options, wrappedCallback) @@ -808,7 +808,7 @@ export class IdentityClient { protos.google.showcase.v1beta1.IUser>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUsers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listUsers request %j', request); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline index 71fe68842..a531a6848 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline @@ -500,7 +500,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createRoom(request, options, wrappedCallback) @@ -587,7 +587,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getRoom(request, options, wrappedCallback) @@ -677,7 +677,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateRoom(request, options, wrappedCallback) @@ -764,7 +764,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) @@ -856,7 +856,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createBlurb(request, options, wrappedCallback) @@ -943,7 +943,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getBlurb(request, options, wrappedCallback) @@ -1033,7 +1033,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) @@ -1120,7 +1120,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) @@ -1327,22 +1327,22 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('searchBlurbs response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('searchBlurbs response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('searchBlurbs request %j', request); return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('searchBlurbs response %j', response); - return [response, options, rawResponse]; + this._log.info('searchBlurbs response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1442,7 +1442,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IRoom>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRooms values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listRooms request %j', request); @@ -1630,7 +1630,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IBlurb>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listBlurbs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listBlurbs request %j', request); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline index d698bb3c2..eb1b264c0 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/sequence_service_client.ts.baseline @@ -441,7 +441,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createSequence(request, options, wrappedCallback) @@ -527,7 +527,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSequenceReport response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) @@ -613,7 +613,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('attemptSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline index ab0852fac..243cea8c8 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/testing_client.ts.baseline @@ -457,7 +457,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createSession(request, options, wrappedCallback) @@ -544,7 +544,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getSession(request, options, wrappedCallback) @@ -631,7 +631,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteSession(request, options, wrappedCallback) @@ -720,7 +720,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('reportSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.reportSession(request, options, wrappedCallback) @@ -812,7 +812,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteTest(request, options, wrappedCallback) @@ -906,7 +906,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.verifyTest(request, options, wrappedCallback) @@ -995,7 +995,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ISession>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listSessions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listSessions request %j', request); @@ -1172,7 +1172,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ITest>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTests values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listTests request %j', request); diff --git a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline index 5a6175bb9..6df36d79e 100644 --- a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline @@ -1038,22 +1038,22 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('wait response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('wait response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('wait request %j', request); return this.innerApiCalls.wait(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('wait response %j', response); - return [response, options, rawResponse]; + this._log.info('wait response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline index 82971c8db..ea9ea65a2 100644 --- a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline @@ -1306,22 +1306,22 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('searchBlurbs response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('searchBlurbs response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('searchBlurbs request %j', request); return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('searchBlurbs response %j', response); - return [response, options, rawResponse]; + this._log.info('searchBlurbs response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline b/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline index 76ad18edf..d7a47b980 100644 --- a/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline +++ b/baselines/dlp-esm/esm/src/v2/dlp_service_client.ts.baseline @@ -495,7 +495,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('inspectContent response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.inspectContent(request, options, wrappedCallback) @@ -602,7 +602,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('redactImage response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.redactImage(request, options, wrappedCallback) @@ -722,7 +722,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deidentifyContent response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deidentifyContent(request, options, wrappedCallback) @@ -844,7 +844,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('reidentifyContent response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.reidentifyContent(request, options, wrappedCallback) @@ -941,7 +941,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('listInfoTypes response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.listInfoTypes(request, options, wrappedCallback) @@ -1042,7 +1042,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createInspectTemplate(request, options, wrappedCallback) @@ -1136,7 +1136,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateInspectTemplate(request, options, wrappedCallback) @@ -1226,7 +1226,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getInspectTemplate(request, options, wrappedCallback) @@ -1316,7 +1316,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteInspectTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteInspectTemplate(request, options, wrappedCallback) @@ -1418,7 +1418,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createDeidentifyTemplate(request, options, wrappedCallback) @@ -1513,7 +1513,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateDeidentifyTemplate(request, options, wrappedCallback) @@ -1604,7 +1604,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getDeidentifyTemplate(request, options, wrappedCallback) @@ -1695,7 +1695,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteDeidentifyTemplate response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteDeidentifyTemplate(request, options, wrappedCallback) @@ -1795,7 +1795,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createJobTrigger(request, options, wrappedCallback) @@ -1888,7 +1888,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateJobTrigger(request, options, wrappedCallback) @@ -1977,7 +1977,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getJobTrigger(request, options, wrappedCallback) @@ -2066,7 +2066,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteJobTrigger(request, options, wrappedCallback) @@ -2155,7 +2155,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('activateJobTrigger response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.activateJobTrigger(request, options, wrappedCallback) @@ -2261,7 +2261,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createDlpJob(request, options, wrappedCallback) @@ -2350,7 +2350,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getDlpJob(request, options, wrappedCallback) @@ -2441,7 +2441,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteDlpJob(request, options, wrappedCallback) @@ -2532,7 +2532,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('cancelDlpJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.cancelDlpJob(request, options, wrappedCallback) @@ -2633,7 +2633,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createStoredInfoType(request, options, wrappedCallback) @@ -2731,7 +2731,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateStoredInfoType(request, options, wrappedCallback) @@ -2822,7 +2822,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getStoredInfoType(request, options, wrappedCallback) @@ -2913,7 +2913,7 @@ export class DlpServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteStoredInfoType response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteStoredInfoType(request, options, wrappedCallback) @@ -3031,7 +3031,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IInspectTemplate>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listInspectTemplates values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listInspectTemplates request %j', request); @@ -3287,7 +3287,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IDeidentifyTemplate>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listDeidentifyTemplates values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listDeidentifyTemplates request %j', request); @@ -3568,7 +3568,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IJobTrigger>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listJobTriggers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listJobTriggers request %j', request); @@ -3904,7 +3904,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IDlpJob>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listDlpJobs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listDlpJobs request %j', request); @@ -4217,7 +4217,7 @@ export class DlpServiceClient { protos.google.privacy.dlp.v2.IStoredInfoType>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listStoredInfoTypes values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listStoredInfoTypes request %j', request); diff --git a/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline b/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline index ccf2a8311..b0f8981fb 100644 --- a/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline +++ b/baselines/kms-esm/esm/src/v1/key_management_service_client.ts.baseline @@ -439,7 +439,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getKeyRing response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getKeyRing(request, options, wrappedCallback) @@ -527,7 +527,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getCryptoKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getCryptoKey(request, options, wrappedCallback) @@ -614,7 +614,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getCryptoKeyVersion(request, options, wrappedCallback) @@ -705,7 +705,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getPublicKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getPublicKey(request, options, wrappedCallback) @@ -792,7 +792,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getImportJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getImportJob(request, options, wrappedCallback) @@ -885,7 +885,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createKeyRing response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createKeyRing(request, options, wrappedCallback) @@ -988,7 +988,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createCryptoKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createCryptoKey(request, options, wrappedCallback) @@ -1082,7 +1082,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createCryptoKeyVersion(request, options, wrappedCallback) @@ -1201,7 +1201,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('importCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.importCryptoKeyVersion(request, options, wrappedCallback) @@ -1296,7 +1296,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createImportJob response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createImportJob(request, options, wrappedCallback) @@ -1385,7 +1385,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCryptoKey response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateCryptoKey(request, options, wrappedCallback) @@ -1480,7 +1480,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateCryptoKeyVersion(request, options, wrappedCallback) @@ -1592,7 +1592,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('encrypt response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.encrypt(request, options, wrappedCallback) @@ -1687,7 +1687,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('decrypt response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.decrypt(request, options, wrappedCallback) @@ -1780,7 +1780,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('asymmetricSign response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.asymmetricSign(request, options, wrappedCallback) @@ -1873,7 +1873,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('asymmetricDecrypt response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.asymmetricDecrypt(request, options, wrappedCallback) @@ -1964,7 +1964,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCryptoKeyPrimaryVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateCryptoKeyPrimaryVersion(request, options, wrappedCallback) @@ -2062,7 +2062,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('destroyCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.destroyCryptoKeyVersion(request, options, wrappedCallback) @@ -2155,7 +2155,7 @@ export class KeyManagementServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('restoreCryptoKeyVersion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.restoreCryptoKeyVersion(request, options, wrappedCallback) @@ -2261,7 +2261,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.IKeyRing>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listKeyRings values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listKeyRings request %j', request); @@ -2484,7 +2484,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.ICryptoKey>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listCryptoKeys values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listCryptoKeys request %j', request); @@ -2712,7 +2712,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.ICryptoKeyVersion>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listCryptoKeyVersions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listCryptoKeyVersions request %j', request); @@ -2939,7 +2939,7 @@ export class KeyManagementServiceClient { protos.google.cloud.kms.v1.IImportJob>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listImportJobs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listImportJobs request %j', request); diff --git a/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline b/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline index 5f7f65576..000eb69ae 100644 --- a/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline @@ -564,7 +564,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getBucket(request, options, wrappedCallback) @@ -666,7 +666,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createBucket(request, options, wrappedCallback) @@ -782,7 +782,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateBucket(request, options, wrappedCallback) @@ -882,7 +882,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteBucket(request, options, wrappedCallback) @@ -979,7 +979,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('undeleteBucket response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.undeleteBucket(request, options, wrappedCallback) @@ -1072,7 +1072,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getView(request, options, wrappedCallback) @@ -1170,7 +1170,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createView(request, options, wrappedCallback) @@ -1278,7 +1278,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateView(request, options, wrappedCallback) @@ -1374,7 +1374,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteView response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteView(request, options, wrappedCallback) @@ -1470,7 +1470,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getSink(request, options, wrappedCallback) @@ -1585,7 +1585,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createSink(request, options, wrappedCallback) @@ -1718,7 +1718,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateSink(request, options, wrappedCallback) @@ -1816,7 +1816,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteSink response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteSink(request, options, wrappedCallback) @@ -1912,7 +1912,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getExclusion(request, options, wrappedCallback) @@ -2014,7 +2014,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createExclusion(request, options, wrappedCallback) @@ -2122,7 +2122,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateExclusion(request, options, wrappedCallback) @@ -2218,7 +2218,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteExclusion response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteExclusion(request, options, wrappedCallback) @@ -2328,7 +2328,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getCmekSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getCmekSettings(request, options, wrappedCallback) @@ -2456,7 +2456,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateCmekSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateCmekSettings(request, options, wrappedCallback) @@ -2566,7 +2566,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getSettings(request, options, wrappedCallback) @@ -2692,7 +2692,7 @@ export class ConfigServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateSettings response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateSettings(request, options, wrappedCallback) @@ -2780,22 +2780,22 @@ export class ConfigServiceV2Client { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.logging.v2.ICopyLogEntriesRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('copyLogEntries response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('copyLogEntries response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('copyLogEntries request %j', request); return this.innerApiCalls.copyLogEntries(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.logging.v2.ICopyLogEntriesRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('copyLogEntries response %j', response); - return [response, options, rawResponse]; + this._log.info('copyLogEntries response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -2913,7 +2913,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogBucket>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listBuckets values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listBuckets request %j', request); @@ -3140,7 +3140,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogView>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listViews values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listViews request %j', request); @@ -3357,7 +3357,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogSink>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listSinks values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listSinks request %j', request); @@ -3578,7 +3578,7 @@ export class ConfigServiceV2Client { protos.google.logging.v2.ILogExclusion>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listExclusions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listExclusions request %j', request); diff --git a/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline index 6a7c69cd4..45126d890 100644 --- a/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline +++ b/baselines/logging-esm/esm/src/v2/logging_service_v2_client.ts.baseline @@ -570,7 +570,7 @@ export class LoggingServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteLog response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteLog(request, options, wrappedCallback) @@ -723,7 +723,7 @@ export class LoggingServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('writeLogEntries response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.writeLogEntries(request, options, wrappedCallback) @@ -876,7 +876,7 @@ export class LoggingServiceV2Client { protos.google.logging.v2.ILogEntry>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listLogEntries values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listLogEntries request %j', request); @@ -1127,7 +1127,7 @@ export class LoggingServiceV2Client { protos.google.api.IMonitoredResourceDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listMonitoredResourceDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listMonitoredResourceDescriptors request %j', request); @@ -1339,7 +1339,7 @@ export class LoggingServiceV2Client { string>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listLogs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listLogs request %j', request); diff --git a/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline b/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline index f9580afc8..8d1e79042 100644 --- a/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline +++ b/baselines/logging-esm/esm/src/v2/metrics_service_v2_client.ts.baseline @@ -522,7 +522,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getLogMetric(request, options, wrappedCallback) @@ -616,7 +616,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createLogMetric(request, options, wrappedCallback) @@ -711,7 +711,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateLogMetric(request, options, wrappedCallback) @@ -800,7 +800,7 @@ export class MetricsServiceV2Client { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteLogMetric response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteLogMetric(request, options, wrappedCallback) @@ -903,7 +903,7 @@ export class MetricsServiceV2Client { protos.google.logging.v2.ILogMetric>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listLogMetrics values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listLogMetrics request %j', request); diff --git a/baselines/logging/src/v2/config_service_v2_client.ts.baseline b/baselines/logging/src/v2/config_service_v2_client.ts.baseline index b88f1f30e..27fcae065 100644 --- a/baselines/logging/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/config_service_v2_client.ts.baseline @@ -2759,22 +2759,22 @@ export class ConfigServiceV2Client { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.logging.v2.ICopyLogEntriesRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('copyLogEntries response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('copyLogEntries response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('copyLogEntries request %j', request); return this.innerApiCalls.copyLogEntries(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.logging.v2.ICopyLogEntriesRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('copyLogEntries response %j', response); - return [response, options, rawResponse]; + this._log.info('copyLogEntries response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline index eef803d86..494ae5b55 100644 --- a/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/alert_policy_service_client.ts.baseline @@ -510,7 +510,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getAlertPolicy(request, options, wrappedCallback) @@ -608,7 +608,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createAlertPolicy(request, options, wrappedCallback) @@ -699,7 +699,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteAlertPolicy(request, options, wrappedCallback) @@ -814,7 +814,7 @@ export class AlertPolicyServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateAlertPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateAlertPolicy(request, options, wrappedCallback) @@ -933,7 +933,7 @@ export class AlertPolicyServiceClient { protos.google.monitoring.v3.IAlertPolicy>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listAlertPolicies values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listAlertPolicies request %j', request); diff --git a/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline index c18f7c156..c2d5345dd 100644 --- a/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/group_service_client.ts.baseline @@ -514,7 +514,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getGroup(request, options, wrappedCallback) @@ -607,7 +607,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createGroup(request, options, wrappedCallback) @@ -698,7 +698,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateGroup(request, options, wrappedCallback) @@ -790,7 +790,7 @@ export class GroupServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteGroup response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteGroup(request, options, wrappedCallback) @@ -904,7 +904,7 @@ export class GroupServiceClient { protos.google.monitoring.v3.IGroup>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listGroups values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listGroups request %j', request); @@ -1147,7 +1147,7 @@ export class GroupServiceClient { protos.google.api.IMonitoredResource>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listGroupMembers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listGroupMembers request %j', request); diff --git a/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline index 0c31469db..66ee3c11a 100644 --- a/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/metric_service_client.ts.baseline @@ -527,7 +527,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getMonitoredResourceDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getMonitoredResourceDescriptor(request, options, wrappedCallback) @@ -617,7 +617,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getMetricDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getMetricDescriptor(request, options, wrappedCallback) @@ -710,7 +710,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createMetricDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createMetricDescriptor(request, options, wrappedCallback) @@ -801,7 +801,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteMetricDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteMetricDescriptor(request, options, wrappedCallback) @@ -900,7 +900,7 @@ export class MetricServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createTimeSeries response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createTimeSeries(request, options, wrappedCallback) @@ -1007,7 +1007,7 @@ export class MetricServiceClient { protos.google.api.IMonitoredResourceDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listMonitoredResourceDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listMonitoredResourceDescriptors request %j', request); @@ -1232,7 +1232,7 @@ export class MetricServiceClient { protos.google.api.IMetricDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listMetricDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listMetricDescriptors request %j', request); @@ -1477,7 +1477,7 @@ export class MetricServiceClient { protos.google.monitoring.v3.ITimeSeries>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTimeSeries values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listTimeSeries request %j', request); diff --git a/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline index 7e067ea2b..cf538204a 100644 --- a/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/notification_channel_service_client.ts.baseline @@ -505,7 +505,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getNotificationChannelDescriptor response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getNotificationChannelDescriptor(request, options, wrappedCallback) @@ -597,7 +597,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getNotificationChannel(request, options, wrappedCallback) @@ -694,7 +694,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createNotificationChannel(request, options, wrappedCallback) @@ -787,7 +787,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateNotificationChannel(request, options, wrappedCallback) @@ -880,7 +880,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteNotificationChannel(request, options, wrappedCallback) @@ -968,7 +968,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('sendNotificationChannelVerificationCode response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.sendNotificationChannelVerificationCode(request, options, wrappedCallback) @@ -1087,7 +1087,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getNotificationChannelVerificationCode response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getNotificationChannelVerificationCode(request, options, wrappedCallback) @@ -1184,7 +1184,7 @@ export class NotificationChannelServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyNotificationChannel response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.verifyNotificationChannel(request, options, wrappedCallback) @@ -1293,7 +1293,7 @@ export class NotificationChannelServiceClient { protos.google.monitoring.v3.INotificationChannelDescriptor>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listNotificationChannelDescriptors values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listNotificationChannelDescriptors request %j', request); @@ -1531,7 +1531,7 @@ export class NotificationChannelServiceClient { protos.google.monitoring.v3.INotificationChannel>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listNotificationChannels values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listNotificationChannels request %j', request); diff --git a/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline index 9126fd1bc..7b946373d 100644 --- a/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/service_monitoring_service_client.ts.baseline @@ -511,7 +511,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createService(request, options, wrappedCallback) @@ -599,7 +599,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getService(request, options, wrappedCallback) @@ -689,7 +689,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateService(request, options, wrappedCallback) @@ -777,7 +777,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteService response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteService(request, options, wrappedCallback) @@ -873,7 +873,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createServiceLevelObjective(request, options, wrappedCallback) @@ -967,7 +967,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getServiceLevelObjective(request, options, wrappedCallback) @@ -1057,7 +1057,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateServiceLevelObjective(request, options, wrappedCallback) @@ -1146,7 +1146,7 @@ export class ServiceMonitoringServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteServiceLevelObjective response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteServiceLevelObjective(request, options, wrappedCallback) @@ -1262,7 +1262,7 @@ export class ServiceMonitoringServiceClient { protos.google.monitoring.v3.IService>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listServices values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listServices request %j', request); @@ -1504,7 +1504,7 @@ export class ServiceMonitoringServiceClient { protos.google.monitoring.v3.IServiceLevelObjective>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listServiceLevelObjectives values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listServiceLevelObjectives request %j', request); diff --git a/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline b/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline index 0e6b3d85f..e17bfeafc 100644 --- a/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline +++ b/baselines/monitoring-esm/esm/src/v3/uptime_check_service_client.ts.baseline @@ -510,7 +510,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getUptimeCheckConfig(request, options, wrappedCallback) @@ -600,7 +600,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createUptimeCheckConfig(request, options, wrappedCallback) @@ -705,7 +705,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateUptimeCheckConfig(request, options, wrappedCallback) @@ -795,7 +795,7 @@ export class UptimeCheckServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteUptimeCheckConfig response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteUptimeCheckConfig(request, options, wrappedCallback) @@ -898,7 +898,7 @@ export class UptimeCheckServiceClient { protos.google.monitoring.v3.IUptimeCheckConfig>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUptimeCheckConfigs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listUptimeCheckConfigs request %j', request); @@ -1101,7 +1101,7 @@ export class UptimeCheckServiceClient { protos.google.monitoring.v3.IUptimeCheckIp>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUptimeCheckIps values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listUptimeCheckIps request %j', request); diff --git a/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline b/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline index fa12d1499..de2bd3e10 100644 --- a/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline +++ b/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline @@ -449,7 +449,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('paginatedMethodStream response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.paginatedMethodStream(request, options, wrappedCallback) @@ -528,7 +528,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('paginatedMethodAsync response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.paginatedMethodAsync(request, options, wrappedCallback) @@ -607,7 +607,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('checkLongRunningProgress response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.checkLongRunningProgress(request, options, wrappedCallback) @@ -687,7 +687,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('initialize response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.initialize(request, options, wrappedCallback) @@ -766,7 +766,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('servicePath response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.servicePath(request, options, wrappedCallback) @@ -845,7 +845,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('apiEndpoint response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.apiEndpoint(request, options, wrappedCallback) @@ -924,7 +924,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('port response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.port(request, options, wrappedCallback) @@ -1003,7 +1003,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('scopes response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.scopes(request, options, wrappedCallback) @@ -1082,7 +1082,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getProjectId response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getProjectId(request, options, wrappedCallback) @@ -1162,7 +1162,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getReservedWord response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getReservedWord(request, options, wrappedCallback) @@ -1241,7 +1241,7 @@ export class NamingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createABCDESomething response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createAbcdeSomething(request, options, wrappedCallback) @@ -1318,22 +1318,22 @@ export class NamingClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.protobuf.IEmpty|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('longRunning response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('longRunning response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('longRunning request %j', request); return this.innerApiCalls.longRunning(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.protobuf.IEmpty|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('longRunning response %j', response); - return [response, options, rawResponse]; + this._log.info('longRunning response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1430,7 +1430,7 @@ export class NamingClient { protos.google.protobuf.IEmpty>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('paginatedMethod values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('paginatedMethod request %j', request); diff --git a/baselines/naming/src/v1beta1/naming_client.ts.baseline b/baselines/naming/src/v1beta1/naming_client.ts.baseline index 65ef66245..8204a3104 100644 --- a/baselines/naming/src/v1beta1/naming_client.ts.baseline +++ b/baselines/naming/src/v1beta1/naming_client.ts.baseline @@ -1297,22 +1297,22 @@ export class NamingClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.protobuf.IEmpty|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('longRunning response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('longRunning response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('longRunning request %j', request); return this.innerApiCalls.longRunning(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.protobuf.IEmpty|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('longRunning response %j', response); - return [response, options, rawResponse]; + this._log.info('longRunning response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline index 4b6076ea5..7c38dc214 100644 --- a/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline @@ -515,7 +515,7 @@ export class CloudRedisClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getInstance response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getInstance(request, options, wrappedCallback) @@ -623,22 +623,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('createInstance response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('createInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('createInstance request %j', request); return this.innerApiCalls.createInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('createInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('createInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -744,22 +744,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('updateInstance response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('updateInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('updateInstance request %j', request); return this.innerApiCalls.updateInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('updateInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('updateInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -862,22 +862,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IImportInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('importInstance response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('importInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('importInstance request %j', request); return this.innerApiCalls.importInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IImportInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('importInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('importInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -978,22 +978,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IExportInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('exportInstance response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('exportInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('exportInstance request %j', request); return this.innerApiCalls.exportInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IExportInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('exportInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('exportInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1091,22 +1091,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('failoverInstance response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('failoverInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('failoverInstance request %j', request); return this.innerApiCalls.failoverInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('failoverInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('failoverInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1201,22 +1201,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('deleteInstance response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('deleteInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('deleteInstance request %j', request); return this.innerApiCalls.deleteInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('deleteInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('deleteInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1336,7 +1336,7 @@ export class CloudRedisClient { protos.google.cloud.redis.v1beta1.IInstance>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listInstances values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listInstances request %j', request); diff --git a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline index 3573639fa..13d9f5a9e 100644 --- a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline @@ -602,22 +602,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('createInstance response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('createInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('createInstance request %j', request); return this.innerApiCalls.createInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.ICreateInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('createInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('createInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -723,22 +723,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('updateInstance response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('updateInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('updateInstance request %j', request); return this.innerApiCalls.updateInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IUpdateInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('updateInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('updateInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -841,22 +841,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IImportInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('importInstance response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('importInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('importInstance request %j', request); return this.innerApiCalls.importInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IImportInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('importInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('importInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -957,22 +957,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IExportInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('exportInstance response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('exportInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('exportInstance request %j', request); return this.innerApiCalls.exportInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IExportInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('exportInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('exportInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1070,22 +1070,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('failoverInstance response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('failoverInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('failoverInstance request %j', request); return this.innerApiCalls.failoverInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IFailoverInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('failoverInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('failoverInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1180,22 +1180,22 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('deleteInstance response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('deleteInstance response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('deleteInstance request %j', request); return this.innerApiCalls.deleteInstance(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.redis.v1beta1.IDeleteInstanceRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('deleteInstance response %j', response); - return [response, options, rawResponse]; + this._log.info('deleteInstance response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline b/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline index 97289d166..d280d103c 100644 --- a/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline +++ b/baselines/routingtest-esm/esm/src/v1/test_service_client.ts.baseline @@ -428,7 +428,7 @@ export class TestServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('fastFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) @@ -542,7 +542,7 @@ export class TestServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('randomFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.randomFibonacci(request, options, wrappedCallback) @@ -666,7 +666,7 @@ export class TestServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('slowFibonacci response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) diff --git a/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline index 722588041..a0b3cedc9 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/compliance_client.ts.baseline @@ -462,7 +462,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBody response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) @@ -559,7 +559,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyInfo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) @@ -655,7 +655,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataQuery response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) @@ -761,7 +761,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataSimplePath response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) @@ -863,7 +863,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) @@ -964,7 +964,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataPathTrailingResource response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) @@ -1059,7 +1059,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPut response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) @@ -1154,7 +1154,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('repeatDataBodyPatch response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) @@ -1241,7 +1241,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getEnum(request, options, wrappedCallback) @@ -1330,7 +1330,7 @@ export class ComplianceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyEnum response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) diff --git a/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline index 8b36475be..4ca7fe74f 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -606,7 +606,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.echo(request, options, wrappedCallback) @@ -697,7 +697,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echoErrorDetails response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) @@ -787,7 +787,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pagedExpandLegacy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) @@ -876,7 +876,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('block response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.block(request, options, wrappedCallback) @@ -1068,22 +1068,22 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('wait response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('wait request %j', request); return this.innerApiCalls.wait(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('wait response %j', response); - return [response, options, rawResponse]; + this._log.info('wait response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1183,7 +1183,7 @@ export class EchoClient { protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('pagedExpand values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('pagedExpand request %j', request); diff --git a/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline index 8a15c77fb..013359852 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/identity_client.ts.baseline @@ -455,7 +455,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createUser(request, options, wrappedCallback) @@ -542,7 +542,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getUser(request, options, wrappedCallback) @@ -632,7 +632,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateUser(request, options, wrappedCallback) @@ -719,7 +719,7 @@ export class IdentityClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteUser response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteUser(request, options, wrappedCallback) @@ -811,7 +811,7 @@ export class IdentityClient { protos.google.showcase.v1beta1.IUser>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listUsers values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listUsers request %j', request); diff --git a/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline index 6053b9088..521de792a 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline @@ -506,7 +506,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createRoom(request, options, wrappedCallback) @@ -593,7 +593,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getRoom(request, options, wrappedCallback) @@ -683,7 +683,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateRoom(request, options, wrappedCallback) @@ -770,7 +770,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteRoom response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) @@ -862,7 +862,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createBlurb(request, options, wrappedCallback) @@ -949,7 +949,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getBlurb(request, options, wrappedCallback) @@ -1039,7 +1039,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) @@ -1126,7 +1126,7 @@ export class MessagingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteBlurb response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) @@ -1333,22 +1333,22 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('searchBlurbs response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('searchBlurbs response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('searchBlurbs request %j', request); return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('searchBlurbs response %j', response); - return [response, options, rawResponse]; + this._log.info('searchBlurbs response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1448,7 +1448,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IRoom>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listRooms values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listRooms request %j', request); @@ -1636,7 +1636,7 @@ export class MessagingClient { protos.google.showcase.v1beta1.IBlurb>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listBlurbs values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listBlurbs request %j', request); diff --git a/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline index 2066e333c..f339a69db 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/sequence_service_client.ts.baseline @@ -444,7 +444,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createSequence(request, options, wrappedCallback) @@ -530,7 +530,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSequenceReport response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) @@ -616,7 +616,7 @@ export class SequenceServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('attemptSequence response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) diff --git a/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline index 193ec8f42..a1969a060 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/testing_client.ts.baseline @@ -460,7 +460,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createSession(request, options, wrappedCallback) @@ -547,7 +547,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getSession(request, options, wrappedCallback) @@ -634,7 +634,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteSession(request, options, wrappedCallback) @@ -723,7 +723,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('reportSession response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.reportSession(request, options, wrappedCallback) @@ -815,7 +815,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteTest(request, options, wrappedCallback) @@ -909,7 +909,7 @@ export class TestingClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('verifyTest response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.verifyTest(request, options, wrappedCallback) @@ -998,7 +998,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ISession>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listSessions values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listSessions request %j', request); @@ -1175,7 +1175,7 @@ export class TestingClient { protos.google.showcase.v1beta1.ITest>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTests values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listTests request %j', request); diff --git a/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline index 3db923003..fb548b705 100644 --- a/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -531,7 +531,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echo response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.echo(request, options, wrappedCallback) @@ -622,7 +622,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('echoErrorDetails response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) @@ -712,7 +712,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pagedExpandLegacy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) @@ -801,7 +801,7 @@ export class EchoClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('block response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.block(request, options, wrappedCallback) @@ -993,22 +993,22 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('wait response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('wait response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('wait request %j', request); return this.innerApiCalls.wait(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('wait response %j', response); - return [response, options, rawResponse]; + this._log.info('wait response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1108,7 +1108,7 @@ export class EchoClient { protos.google.showcase.v1beta1.IEchoResponse>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('pagedExpand values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('pagedExpand request %j', request); diff --git a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline index 922912357..816e18659 100644 --- a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline @@ -977,22 +977,22 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('wait response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('wait response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('wait request %j', request); return this.innerApiCalls.wait(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('wait response %j', response); - return [response, options, rawResponse]; + this._log.info('wait response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/showcase/src/v1beta1/echo_client.ts.baseline b/baselines/showcase/src/v1beta1/echo_client.ts.baseline index 7c8aa86d3..0c5ec8baf 100644 --- a/baselines/showcase/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/echo_client.ts.baseline @@ -1047,22 +1047,22 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('wait response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('wait response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('wait request %j', request); return this.innerApiCalls.wait(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.IWaitRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('wait response %j', response); - return [response, options, rawResponse]; + this._log.info('wait response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline index fc085f268..42e28391e 100644 --- a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline @@ -1312,22 +1312,22 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('searchBlurbs response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('searchBlurbs response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('searchBlurbs request %j', request); return this.innerApiCalls.searchBlurbs(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.showcase.v1beta1.ISearchBlurbsRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('searchBlurbs response %j', response); - return [response, options, rawResponse]; + this._log.info('searchBlurbs response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline b/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline index 8845d3800..58f3bb790 100644 --- a/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline +++ b/baselines/tasks-esm/esm/src/v2/cloud_tasks_client.ts.baseline @@ -436,7 +436,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getQueue(request, options, wrappedCallback) @@ -543,7 +543,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createQueue(request, options, wrappedCallback) @@ -654,7 +654,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('updateQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.updateQueue(request, options, wrappedCallback) @@ -754,7 +754,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteQueue(request, options, wrappedCallback) @@ -847,7 +847,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('purgeQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.purgeQueue(request, options, wrappedCallback) @@ -941,7 +941,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('pauseQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.pauseQueue(request, options, wrappedCallback) @@ -1041,7 +1041,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('resumeQueue response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.resumeQueue(request, options, wrappedCallback) @@ -1140,7 +1140,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getIamPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getIamPolicy(request, options, wrappedCallback) @@ -1243,7 +1243,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('setIamPolicy response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.setIamPolicy(request, options, wrappedCallback) @@ -1342,7 +1342,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('testIamPermissions response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.testIamPermissions(request, options, wrappedCallback) @@ -1443,7 +1443,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getTask(request, options, wrappedCallback) @@ -1584,7 +1584,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('createTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.createTask(request, options, wrappedCallback) @@ -1676,7 +1676,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('deleteTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.deleteTask(request, options, wrappedCallback) @@ -1800,7 +1800,7 @@ export class CloudTasksClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('runTask response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.runTask(request, options, wrappedCallback) @@ -1924,7 +1924,7 @@ export class CloudTasksClient { protos.google.cloud.tasks.v2.IQueue>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listQueues values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listQueues request %j', request); @@ -2204,7 +2204,7 @@ export class CloudTasksClient { protos.google.cloud.tasks.v2.ITask>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listTasks values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listTasks request %j', request); diff --git a/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline b/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline index a3cc9d5df..d1ff0eb9f 100644 --- a/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline +++ b/baselines/texttospeech-esm/esm/src/v1/text_to_speech_client.ts.baseline @@ -412,7 +412,7 @@ export class TextToSpeechClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('listVoices response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.listVoices(request, options, wrappedCallback) @@ -499,7 +499,7 @@ export class TextToSpeechClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('synthesizeSpeech response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.synthesizeSpeech(request, options, wrappedCallback) diff --git a/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline index 849052224..230582ced 100644 --- a/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline @@ -536,7 +536,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('translateText response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.translateText(request, options, wrappedCallback) @@ -657,7 +657,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('detectLanguage response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.detectLanguage(request, options, wrappedCallback) @@ -775,7 +775,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getSupportedLanguages response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getSupportedLanguages(request, options, wrappedCallback) @@ -863,7 +863,7 @@ export class TranslationServiceClient { {}|null|undefined>|undefined = callback ? (error, response, options, rawResponse) => { this._log.info('getGlossary response %j', response); - callback(error, response, options, rawResponse); + callback!(error, response, options, rawResponse); } : undefined; return this.innerApiCalls.getGlossary(request, options, wrappedCallback) @@ -1003,22 +1003,22 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('batchTranslateText response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('batchTranslateText response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('batchTranslateText request %j', request); return this.innerApiCalls.batchTranslateText(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('batchTranslateText response %j', response); - return [response, options, rawResponse]; + this._log.info('batchTranslateText response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1113,22 +1113,22 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('createGlossary response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('createGlossary response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('createGlossary request %j', request); return this.innerApiCalls.createGlossary(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('createGlossary response %j', response); - return [response, options, rawResponse]; + this._log.info('createGlossary response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1222,22 +1222,22 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('deleteGlossary response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('deleteGlossary response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('deleteGlossary request %j', request); return this.innerApiCalls.deleteGlossary(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('deleteGlossary response %j', response); - return [response, options, rawResponse]; + this._log.info('deleteGlossary response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1350,7 +1350,7 @@ export class TranslationServiceClient { protos.google.cloud.translation.v3beta1.IGlossary>|undefined = callback ? (error, values, nextPageRequest, rawResponse) => { this._log.info('listGlossaries values %j', values); - callback(error, values, nextPageRequest, rawResponse); + callback!(error, values, nextPageRequest, rawResponse); } : undefined; this._log.info('listGlossaries request %j', request); diff --git a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline index 89b0170df..2414db4ff 100644 --- a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline @@ -982,22 +982,22 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('batchTranslateText response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('batchTranslateText response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('batchTranslateText request %j', request); return this.innerApiCalls.batchTranslateText(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IBatchTranslateTextRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('batchTranslateText response %j', response); - return [response, options, rawResponse]; + this._log.info('batchTranslateText response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1092,22 +1092,22 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('createGlossary response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('createGlossary response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('createGlossary request %j', request); return this.innerApiCalls.createGlossary(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.ICreateGlossaryRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('createGlossary response %j', response); - return [response, options, rawResponse]; + this._log.info('createGlossary response %j', rawResponse); + return [response, rawResponse, _]; }); } /** @@ -1201,22 +1201,22 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('deleteGlossary response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('deleteGlossary response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('deleteGlossary request %j', request); return this.innerApiCalls.deleteGlossary(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.translation.v3beta1.IDeleteGlossaryRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('deleteGlossary response %j', response); - return [response, options, rawResponse]; + this._log.info('deleteGlossary response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline b/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline index 727fe4155..e6b3d07e9 100644 --- a/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline +++ b/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline @@ -460,22 +460,22 @@ export class VideoIntelligenceServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('annotateVideo response %j', response); - callback(error, response, options, rawResponse); + ? (error, response, rawResponse, _) => { + this._log.info('annotateVideo response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('annotateVideo request %j', request); return this.innerApiCalls.annotateVideo(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('annotateVideo response %j', response); - return [response, options, rawResponse]; + this._log.info('annotateVideo response %j', rawResponse); + return [response, rawResponse, _]; }); } /** diff --git a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline index e5778e8f6..2fc64ca27 100644 --- a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline +++ b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline @@ -439,22 +439,22 @@ export class VideoIntelligenceServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - protos.google.longrunning.IOperation, - protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|null|undefined, + LROperation, + protos.google.longrunning.IOperation|null|undefined, {}|null|undefined>|undefined = callback - ? (error, response, options, rawResponse) => { - this._log.info('annotateVideo response %j', response); - callback!(error, response, options, rawResponse); // We verified callback above. + ? (error, response, rawResponse, _) => { + this._log.info('annotateVideo response %j', rawResponse); + callback!(error, response, rawResponse, _); // We verified callback above. } : undefined; this._log.info('annotateVideo request %j', request); return this.innerApiCalls.annotateVideo(request, options, wrappedCallback) - ?.then(([response, options, rawResponse]: [ - protos.google.longrunning.IOperation, - protos.google.cloud.videointelligence.v1.IAnnotateVideoRequest|undefined, {}|undefined + ?.then(([response, rawResponse, _]: [ + LROperation, + protos.google.longrunning.IOperation|undefined, {}|undefined ]) => { - this._log.info('annotateVideo response %j', response); - return [response, options, rawResponse]; + this._log.info('annotateVideo response %j', rawResponse); + return [response, rawResponse, _]; }); } /** From c1c4128178f041a609b480c8830fa8b4816a241c Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Feb 2025 22:53:50 +0000 Subject: [PATCH 19/24] fix: remove extraneous import line from esm --- .../esm/typescript_gapic/esm/src/$version/$service_client.ts.njk | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk index 989bfc02c..7fd20e709 100644 --- a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk +++ b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk @@ -219,7 +219,6 @@ export class {{ service.name }}Client { // Set useJWTAccessWithScope on the auth object. this.auth.useJWTAccessWithScope = true; {%- endif %} -import * as logging from 'google-logging-utils'; // Set defaultServicePath on the auth object. this.auth.defaultServicePath = this._servicePath; From 52f47f85d7e6a6e0ed8bab6c3c8d14459699a2f7 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Wed, 12 Feb 2025 22:58:42 +0000 Subject: [PATCH 20/24] fix: more type fixes for callbacks, and updated baselines --- .../src/v1/asset_service_client.ts.baseline | 8 +- .../src/v1/asset_service_client.ts.baseline | 24 +++--- .../big_query_storage_client.ts.baseline | 12 ++- .../src/v2/dataset_service_client.ts.baseline | 18 +++-- .../src/v2/job_service_client.ts.baseline | 18 +++-- .../src/v2/model_service_client.ts.baseline | 9 ++- .../src/v2/project_service_client.ts.baseline | 3 +- .../src/v2/routine_service_client.ts.baseline | 15 ++-- .../src/v2/table_service_client.ts.baseline | 15 ++-- .../esm/src/v1/addresses_client.ts.baseline | 26 ++++--- .../src/v1/addresses_client.ts.baseline | 32 +++++--- .../v1/region_operations_client.ts.baseline | 6 +- .../v1/deprecated_service_client.ts.baseline | 6 +- .../esm/src/v1beta1/echo_client.ts.baseline | 8 +- .../src/v1beta1/messaging_client.ts.baseline | 8 +- .../src/v1beta1/compliance_client.ts.baseline | 30 ++++--- .../src/v1beta1/echo_client.ts.baseline | 18 +++-- .../src/v1beta1/identity_client.ts.baseline | 12 ++- .../src/v1beta1/messaging_client.ts.baseline | 30 ++++--- .../sequence_service_client.ts.baseline | 9 ++- .../src/v1beta1/testing_client.ts.baseline | 18 +++-- .../dlp/src/v2/dlp_service_client.ts.baseline | 78 ++++++++++++------- .../key_management_service_client.ts.baseline | 57 +++++++++----- .../v2/config_service_v2_client.ts.baseline | 8 +- .../v2/config_service_v2_client.ts.baseline | 69 ++++++++++------ .../v2/logging_service_v2_client.ts.baseline | 6 +- .../v2/metrics_service_v2_client.ts.baseline | 12 ++- .../alert_policy_service_client.ts.baseline | 12 ++- .../src/v3/group_service_client.ts.baseline | 12 ++- .../src/v3/metric_service_client.ts.baseline | 15 ++-- ...ication_channel_service_client.ts.baseline | 24 ++++-- ...vice_monitoring_service_client.ts.baseline | 24 ++++-- .../uptime_check_service_client.ts.baseline | 12 ++- .../esm/src/v1beta1/naming_client.ts.baseline | 8 +- .../src/v1beta1/naming_client.ts.baseline | 39 ++++++---- .../v1beta1/cloud_redis_client.ts.baseline | 48 ++++++------ .../v1beta1/cloud_redis_client.ts.baseline | 39 +++++----- .../src/v1/test_service_client.ts.baseline | 9 ++- .../esm/src/v1beta1/echo_client.ts.baseline | 8 +- .../src/v1beta1/messaging_client.ts.baseline | 8 +- .../esm/src/v1beta1/echo_client.ts.baseline | 8 +- .../src/v1beta1/echo_client.ts.baseline | 18 +++-- .../src/v1beta1/compliance_client.ts.baseline | 30 ++++--- .../src/v1beta1/echo_client.ts.baseline | 18 +++-- .../src/v1beta1/identity_client.ts.baseline | 12 ++- .../src/v1beta1/messaging_client.ts.baseline | 30 ++++--- .../sequence_service_client.ts.baseline | 9 ++- .../src/v1beta1/testing_client.ts.baseline | 18 +++-- .../src/v2/cloud_tasks_client.ts.baseline | 42 ++++++---- .../src/v1/text_to_speech_client.ts.baseline | 6 +- .../translation_service_client.ts.baseline | 24 +++--- .../translation_service_client.ts.baseline | 30 +++---- ...eo_intelligence_service_client.ts.baseline | 8 +- ...eo_intelligence_service_client.ts.baseline | 6 +- .../src/$version/$service_client.ts.njk | 25 +++--- .../esm/src/$version/$service_client.ts.njk | 21 ++--- 56 files changed, 694 insertions(+), 424 deletions(-) diff --git a/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline b/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline index 5e7b48e77..add6263de 100644 --- a/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline +++ b/baselines/asset-esm/esm/src/v1/asset_service_client.ts.baseline @@ -1054,12 +1054,12 @@ export class AssetServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('exportAssets response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('exportAssets request %j', request); diff --git a/baselines/asset/src/v1/asset_service_client.ts.baseline b/baselines/asset/src/v1/asset_service_client.ts.baseline index b6ac32d33..841fb8cbc 100644 --- a/baselines/asset/src/v1/asset_service_client.ts.baseline +++ b/baselines/asset/src/v1/asset_service_client.ts.baseline @@ -466,7 +466,8 @@ export class AssetServiceClient { return this.innerApiCalls.batchGetAssetsHistory(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.asset.v1.IBatchGetAssetsHistoryResponse, - protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|undefined, {}|undefined + protos.google.cloud.asset.v1.IBatchGetAssetsHistoryRequest|undefined, + {}|undefined ]) => { this._log.info('batchGetAssetsHistory response %j', response); return [response, options, rawResponse]; @@ -567,7 +568,8 @@ export class AssetServiceClient { return this.innerApiCalls.createFeed(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.asset.v1.IFeed, - protos.google.cloud.asset.v1.ICreateFeedRequest|undefined, {}|undefined + protos.google.cloud.asset.v1.ICreateFeedRequest|undefined, + {}|undefined ]) => { this._log.info('createFeed response %j', response); return [response, options, rawResponse]; @@ -657,7 +659,8 @@ export class AssetServiceClient { return this.innerApiCalls.getFeed(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.asset.v1.IFeed, - protos.google.cloud.asset.v1.IGetFeedRequest|undefined, {}|undefined + protos.google.cloud.asset.v1.IGetFeedRequest|undefined, + {}|undefined ]) => { this._log.info('getFeed response %j', response); return [response, options, rawResponse]; @@ -746,7 +749,8 @@ export class AssetServiceClient { return this.innerApiCalls.listFeeds(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.asset.v1.IListFeedsResponse, - protos.google.cloud.asset.v1.IListFeedsRequest|undefined, {}|undefined + protos.google.cloud.asset.v1.IListFeedsRequest|undefined, + {}|undefined ]) => { this._log.info('listFeeds response %j', response); return [response, options, rawResponse]; @@ -841,7 +845,8 @@ export class AssetServiceClient { return this.innerApiCalls.updateFeed(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.asset.v1.IFeed, - protos.google.cloud.asset.v1.IUpdateFeedRequest|undefined, {}|undefined + protos.google.cloud.asset.v1.IUpdateFeedRequest|undefined, + {}|undefined ]) => { this._log.info('updateFeed response %j', response); return [response, options, rawResponse]; @@ -931,7 +936,8 @@ export class AssetServiceClient { return this.innerApiCalls.deleteFeed(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.asset.v1.IDeleteFeedRequest|undefined, {}|undefined + protos.google.cloud.asset.v1.IDeleteFeedRequest|undefined, + {}|undefined ]) => { this._log.info('deleteFeed response %j', response); return [response, options, rawResponse]; @@ -1033,9 +1039,9 @@ export class AssetServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('exportAssets response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline index 782f97f53..085429a77 100644 --- a/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline +++ b/baselines/bigquery-storage/src/v1beta1/big_query_storage_client.ts.baseline @@ -459,7 +459,8 @@ export class BigQueryStorageClient { return this.innerApiCalls.createReadSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.storage.v1beta1.IReadSession, - protos.google.cloud.bigquery.storage.v1beta1.ICreateReadSessionRequest|undefined, {}|undefined + protos.google.cloud.bigquery.storage.v1beta1.ICreateReadSessionRequest|undefined, + {}|undefined ]) => { this._log.info('createReadSession response %j', response); return [response, options, rawResponse]; @@ -553,7 +554,8 @@ export class BigQueryStorageClient { return this.innerApiCalls.batchCreateReadSessionStreams(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsResponse, - protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsRequest|undefined, {}|undefined + protos.google.cloud.bigquery.storage.v1beta1.IBatchCreateReadSessionStreamsRequest|undefined, + {}|undefined ]) => { this._log.info('batchCreateReadSessionStreams response %j', response); return [response, options, rawResponse]; @@ -653,7 +655,8 @@ export class BigQueryStorageClient { return this.innerApiCalls.finalizeStream(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.bigquery.storage.v1beta1.IFinalizeStreamRequest|undefined, {}|undefined + protos.google.cloud.bigquery.storage.v1beta1.IFinalizeStreamRequest|undefined, + {}|undefined ]) => { this._log.info('finalizeStream response %j', response); return [response, options, rawResponse]; @@ -760,7 +763,8 @@ export class BigQueryStorageClient { return this.innerApiCalls.splitReadStream(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamResponse, - protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamRequest|undefined, {}|undefined + protos.google.cloud.bigquery.storage.v1beta1.ISplitReadStreamRequest|undefined, + {}|undefined ]) => { this._log.info('splitReadStream response %j', response); return [response, options, rawResponse]; diff --git a/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline index a1654635a..972efb911 100644 --- a/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/dataset_service_client.ts.baseline @@ -415,7 +415,8 @@ export class DatasetServiceClient { return this.innerApiCalls.getDataset(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IDataset, - protos.google.cloud.bigquery.v2.IGetDatasetRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IGetDatasetRequest|undefined, + {}|undefined ]) => { this._log.info('getDataset response %j', response); return [response, options, rawResponse]; @@ -504,7 +505,8 @@ export class DatasetServiceClient { return this.innerApiCalls.insertDataset(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IDataset, - protos.google.cloud.bigquery.v2.IInsertDatasetRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IInsertDatasetRequest|undefined, + {}|undefined ]) => { this._log.info('insertDataset response %j', response); return [response, options, rawResponse]; @@ -600,7 +602,8 @@ export class DatasetServiceClient { return this.innerApiCalls.patchDataset(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IDataset, - protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, + {}|undefined ]) => { this._log.info('patchDataset response %j', response); return [response, options, rawResponse]; @@ -695,7 +698,8 @@ export class DatasetServiceClient { return this.innerApiCalls.updateDataset(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IDataset, - protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IUpdateOrPatchDatasetRequest|undefined, + {}|undefined ]) => { this._log.info('updateDataset response %j', response); return [response, options, rawResponse]; @@ -792,7 +796,8 @@ export class DatasetServiceClient { return this.innerApiCalls.deleteDataset(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.bigquery.v2.IDeleteDatasetRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IDeleteDatasetRequest|undefined, + {}|undefined ]) => { this._log.info('deleteDataset response %j', response); return [response, options, rawResponse]; @@ -888,7 +893,8 @@ export class DatasetServiceClient { return this.innerApiCalls.undeleteDataset(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IDataset, - protos.google.cloud.bigquery.v2.IUndeleteDatasetRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IUndeleteDatasetRequest|undefined, + {}|undefined ]) => { this._log.info('undeleteDataset response %j', response); return [response, options, rawResponse]; diff --git a/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline index 2222cdade..697e3d16a 100644 --- a/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/job_service_client.ts.baseline @@ -428,7 +428,8 @@ export class JobServiceClient { return this.innerApiCalls.cancelJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IJobCancelResponse, - protos.google.cloud.bigquery.v2.ICancelJobRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.ICancelJobRequest|undefined, + {}|undefined ]) => { this._log.info('cancelJob response %j', response); return [response, options, rawResponse]; @@ -531,7 +532,8 @@ export class JobServiceClient { return this.innerApiCalls.getJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IJob, - protos.google.cloud.bigquery.v2.IGetJobRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IGetJobRequest|undefined, + {}|undefined ]) => { this._log.info('getJob response %j', response); return [response, options, rawResponse]; @@ -630,7 +632,8 @@ export class JobServiceClient { return this.innerApiCalls.insertJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IJob, - protos.google.cloud.bigquery.v2.IInsertJobRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IInsertJobRequest|undefined, + {}|undefined ]) => { this._log.info('insertJob response %j', response); return [response, options, rawResponse]; @@ -728,7 +731,8 @@ export class JobServiceClient { return this.innerApiCalls.deleteJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.bigquery.v2.IDeleteJobRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IDeleteJobRequest|undefined, + {}|undefined ]) => { this._log.info('deleteJob response %j', response); return [response, options, rawResponse]; @@ -853,7 +857,8 @@ export class JobServiceClient { return this.innerApiCalls.getQueryResults(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IGetQueryResultsResponse, - protos.google.cloud.bigquery.v2.IGetQueryResultsRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IGetQueryResultsRequest|undefined, + {}|undefined ]) => { this._log.info('getQueryResults response %j', response); return [response, options, rawResponse]; @@ -943,7 +948,8 @@ export class JobServiceClient { return this.innerApiCalls.query(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IQueryResponse, - protos.google.cloud.bigquery.v2.IPostQueryRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IPostQueryRequest|undefined, + {}|undefined ]) => { this._log.info('query response %j', response); return [response, options, rawResponse]; diff --git a/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline index 93a783014..f54344764 100644 --- a/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/model_service_client.ts.baseline @@ -415,7 +415,8 @@ export class ModelServiceClient { return this.innerApiCalls.getModel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IModel, - protos.google.cloud.bigquery.v2.IGetModelRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IGetModelRequest|undefined, + {}|undefined ]) => { this._log.info('getModel response %j', response); return [response, options, rawResponse]; @@ -512,7 +513,8 @@ export class ModelServiceClient { return this.innerApiCalls.patchModel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IModel, - protos.google.cloud.bigquery.v2.IPatchModelRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IPatchModelRequest|undefined, + {}|undefined ]) => { this._log.info('patchModel response %j', response); return [response, options, rawResponse]; @@ -605,7 +607,8 @@ export class ModelServiceClient { return this.innerApiCalls.deleteModel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.bigquery.v2.IDeleteModelRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IDeleteModelRequest|undefined, + {}|undefined ]) => { this._log.info('deleteModel response %j', response); return [response, options, rawResponse]; diff --git a/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline index d2165b506..d586f3280 100644 --- a/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/project_service_client.ts.baseline @@ -401,7 +401,8 @@ export class ProjectServiceClient { return this.innerApiCalls.getServiceAccount(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IGetServiceAccountResponse, - protos.google.cloud.bigquery.v2.IGetServiceAccountRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IGetServiceAccountRequest|undefined, + {}|undefined ]) => { this._log.info('getServiceAccount response %j', response); return [response, options, rawResponse]; diff --git a/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline index 28098ff47..9c40b911c 100644 --- a/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/routine_service_client.ts.baseline @@ -415,7 +415,8 @@ export class RoutineServiceClient { return this.innerApiCalls.getRoutine(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IRoutine, - protos.google.cloud.bigquery.v2.IGetRoutineRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IGetRoutineRequest|undefined, + {}|undefined ]) => { this._log.info('getRoutine response %j', response); return [response, options, rawResponse]; @@ -507,7 +508,8 @@ export class RoutineServiceClient { return this.innerApiCalls.insertRoutine(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IRoutine, - protos.google.cloud.bigquery.v2.IInsertRoutineRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IInsertRoutineRequest|undefined, + {}|undefined ]) => { this._log.info('insertRoutine response %j', response); return [response, options, rawResponse]; @@ -603,7 +605,8 @@ export class RoutineServiceClient { return this.innerApiCalls.updateRoutine(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IRoutine, - protos.google.cloud.bigquery.v2.IUpdateRoutineRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IUpdateRoutineRequest|undefined, + {}|undefined ]) => { this._log.info('updateRoutine response %j', response); return [response, options, rawResponse]; @@ -697,7 +700,8 @@ export class RoutineServiceClient { return this.innerApiCalls.patchRoutine(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.IRoutine, - protos.google.cloud.bigquery.v2.IPatchRoutineRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IPatchRoutineRequest|undefined, + {}|undefined ]) => { this._log.info('patchRoutine response %j', response); return [response, options, rawResponse]; @@ -790,7 +794,8 @@ export class RoutineServiceClient { return this.innerApiCalls.deleteRoutine(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.bigquery.v2.IDeleteRoutineRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IDeleteRoutineRequest|undefined, + {}|undefined ]) => { this._log.info('deleteRoutine response %j', response); return [response, options, rawResponse]; diff --git a/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline b/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline index b3cdf1f5e..add310c3a 100644 --- a/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline +++ b/baselines/bigquery-v2/src/v2/table_service_client.ts.baseline @@ -428,7 +428,8 @@ export class TableServiceClient { return this.innerApiCalls.getTable(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.ITable, - protos.google.cloud.bigquery.v2.IGetTableRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IGetTableRequest|undefined, + {}|undefined ]) => { this._log.info('getTable response %j', response); return [response, options, rawResponse]; @@ -520,7 +521,8 @@ export class TableServiceClient { return this.innerApiCalls.insertTable(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.ITable, - protos.google.cloud.bigquery.v2.IInsertTableRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IInsertTableRequest|undefined, + {}|undefined ]) => { this._log.info('insertTable response %j', response); return [response, options, rawResponse]; @@ -620,7 +622,8 @@ export class TableServiceClient { return this.innerApiCalls.patchTable(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.ITable, - protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, + {}|undefined ]) => { this._log.info('patchTable response %j', response); return [response, options, rawResponse]; @@ -719,7 +722,8 @@ export class TableServiceClient { return this.innerApiCalls.updateTable(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.bigquery.v2.ITable, - protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IUpdateOrPatchTableRequest|undefined, + {}|undefined ]) => { this._log.info('updateTable response %j', response); return [response, options, rawResponse]; @@ -813,7 +817,8 @@ export class TableServiceClient { return this.innerApiCalls.deleteTable(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.bigquery.v2.IDeleteTableRequest|undefined, {}|undefined + protos.google.cloud.bigquery.v2.IDeleteTableRequest|undefined, + {}|undefined ]) => { this._log.info('deleteTable response %j', response); return [response, options, rawResponse]; diff --git a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline index 8e0148b4e..716f40427 100644 --- a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline +++ b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline @@ -440,20 +440,21 @@ export class AddressesClient { this.initialize(); this._log.info('delete request %j', request); const wrappedCallback: Callback< - LROperation, - protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback - ? (error, response, rawResponse, _) => { + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IDeleteAddressRequest|undefined, + {}|undefined>|undefined = callback + ? (error, response, nextRequest, rawResponse => { this._log.info('delete response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } : undefined; return this.innerApiCalls.delete(request, options, wrappedCallback) - ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + ?.then(([response, nextRequest, rawResponse]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { this._log.info('delete response %j', rawResponse); return [ response, + nextRequest, rawResponse, - _ ]; }); } @@ -543,20 +544,21 @@ export class AddressesClient { this.initialize(); this._log.info('insert request %j', request); const wrappedCallback: Callback< - LROperation, - protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback - ? (error, response, rawResponse, _) => { + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IInsertAddressRequest|undefined, + {}|undefined>|undefined = callback + ? (error, response, nextRequest, rawResponse => { this._log.info('insert response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } : undefined; return this.innerApiCalls.insert(request, options, wrappedCallback) - ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + ?.then(([response, nextRequest, rawResponse]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { this._log.info('insert response %j', rawResponse); return [ response, + nextRequest, rawResponse, - _ ]; }); } diff --git a/baselines/compute/src/v1/addresses_client.ts.baseline b/baselines/compute/src/v1/addresses_client.ts.baseline index 7f72c2c55..297139e18 100644 --- a/baselines/compute/src/v1/addresses_client.ts.baseline +++ b/baselines/compute/src/v1/addresses_client.ts.baseline @@ -419,20 +419,24 @@ export class AddressesClient { this.initialize(); this._log.info('delete request %j', request); const wrappedCallback: Callback< - LROperation, - protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback - ? (error, response, rawResponse, _) => { + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IDeleteAddressRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { this._log.info('delete response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } : undefined; return this.innerApiCalls.delete(request, options, wrappedCallback) - ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + ?.then(([response, nextRequest, rawResponse]: [ + LROperation, + protos.google.cloud.compute.v1.IOperation|undefined, + {}|undefined]) => { this._log.info('delete response %j', rawResponse); return [ response, + nextRequest, rawResponse, - _ ]; }); } @@ -522,20 +526,24 @@ export class AddressesClient { this.initialize(); this._log.info('insert request %j', request); const wrappedCallback: Callback< - LROperation, - protos.google.cloud.compute.v1.IOperation|undefined, {}|undefined>|undefined = callback - ? (error, response, rawResponse, _) => { + protos.google.cloud.compute.v1.IOperation, + protos.google.cloud.compute.v1.IInsertAddressRequest|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { this._log.info('insert response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } : undefined; return this.innerApiCalls.insert(request, options, wrappedCallback) - ?.then(([response, rawResponse, _]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { + ?.then(([response, nextRequest, rawResponse]: [ + LROperation, + protos.google.cloud.compute.v1.IOperation|undefined, + {}|undefined]) => { this._log.info('insert response %j', rawResponse); return [ response, + nextRequest, rawResponse, - _ ]; }); } diff --git a/baselines/compute/src/v1/region_operations_client.ts.baseline b/baselines/compute/src/v1/region_operations_client.ts.baseline index 7c629161f..2cee44b13 100644 --- a/baselines/compute/src/v1/region_operations_client.ts.baseline +++ b/baselines/compute/src/v1/region_operations_client.ts.baseline @@ -406,7 +406,8 @@ export class RegionOperationsClient { return this.innerApiCalls.get(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IGetRegionOperationRequest|undefined, {}|undefined + protos.google.cloud.compute.v1.IGetRegionOperationRequest|undefined, + {}|undefined ]) => { this._log.info('get response %j', response); return [response, options, rawResponse]; @@ -503,7 +504,8 @@ export class RegionOperationsClient { return this.innerApiCalls.wait(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.compute.v1.IOperation, - protos.google.cloud.compute.v1.IWaitRegionOperationRequest|undefined, {}|undefined + protos.google.cloud.compute.v1.IWaitRegionOperationRequest|undefined, + {}|undefined ]) => { this._log.info('wait response %j', response); return [response, options, rawResponse]; diff --git a/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline b/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline index 2407b33b2..cf220fe4b 100644 --- a/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline +++ b/baselines/deprecatedtest/src/v1/deprecated_service_client.ts.baseline @@ -394,7 +394,8 @@ export class DeprecatedServiceClient { return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, {}|undefined + protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, + {}|undefined ]) => { this._log.info('fastFibonacci response %j', response); return [response, options, rawResponse]; @@ -478,7 +479,8 @@ export class DeprecatedServiceClient { return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, {}|undefined + protos.google.deprecatedtest.v1.IFibonacciRequest|undefined, + {}|undefined ]) => { this._log.info('slowFibonacci response %j', response); return [response, options, rawResponse]; diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline index fbab8e93c..7109958fa 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -1059,12 +1059,12 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('wait response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('wait request %j', request); diff --git a/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline index a531a6848..ea09c0e49 100644 --- a/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test-esm/esm/src/v1beta1/messaging_client.ts.baseline @@ -1327,12 +1327,12 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('searchBlurbs response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('searchBlurbs request %j', request); diff --git a/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline index c61a0c42c..830415e3e 100644 --- a/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/compliance_client.ts.baseline @@ -444,7 +444,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBody response %j', response); return [response, options, rawResponse]; @@ -541,7 +542,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBodyInfo response %j', response); return [response, options, rawResponse]; @@ -637,7 +639,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataQuery response %j', response); return [response, options, rawResponse]; @@ -743,7 +746,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataSimplePath response %j', response); return [response, options, rawResponse]; @@ -845,7 +849,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataPathResource response %j', response); return [response, options, rawResponse]; @@ -946,7 +951,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataPathTrailingResource response %j', response); return [response, options, rawResponse]; @@ -1041,7 +1047,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBodyPut response %j', response); return [response, options, rawResponse]; @@ -1136,7 +1143,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBodyPatch response %j', response); return [response, options, rawResponse]; @@ -1223,7 +1231,8 @@ export class ComplianceClient { return this.innerApiCalls.getEnum(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEnumResponse, - protos.google.showcase.v1beta1.IEnumRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEnumRequest|undefined, + {}|undefined ]) => { this._log.info('getEnum response %j', response); return [response, options, rawResponse]; @@ -1312,7 +1321,8 @@ export class ComplianceClient { return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEnumResponse, - protos.google.showcase.v1beta1.IEnumResponse|undefined, {}|undefined + protos.google.showcase.v1beta1.IEnumResponse|undefined, + {}|undefined ]) => { this._log.info('verifyEnum response %j', response); return [response, options, rawResponse]; diff --git a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline index 6df36d79e..7006bb0cd 100644 --- a/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline @@ -582,7 +582,8 @@ export class EchoClient { return this.innerApiCalls.echo(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEchoResponse, - protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEchoRequest|undefined, + {}|undefined ]) => { this._log.info('echo response %j', response); return [response, options, rawResponse]; @@ -673,7 +674,8 @@ export class EchoClient { return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, - protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, + {}|undefined ]) => { this._log.info('echoErrorDetails response %j', response); return [response, options, rawResponse]; @@ -763,7 +765,8 @@ export class EchoClient { return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IPagedExpandResponse, - protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, + {}|undefined ]) => { this._log.info('pagedExpandLegacy response %j', response); return [response, options, rawResponse]; @@ -852,7 +855,8 @@ export class EchoClient { return this.innerApiCalls.block(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlockResponse, - protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IBlockRequest|undefined, + {}|undefined ]) => { this._log.info('block response %j', response); return [response, options, rawResponse]; @@ -1038,9 +1042,9 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('wait response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline index cdb7bbf85..27741292a 100644 --- a/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline @@ -437,7 +437,8 @@ export class IdentityClient { return this.innerApiCalls.createUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IUser, - protos.google.showcase.v1beta1.ICreateUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateUserRequest|undefined, + {}|undefined ]) => { this._log.info('createUser response %j', response); return [response, options, rawResponse]; @@ -524,7 +525,8 @@ export class IdentityClient { return this.innerApiCalls.getUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IUser, - protos.google.showcase.v1beta1.IGetUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetUserRequest|undefined, + {}|undefined ]) => { this._log.info('getUser response %j', response); return [response, options, rawResponse]; @@ -614,7 +616,8 @@ export class IdentityClient { return this.innerApiCalls.updateUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IUser, - protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, + {}|undefined ]) => { this._log.info('updateUser response %j', response); return [response, options, rawResponse]; @@ -701,7 +704,8 @@ export class IdentityClient { return this.innerApiCalls.deleteUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, + {}|undefined ]) => { this._log.info('deleteUser response %j', response); return [response, options, rawResponse]; diff --git a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline index ea9ea65a2..4f718c4cd 100644 --- a/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline @@ -485,7 +485,8 @@ export class MessagingClient { return this.innerApiCalls.createRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRoom, - protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, + {}|undefined ]) => { this._log.info('createRoom response %j', response); return [response, options, rawResponse]; @@ -572,7 +573,8 @@ export class MessagingClient { return this.innerApiCalls.getRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRoom, - protos.google.showcase.v1beta1.IGetRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetRoomRequest|undefined, + {}|undefined ]) => { this._log.info('getRoom response %j', response); return [response, options, rawResponse]; @@ -662,7 +664,8 @@ export class MessagingClient { return this.innerApiCalls.updateRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRoom, - protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, + {}|undefined ]) => { this._log.info('updateRoom response %j', response); return [response, options, rawResponse]; @@ -749,7 +752,8 @@ export class MessagingClient { return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, + {}|undefined ]) => { this._log.info('deleteRoom response %j', response); return [response, options, rawResponse]; @@ -841,7 +845,8 @@ export class MessagingClient { return this.innerApiCalls.createBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlurb, - protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('createBlurb response %j', response); return [response, options, rawResponse]; @@ -928,7 +933,8 @@ export class MessagingClient { return this.innerApiCalls.getBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlurb, - protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('getBlurb response %j', response); return [response, options, rawResponse]; @@ -1018,7 +1024,8 @@ export class MessagingClient { return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlurb, - protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('updateBlurb response %j', response); return [response, options, rawResponse]; @@ -1105,7 +1112,8 @@ export class MessagingClient { return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('deleteBlurb response %j', response); return [response, options, rawResponse]; @@ -1306,9 +1314,9 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('searchBlurbs response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline index 3d12caa62..8e85304ba 100644 --- a/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/sequence_service_client.ts.baseline @@ -426,7 +426,8 @@ export class SequenceServiceClient { return this.innerApiCalls.createSequence(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISequence, - protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, + {}|undefined ]) => { this._log.info('createSequence response %j', response); return [response, options, rawResponse]; @@ -512,7 +513,8 @@ export class SequenceServiceClient { return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISequenceReport, - protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, + {}|undefined ]) => { this._log.info('getSequenceReport response %j', response); return [response, options, rawResponse]; @@ -598,7 +600,8 @@ export class SequenceServiceClient { return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, + {}|undefined ]) => { this._log.info('attemptSequence response %j', response); return [response, options, rawResponse]; diff --git a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline index 9c9ee25c9..64e67e59e 100644 --- a/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline +++ b/baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline @@ -442,7 +442,8 @@ export class TestingClient { return this.innerApiCalls.createSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISession, - protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, + {}|undefined ]) => { this._log.info('createSession response %j', response); return [response, options, rawResponse]; @@ -529,7 +530,8 @@ export class TestingClient { return this.innerApiCalls.getSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISession, - protos.google.showcase.v1beta1.IGetSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetSessionRequest|undefined, + {}|undefined ]) => { this._log.info('getSession response %j', response); return [response, options, rawResponse]; @@ -616,7 +618,8 @@ export class TestingClient { return this.innerApiCalls.deleteSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, + {}|undefined ]) => { this._log.info('deleteSession response %j', response); return [response, options, rawResponse]; @@ -705,7 +708,8 @@ export class TestingClient { return this.innerApiCalls.reportSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IReportSessionResponse, - protos.google.showcase.v1beta1.IReportSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IReportSessionRequest|undefined, + {}|undefined ]) => { this._log.info('reportSession response %j', response); return [response, options, rawResponse]; @@ -797,7 +801,8 @@ export class TestingClient { return this.innerApiCalls.deleteTest(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, + {}|undefined ]) => { this._log.info('deleteTest response %j', response); return [response, options, rawResponse]; @@ -891,7 +896,8 @@ export class TestingClient { return this.innerApiCalls.verifyTest(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IVerifyTestResponse, - protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, + {}|undefined ]) => { this._log.info('verifyTest response %j', response); return [response, options, rawResponse]; diff --git a/baselines/dlp/src/v2/dlp_service_client.ts.baseline b/baselines/dlp/src/v2/dlp_service_client.ts.baseline index 7d0c435f2..d3f026b24 100644 --- a/baselines/dlp/src/v2/dlp_service_client.ts.baseline +++ b/baselines/dlp/src/v2/dlp_service_client.ts.baseline @@ -480,7 +480,8 @@ export class DlpServiceClient { return this.innerApiCalls.inspectContent(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IInspectContentResponse, - protos.google.privacy.dlp.v2.IInspectContentRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IInspectContentRequest|undefined, + {}|undefined ]) => { this._log.info('inspectContent response %j', response); return [response, options, rawResponse]; @@ -587,7 +588,8 @@ export class DlpServiceClient { return this.innerApiCalls.redactImage(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IRedactImageResponse, - protos.google.privacy.dlp.v2.IRedactImageRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IRedactImageRequest|undefined, + {}|undefined ]) => { this._log.info('redactImage response %j', response); return [response, options, rawResponse]; @@ -707,7 +709,8 @@ export class DlpServiceClient { return this.innerApiCalls.deidentifyContent(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IDeidentifyContentResponse, - protos.google.privacy.dlp.v2.IDeidentifyContentRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IDeidentifyContentRequest|undefined, + {}|undefined ]) => { this._log.info('deidentifyContent response %j', response); return [response, options, rawResponse]; @@ -829,7 +832,8 @@ export class DlpServiceClient { return this.innerApiCalls.reidentifyContent(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IReidentifyContentResponse, - protos.google.privacy.dlp.v2.IReidentifyContentRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IReidentifyContentRequest|undefined, + {}|undefined ]) => { this._log.info('reidentifyContent response %j', response); return [response, options, rawResponse]; @@ -926,7 +930,8 @@ export class DlpServiceClient { return this.innerApiCalls.listInfoTypes(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IListInfoTypesResponse, - protos.google.privacy.dlp.v2.IListInfoTypesRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IListInfoTypesRequest|undefined, + {}|undefined ]) => { this._log.info('listInfoTypes response %j', response); return [response, options, rawResponse]; @@ -1027,7 +1032,8 @@ export class DlpServiceClient { return this.innerApiCalls.createInspectTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IInspectTemplate, - protos.google.privacy.dlp.v2.ICreateInspectTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.ICreateInspectTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('createInspectTemplate response %j', response); return [response, options, rawResponse]; @@ -1121,7 +1127,8 @@ export class DlpServiceClient { return this.innerApiCalls.updateInspectTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IInspectTemplate, - protos.google.privacy.dlp.v2.IUpdateInspectTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IUpdateInspectTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('updateInspectTemplate response %j', response); return [response, options, rawResponse]; @@ -1211,7 +1218,8 @@ export class DlpServiceClient { return this.innerApiCalls.getInspectTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IInspectTemplate, - protos.google.privacy.dlp.v2.IGetInspectTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IGetInspectTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('getInspectTemplate response %j', response); return [response, options, rawResponse]; @@ -1301,7 +1309,8 @@ export class DlpServiceClient { return this.innerApiCalls.deleteInspectTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.privacy.dlp.v2.IDeleteInspectTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IDeleteInspectTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('deleteInspectTemplate response %j', response); return [response, options, rawResponse]; @@ -1403,7 +1412,8 @@ export class DlpServiceClient { return this.innerApiCalls.createDeidentifyTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IDeidentifyTemplate, - protos.google.privacy.dlp.v2.ICreateDeidentifyTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.ICreateDeidentifyTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('createDeidentifyTemplate response %j', response); return [response, options, rawResponse]; @@ -1498,7 +1508,8 @@ export class DlpServiceClient { return this.innerApiCalls.updateDeidentifyTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IDeidentifyTemplate, - protos.google.privacy.dlp.v2.IUpdateDeidentifyTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IUpdateDeidentifyTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('updateDeidentifyTemplate response %j', response); return [response, options, rawResponse]; @@ -1589,7 +1600,8 @@ export class DlpServiceClient { return this.innerApiCalls.getDeidentifyTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IDeidentifyTemplate, - protos.google.privacy.dlp.v2.IGetDeidentifyTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IGetDeidentifyTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('getDeidentifyTemplate response %j', response); return [response, options, rawResponse]; @@ -1680,7 +1692,8 @@ export class DlpServiceClient { return this.innerApiCalls.deleteDeidentifyTemplate(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.privacy.dlp.v2.IDeleteDeidentifyTemplateRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IDeleteDeidentifyTemplateRequest|undefined, + {}|undefined ]) => { this._log.info('deleteDeidentifyTemplate response %j', response); return [response, options, rawResponse]; @@ -1780,7 +1793,8 @@ export class DlpServiceClient { return this.innerApiCalls.createJobTrigger(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IJobTrigger, - protos.google.privacy.dlp.v2.ICreateJobTriggerRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.ICreateJobTriggerRequest|undefined, + {}|undefined ]) => { this._log.info('createJobTrigger response %j', response); return [response, options, rawResponse]; @@ -1873,7 +1887,8 @@ export class DlpServiceClient { return this.innerApiCalls.updateJobTrigger(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IJobTrigger, - protos.google.privacy.dlp.v2.IUpdateJobTriggerRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IUpdateJobTriggerRequest|undefined, + {}|undefined ]) => { this._log.info('updateJobTrigger response %j', response); return [response, options, rawResponse]; @@ -1962,7 +1977,8 @@ export class DlpServiceClient { return this.innerApiCalls.getJobTrigger(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IJobTrigger, - protos.google.privacy.dlp.v2.IGetJobTriggerRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IGetJobTriggerRequest|undefined, + {}|undefined ]) => { this._log.info('getJobTrigger response %j', response); return [response, options, rawResponse]; @@ -2051,7 +2067,8 @@ export class DlpServiceClient { return this.innerApiCalls.deleteJobTrigger(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.privacy.dlp.v2.IDeleteJobTriggerRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IDeleteJobTriggerRequest|undefined, + {}|undefined ]) => { this._log.info('deleteJobTrigger response %j', response); return [response, options, rawResponse]; @@ -2140,7 +2157,8 @@ export class DlpServiceClient { return this.innerApiCalls.activateJobTrigger(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IDlpJob, - protos.google.privacy.dlp.v2.IActivateJobTriggerRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IActivateJobTriggerRequest|undefined, + {}|undefined ]) => { this._log.info('activateJobTrigger response %j', response); return [response, options, rawResponse]; @@ -2246,7 +2264,8 @@ export class DlpServiceClient { return this.innerApiCalls.createDlpJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IDlpJob, - protos.google.privacy.dlp.v2.ICreateDlpJobRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.ICreateDlpJobRequest|undefined, + {}|undefined ]) => { this._log.info('createDlpJob response %j', response); return [response, options, rawResponse]; @@ -2335,7 +2354,8 @@ export class DlpServiceClient { return this.innerApiCalls.getDlpJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IDlpJob, - protos.google.privacy.dlp.v2.IGetDlpJobRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IGetDlpJobRequest|undefined, + {}|undefined ]) => { this._log.info('getDlpJob response %j', response); return [response, options, rawResponse]; @@ -2426,7 +2446,8 @@ export class DlpServiceClient { return this.innerApiCalls.deleteDlpJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.privacy.dlp.v2.IDeleteDlpJobRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IDeleteDlpJobRequest|undefined, + {}|undefined ]) => { this._log.info('deleteDlpJob response %j', response); return [response, options, rawResponse]; @@ -2517,7 +2538,8 @@ export class DlpServiceClient { return this.innerApiCalls.cancelDlpJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.privacy.dlp.v2.ICancelDlpJobRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.ICancelDlpJobRequest|undefined, + {}|undefined ]) => { this._log.info('cancelDlpJob response %j', response); return [response, options, rawResponse]; @@ -2618,7 +2640,8 @@ export class DlpServiceClient { return this.innerApiCalls.createStoredInfoType(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IStoredInfoType, - protos.google.privacy.dlp.v2.ICreateStoredInfoTypeRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.ICreateStoredInfoTypeRequest|undefined, + {}|undefined ]) => { this._log.info('createStoredInfoType response %j', response); return [response, options, rawResponse]; @@ -2716,7 +2739,8 @@ export class DlpServiceClient { return this.innerApiCalls.updateStoredInfoType(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IStoredInfoType, - protos.google.privacy.dlp.v2.IUpdateStoredInfoTypeRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IUpdateStoredInfoTypeRequest|undefined, + {}|undefined ]) => { this._log.info('updateStoredInfoType response %j', response); return [response, options, rawResponse]; @@ -2807,7 +2831,8 @@ export class DlpServiceClient { return this.innerApiCalls.getStoredInfoType(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.privacy.dlp.v2.IStoredInfoType, - protos.google.privacy.dlp.v2.IGetStoredInfoTypeRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IGetStoredInfoTypeRequest|undefined, + {}|undefined ]) => { this._log.info('getStoredInfoType response %j', response); return [response, options, rawResponse]; @@ -2898,7 +2923,8 @@ export class DlpServiceClient { return this.innerApiCalls.deleteStoredInfoType(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.privacy.dlp.v2.IDeleteStoredInfoTypeRequest|undefined, {}|undefined + protos.google.privacy.dlp.v2.IDeleteStoredInfoTypeRequest|undefined, + {}|undefined ]) => { this._log.info('deleteStoredInfoType response %j', response); return [response, options, rawResponse]; diff --git a/baselines/kms/src/v1/key_management_service_client.ts.baseline b/baselines/kms/src/v1/key_management_service_client.ts.baseline index f8cd96347..ee6ed85b4 100644 --- a/baselines/kms/src/v1/key_management_service_client.ts.baseline +++ b/baselines/kms/src/v1/key_management_service_client.ts.baseline @@ -424,7 +424,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.getKeyRing(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IKeyRing, - protos.google.cloud.kms.v1.IGetKeyRingRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IGetKeyRingRequest|undefined, + {}|undefined ]) => { this._log.info('getKeyRing response %j', response); return [response, options, rawResponse]; @@ -512,7 +513,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.getCryptoKey(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKey, - protos.google.cloud.kms.v1.IGetCryptoKeyRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IGetCryptoKeyRequest|undefined, + {}|undefined ]) => { this._log.info('getCryptoKey response %j', response); return [response, options, rawResponse]; @@ -599,7 +601,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.getCryptoKeyVersion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKeyVersion, - protos.google.cloud.kms.v1.IGetCryptoKeyVersionRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IGetCryptoKeyVersionRequest|undefined, + {}|undefined ]) => { this._log.info('getCryptoKeyVersion response %j', response); return [response, options, rawResponse]; @@ -690,7 +693,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.getPublicKey(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IPublicKey, - protos.google.cloud.kms.v1.IGetPublicKeyRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IGetPublicKeyRequest|undefined, + {}|undefined ]) => { this._log.info('getPublicKey response %j', response); return [response, options, rawResponse]; @@ -777,7 +781,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.getImportJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IImportJob, - protos.google.cloud.kms.v1.IGetImportJobRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IGetImportJobRequest|undefined, + {}|undefined ]) => { this._log.info('getImportJob response %j', response); return [response, options, rawResponse]; @@ -870,7 +875,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.createKeyRing(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IKeyRing, - protos.google.cloud.kms.v1.ICreateKeyRingRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.ICreateKeyRingRequest|undefined, + {}|undefined ]) => { this._log.info('createKeyRing response %j', response); return [response, options, rawResponse]; @@ -973,7 +979,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.createCryptoKey(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKey, - protos.google.cloud.kms.v1.ICreateCryptoKeyRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.ICreateCryptoKeyRequest|undefined, + {}|undefined ]) => { this._log.info('createCryptoKey response %j', response); return [response, options, rawResponse]; @@ -1067,7 +1074,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.createCryptoKeyVersion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKeyVersion, - protos.google.cloud.kms.v1.ICreateCryptoKeyVersionRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.ICreateCryptoKeyVersionRequest|undefined, + {}|undefined ]) => { this._log.info('createCryptoKeyVersion response %j', response); return [response, options, rawResponse]; @@ -1186,7 +1194,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.importCryptoKeyVersion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKeyVersion, - protos.google.cloud.kms.v1.IImportCryptoKeyVersionRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IImportCryptoKeyVersionRequest|undefined, + {}|undefined ]) => { this._log.info('importCryptoKeyVersion response %j', response); return [response, options, rawResponse]; @@ -1281,7 +1290,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.createImportJob(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IImportJob, - protos.google.cloud.kms.v1.ICreateImportJobRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.ICreateImportJobRequest|undefined, + {}|undefined ]) => { this._log.info('createImportJob response %j', response); return [response, options, rawResponse]; @@ -1370,7 +1380,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.updateCryptoKey(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKey, - protos.google.cloud.kms.v1.IUpdateCryptoKeyRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IUpdateCryptoKeyRequest|undefined, + {}|undefined ]) => { this._log.info('updateCryptoKey response %j', response); return [response, options, rawResponse]; @@ -1465,7 +1476,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.updateCryptoKeyVersion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKeyVersion, - protos.google.cloud.kms.v1.IUpdateCryptoKeyVersionRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IUpdateCryptoKeyVersionRequest|undefined, + {}|undefined ]) => { this._log.info('updateCryptoKeyVersion response %j', response); return [response, options, rawResponse]; @@ -1577,7 +1589,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.encrypt(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IEncryptResponse, - protos.google.cloud.kms.v1.IEncryptRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IEncryptRequest|undefined, + {}|undefined ]) => { this._log.info('encrypt response %j', response); return [response, options, rawResponse]; @@ -1672,7 +1685,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.decrypt(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IDecryptResponse, - protos.google.cloud.kms.v1.IDecryptRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IDecryptRequest|undefined, + {}|undefined ]) => { this._log.info('decrypt response %j', response); return [response, options, rawResponse]; @@ -1765,7 +1779,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.asymmetricSign(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IAsymmetricSignResponse, - protos.google.cloud.kms.v1.IAsymmetricSignRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IAsymmetricSignRequest|undefined, + {}|undefined ]) => { this._log.info('asymmetricSign response %j', response); return [response, options, rawResponse]; @@ -1858,7 +1873,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.asymmetricDecrypt(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.IAsymmetricDecryptResponse, - protos.google.cloud.kms.v1.IAsymmetricDecryptRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IAsymmetricDecryptRequest|undefined, + {}|undefined ]) => { this._log.info('asymmetricDecrypt response %j', response); return [response, options, rawResponse]; @@ -1949,7 +1965,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.updateCryptoKeyPrimaryVersion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKey, - protos.google.cloud.kms.v1.IUpdateCryptoKeyPrimaryVersionRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IUpdateCryptoKeyPrimaryVersionRequest|undefined, + {}|undefined ]) => { this._log.info('updateCryptoKeyPrimaryVersion response %j', response); return [response, options, rawResponse]; @@ -2047,7 +2064,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.destroyCryptoKeyVersion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKeyVersion, - protos.google.cloud.kms.v1.IDestroyCryptoKeyVersionRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IDestroyCryptoKeyVersionRequest|undefined, + {}|undefined ]) => { this._log.info('destroyCryptoKeyVersion response %j', response); return [response, options, rawResponse]; @@ -2140,7 +2158,8 @@ export class KeyManagementServiceClient { return this.innerApiCalls.restoreCryptoKeyVersion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.kms.v1.ICryptoKeyVersion, - protos.google.cloud.kms.v1.IRestoreCryptoKeyVersionRequest|undefined, {}|undefined + protos.google.cloud.kms.v1.IRestoreCryptoKeyVersionRequest|undefined, + {}|undefined ]) => { this._log.info('restoreCryptoKeyVersion response %j', response); return [response, options, rawResponse]; diff --git a/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline b/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline index 000eb69ae..d00ee73a7 100644 --- a/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging-esm/esm/src/v2/config_service_v2_client.ts.baseline @@ -2780,12 +2780,12 @@ export class ConfigServiceV2Client { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('copyLogEntries response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('copyLogEntries request %j', request); diff --git a/baselines/logging/src/v2/config_service_v2_client.ts.baseline b/baselines/logging/src/v2/config_service_v2_client.ts.baseline index 27fcae065..5c44a92e7 100644 --- a/baselines/logging/src/v2/config_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/config_service_v2_client.ts.baseline @@ -549,7 +549,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.getBucket(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogBucket, - protos.google.logging.v2.IGetBucketRequest|undefined, {}|undefined + protos.google.logging.v2.IGetBucketRequest|undefined, + {}|undefined ]) => { this._log.info('getBucket response %j', response); return [response, options, rawResponse]; @@ -651,7 +652,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.createBucket(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogBucket, - protos.google.logging.v2.ICreateBucketRequest|undefined, {}|undefined + protos.google.logging.v2.ICreateBucketRequest|undefined, + {}|undefined ]) => { this._log.info('createBucket response %j', response); return [response, options, rawResponse]; @@ -767,7 +769,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.updateBucket(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogBucket, - protos.google.logging.v2.IUpdateBucketRequest|undefined, {}|undefined + protos.google.logging.v2.IUpdateBucketRequest|undefined, + {}|undefined ]) => { this._log.info('updateBucket response %j', response); return [response, options, rawResponse]; @@ -867,7 +870,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.deleteBucket(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.logging.v2.IDeleteBucketRequest|undefined, {}|undefined + protos.google.logging.v2.IDeleteBucketRequest|undefined, + {}|undefined ]) => { this._log.info('deleteBucket response %j', response); return [response, options, rawResponse]; @@ -964,7 +968,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.undeleteBucket(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.logging.v2.IUndeleteBucketRequest|undefined, {}|undefined + protos.google.logging.v2.IUndeleteBucketRequest|undefined, + {}|undefined ]) => { this._log.info('undeleteBucket response %j', response); return [response, options, rawResponse]; @@ -1057,7 +1062,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.getView(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogView, - protos.google.logging.v2.IGetViewRequest|undefined, {}|undefined + protos.google.logging.v2.IGetViewRequest|undefined, + {}|undefined ]) => { this._log.info('getView response %j', response); return [response, options, rawResponse]; @@ -1155,7 +1161,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.createView(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogView, - protos.google.logging.v2.ICreateViewRequest|undefined, {}|undefined + protos.google.logging.v2.ICreateViewRequest|undefined, + {}|undefined ]) => { this._log.info('createView response %j', response); return [response, options, rawResponse]; @@ -1263,7 +1270,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.updateView(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogView, - protos.google.logging.v2.IUpdateViewRequest|undefined, {}|undefined + protos.google.logging.v2.IUpdateViewRequest|undefined, + {}|undefined ]) => { this._log.info('updateView response %j', response); return [response, options, rawResponse]; @@ -1359,7 +1367,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.deleteView(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.logging.v2.IDeleteViewRequest|undefined, {}|undefined + protos.google.logging.v2.IDeleteViewRequest|undefined, + {}|undefined ]) => { this._log.info('deleteView response %j', response); return [response, options, rawResponse]; @@ -1455,7 +1464,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.getSink(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogSink, - protos.google.logging.v2.IGetSinkRequest|undefined, {}|undefined + protos.google.logging.v2.IGetSinkRequest|undefined, + {}|undefined ]) => { this._log.info('getSink response %j', response); return [response, options, rawResponse]; @@ -1570,7 +1580,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.createSink(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogSink, - protos.google.logging.v2.ICreateSinkRequest|undefined, {}|undefined + protos.google.logging.v2.ICreateSinkRequest|undefined, + {}|undefined ]) => { this._log.info('createSink response %j', response); return [response, options, rawResponse]; @@ -1703,7 +1714,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.updateSink(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogSink, - protos.google.logging.v2.IUpdateSinkRequest|undefined, {}|undefined + protos.google.logging.v2.IUpdateSinkRequest|undefined, + {}|undefined ]) => { this._log.info('updateSink response %j', response); return [response, options, rawResponse]; @@ -1801,7 +1813,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.deleteSink(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.logging.v2.IDeleteSinkRequest|undefined, {}|undefined + protos.google.logging.v2.IDeleteSinkRequest|undefined, + {}|undefined ]) => { this._log.info('deleteSink response %j', response); return [response, options, rawResponse]; @@ -1897,7 +1910,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.getExclusion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogExclusion, - protos.google.logging.v2.IGetExclusionRequest|undefined, {}|undefined + protos.google.logging.v2.IGetExclusionRequest|undefined, + {}|undefined ]) => { this._log.info('getExclusion response %j', response); return [response, options, rawResponse]; @@ -1999,7 +2013,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.createExclusion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogExclusion, - protos.google.logging.v2.ICreateExclusionRequest|undefined, {}|undefined + protos.google.logging.v2.ICreateExclusionRequest|undefined, + {}|undefined ]) => { this._log.info('createExclusion response %j', response); return [response, options, rawResponse]; @@ -2107,7 +2122,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.updateExclusion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogExclusion, - protos.google.logging.v2.IUpdateExclusionRequest|undefined, {}|undefined + protos.google.logging.v2.IUpdateExclusionRequest|undefined, + {}|undefined ]) => { this._log.info('updateExclusion response %j', response); return [response, options, rawResponse]; @@ -2203,7 +2219,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.deleteExclusion(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.logging.v2.IDeleteExclusionRequest|undefined, {}|undefined + protos.google.logging.v2.IDeleteExclusionRequest|undefined, + {}|undefined ]) => { this._log.info('deleteExclusion response %j', response); return [response, options, rawResponse]; @@ -2313,7 +2330,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.getCmekSettings(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ICmekSettings, - protos.google.logging.v2.IGetCmekSettingsRequest|undefined, {}|undefined + protos.google.logging.v2.IGetCmekSettingsRequest|undefined, + {}|undefined ]) => { this._log.info('getCmekSettings response %j', response); return [response, options, rawResponse]; @@ -2441,7 +2459,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.updateCmekSettings(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ICmekSettings, - protos.google.logging.v2.IUpdateCmekSettingsRequest|undefined, {}|undefined + protos.google.logging.v2.IUpdateCmekSettingsRequest|undefined, + {}|undefined ]) => { this._log.info('updateCmekSettings response %j', response); return [response, options, rawResponse]; @@ -2551,7 +2570,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.getSettings(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ISettings, - protos.google.logging.v2.IGetSettingsRequest|undefined, {}|undefined + protos.google.logging.v2.IGetSettingsRequest|undefined, + {}|undefined ]) => { this._log.info('getSettings response %j', response); return [response, options, rawResponse]; @@ -2677,7 +2697,8 @@ export class ConfigServiceV2Client { return this.innerApiCalls.updateSettings(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ISettings, - protos.google.logging.v2.IUpdateSettingsRequest|undefined, {}|undefined + protos.google.logging.v2.IUpdateSettingsRequest|undefined, + {}|undefined ]) => { this._log.info('updateSettings response %j', response); return [response, options, rawResponse]; @@ -2759,9 +2780,9 @@ export class ConfigServiceV2Client { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('copyLogEntries response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline index 583fbc707..cb9aaf8bd 100644 --- a/baselines/logging/src/v2/logging_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/logging_service_v2_client.ts.baseline @@ -555,7 +555,8 @@ export class LoggingServiceV2Client { return this.innerApiCalls.deleteLog(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.logging.v2.IDeleteLogRequest|undefined, {}|undefined + protos.google.logging.v2.IDeleteLogRequest|undefined, + {}|undefined ]) => { this._log.info('deleteLog response %j', response); return [response, options, rawResponse]; @@ -708,7 +709,8 @@ export class LoggingServiceV2Client { return this.innerApiCalls.writeLogEntries(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.IWriteLogEntriesResponse, - protos.google.logging.v2.IWriteLogEntriesRequest|undefined, {}|undefined + protos.google.logging.v2.IWriteLogEntriesRequest|undefined, + {}|undefined ]) => { this._log.info('writeLogEntries response %j', response); return [response, options, rawResponse]; diff --git a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline index f4b47057b..3c1bdc632 100644 --- a/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline +++ b/baselines/logging/src/v2/metrics_service_v2_client.ts.baseline @@ -507,7 +507,8 @@ export class MetricsServiceV2Client { return this.innerApiCalls.getLogMetric(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogMetric, - protos.google.logging.v2.IGetLogMetricRequest|undefined, {}|undefined + protos.google.logging.v2.IGetLogMetricRequest|undefined, + {}|undefined ]) => { this._log.info('getLogMetric response %j', response); return [response, options, rawResponse]; @@ -601,7 +602,8 @@ export class MetricsServiceV2Client { return this.innerApiCalls.createLogMetric(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogMetric, - protos.google.logging.v2.ICreateLogMetricRequest|undefined, {}|undefined + protos.google.logging.v2.ICreateLogMetricRequest|undefined, + {}|undefined ]) => { this._log.info('createLogMetric response %j', response); return [response, options, rawResponse]; @@ -696,7 +698,8 @@ export class MetricsServiceV2Client { return this.innerApiCalls.updateLogMetric(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.logging.v2.ILogMetric, - protos.google.logging.v2.IUpdateLogMetricRequest|undefined, {}|undefined + protos.google.logging.v2.IUpdateLogMetricRequest|undefined, + {}|undefined ]) => { this._log.info('updateLogMetric response %j', response); return [response, options, rawResponse]; @@ -785,7 +788,8 @@ export class MetricsServiceV2Client { return this.innerApiCalls.deleteLogMetric(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.logging.v2.IDeleteLogMetricRequest|undefined, {}|undefined + protos.google.logging.v2.IDeleteLogMetricRequest|undefined, + {}|undefined ]) => { this._log.info('deleteLogMetric response %j', response); return [response, options, rawResponse]; diff --git a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline index 91ee198b1..421bfbe02 100644 --- a/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/alert_policy_service_client.ts.baseline @@ -495,7 +495,8 @@ export class AlertPolicyServiceClient { return this.innerApiCalls.getAlertPolicy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IAlertPolicy, - protos.google.monitoring.v3.IGetAlertPolicyRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetAlertPolicyRequest|undefined, + {}|undefined ]) => { this._log.info('getAlertPolicy response %j', response); return [response, options, rawResponse]; @@ -593,7 +594,8 @@ export class AlertPolicyServiceClient { return this.innerApiCalls.createAlertPolicy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IAlertPolicy, - protos.google.monitoring.v3.ICreateAlertPolicyRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateAlertPolicyRequest|undefined, + {}|undefined ]) => { this._log.info('createAlertPolicy response %j', response); return [response, options, rawResponse]; @@ -684,7 +686,8 @@ export class AlertPolicyServiceClient { return this.innerApiCalls.deleteAlertPolicy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.IDeleteAlertPolicyRequest|undefined, {}|undefined + protos.google.monitoring.v3.IDeleteAlertPolicyRequest|undefined, + {}|undefined ]) => { this._log.info('deleteAlertPolicy response %j', response); return [response, options, rawResponse]; @@ -799,7 +802,8 @@ export class AlertPolicyServiceClient { return this.innerApiCalls.updateAlertPolicy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IAlertPolicy, - protos.google.monitoring.v3.IUpdateAlertPolicyRequest|undefined, {}|undefined + protos.google.monitoring.v3.IUpdateAlertPolicyRequest|undefined, + {}|undefined ]) => { this._log.info('updateAlertPolicy response %j', response); return [response, options, rawResponse]; diff --git a/baselines/monitoring/src/v3/group_service_client.ts.baseline b/baselines/monitoring/src/v3/group_service_client.ts.baseline index a1499d78e..67f7c50b3 100644 --- a/baselines/monitoring/src/v3/group_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/group_service_client.ts.baseline @@ -499,7 +499,8 @@ export class GroupServiceClient { return this.innerApiCalls.getGroup(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IGroup, - protos.google.monitoring.v3.IGetGroupRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetGroupRequest|undefined, + {}|undefined ]) => { this._log.info('getGroup response %j', response); return [response, options, rawResponse]; @@ -592,7 +593,8 @@ export class GroupServiceClient { return this.innerApiCalls.createGroup(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IGroup, - protos.google.monitoring.v3.ICreateGroupRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateGroupRequest|undefined, + {}|undefined ]) => { this._log.info('createGroup response %j', response); return [response, options, rawResponse]; @@ -683,7 +685,8 @@ export class GroupServiceClient { return this.innerApiCalls.updateGroup(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IGroup, - protos.google.monitoring.v3.IUpdateGroupRequest|undefined, {}|undefined + protos.google.monitoring.v3.IUpdateGroupRequest|undefined, + {}|undefined ]) => { this._log.info('updateGroup response %j', response); return [response, options, rawResponse]; @@ -775,7 +778,8 @@ export class GroupServiceClient { return this.innerApiCalls.deleteGroup(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.IDeleteGroupRequest|undefined, {}|undefined + protos.google.monitoring.v3.IDeleteGroupRequest|undefined, + {}|undefined ]) => { this._log.info('deleteGroup response %j', response); return [response, options, rawResponse]; diff --git a/baselines/monitoring/src/v3/metric_service_client.ts.baseline b/baselines/monitoring/src/v3/metric_service_client.ts.baseline index eba9f1059..480002d45 100644 --- a/baselines/monitoring/src/v3/metric_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/metric_service_client.ts.baseline @@ -512,7 +512,8 @@ export class MetricServiceClient { return this.innerApiCalls.getMonitoredResourceDescriptor(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.api.IMonitoredResourceDescriptor, - protos.google.monitoring.v3.IGetMonitoredResourceDescriptorRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetMonitoredResourceDescriptorRequest|undefined, + {}|undefined ]) => { this._log.info('getMonitoredResourceDescriptor response %j', response); return [response, options, rawResponse]; @@ -602,7 +603,8 @@ export class MetricServiceClient { return this.innerApiCalls.getMetricDescriptor(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.api.IMetricDescriptor, - protos.google.monitoring.v3.IGetMetricDescriptorRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetMetricDescriptorRequest|undefined, + {}|undefined ]) => { this._log.info('getMetricDescriptor response %j', response); return [response, options, rawResponse]; @@ -695,7 +697,8 @@ export class MetricServiceClient { return this.innerApiCalls.createMetricDescriptor(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.api.IMetricDescriptor, - protos.google.monitoring.v3.ICreateMetricDescriptorRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateMetricDescriptorRequest|undefined, + {}|undefined ]) => { this._log.info('createMetricDescriptor response %j', response); return [response, options, rawResponse]; @@ -786,7 +789,8 @@ export class MetricServiceClient { return this.innerApiCalls.deleteMetricDescriptor(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.IDeleteMetricDescriptorRequest|undefined, {}|undefined + protos.google.monitoring.v3.IDeleteMetricDescriptorRequest|undefined, + {}|undefined ]) => { this._log.info('deleteMetricDescriptor response %j', response); return [response, options, rawResponse]; @@ -885,7 +889,8 @@ export class MetricServiceClient { return this.innerApiCalls.createTimeSeries(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.ICreateTimeSeriesRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateTimeSeriesRequest|undefined, + {}|undefined ]) => { this._log.info('createTimeSeries response %j', response); return [response, options, rawResponse]; diff --git a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline index 648ba91ad..6eec8924b 100644 --- a/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/notification_channel_service_client.ts.baseline @@ -490,7 +490,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.getNotificationChannelDescriptor(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.INotificationChannelDescriptor, - protos.google.monitoring.v3.IGetNotificationChannelDescriptorRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetNotificationChannelDescriptorRequest|undefined, + {}|undefined ]) => { this._log.info('getNotificationChannelDescriptor response %j', response); return [response, options, rawResponse]; @@ -582,7 +583,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.getNotificationChannel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.INotificationChannel, - protos.google.monitoring.v3.IGetNotificationChannelRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetNotificationChannelRequest|undefined, + {}|undefined ]) => { this._log.info('getNotificationChannel response %j', response); return [response, options, rawResponse]; @@ -679,7 +681,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.createNotificationChannel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.INotificationChannel, - protos.google.monitoring.v3.ICreateNotificationChannelRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateNotificationChannelRequest|undefined, + {}|undefined ]) => { this._log.info('createNotificationChannel response %j', response); return [response, options, rawResponse]; @@ -772,7 +775,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.updateNotificationChannel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.INotificationChannel, - protos.google.monitoring.v3.IUpdateNotificationChannelRequest|undefined, {}|undefined + protos.google.monitoring.v3.IUpdateNotificationChannelRequest|undefined, + {}|undefined ]) => { this._log.info('updateNotificationChannel response %j', response); return [response, options, rawResponse]; @@ -865,7 +869,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.deleteNotificationChannel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.IDeleteNotificationChannelRequest|undefined, {}|undefined + protos.google.monitoring.v3.IDeleteNotificationChannelRequest|undefined, + {}|undefined ]) => { this._log.info('deleteNotificationChannel response %j', response); return [response, options, rawResponse]; @@ -953,7 +958,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.sendNotificationChannelVerificationCode(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.ISendNotificationChannelVerificationCodeRequest|undefined, {}|undefined + protos.google.monitoring.v3.ISendNotificationChannelVerificationCodeRequest|undefined, + {}|undefined ]) => { this._log.info('sendNotificationChannelVerificationCode response %j', response); return [response, options, rawResponse]; @@ -1072,7 +1078,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.getNotificationChannelVerificationCode(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeResponse, - protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetNotificationChannelVerificationCodeRequest|undefined, + {}|undefined ]) => { this._log.info('getNotificationChannelVerificationCode response %j', response); return [response, options, rawResponse]; @@ -1169,7 +1176,8 @@ export class NotificationChannelServiceClient { return this.innerApiCalls.verifyNotificationChannel(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.INotificationChannel, - protos.google.monitoring.v3.IVerifyNotificationChannelRequest|undefined, {}|undefined + protos.google.monitoring.v3.IVerifyNotificationChannelRequest|undefined, + {}|undefined ]) => { this._log.info('verifyNotificationChannel response %j', response); return [response, options, rawResponse]; diff --git a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline index c95e881e2..a7cce3de3 100644 --- a/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/service_monitoring_service_client.ts.baseline @@ -496,7 +496,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.createService(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IService, - protos.google.monitoring.v3.ICreateServiceRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateServiceRequest|undefined, + {}|undefined ]) => { this._log.info('createService response %j', response); return [response, options, rawResponse]; @@ -584,7 +585,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.getService(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IService, - protos.google.monitoring.v3.IGetServiceRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetServiceRequest|undefined, + {}|undefined ]) => { this._log.info('getService response %j', response); return [response, options, rawResponse]; @@ -674,7 +676,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.updateService(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IService, - protos.google.monitoring.v3.IUpdateServiceRequest|undefined, {}|undefined + protos.google.monitoring.v3.IUpdateServiceRequest|undefined, + {}|undefined ]) => { this._log.info('updateService response %j', response); return [response, options, rawResponse]; @@ -762,7 +765,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.deleteService(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.IDeleteServiceRequest|undefined, {}|undefined + protos.google.monitoring.v3.IDeleteServiceRequest|undefined, + {}|undefined ]) => { this._log.info('deleteService response %j', response); return [response, options, rawResponse]; @@ -858,7 +862,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.createServiceLevelObjective(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IServiceLevelObjective, - protos.google.monitoring.v3.ICreateServiceLevelObjectiveRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateServiceLevelObjectiveRequest|undefined, + {}|undefined ]) => { this._log.info('createServiceLevelObjective response %j', response); return [response, options, rawResponse]; @@ -952,7 +957,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.getServiceLevelObjective(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IServiceLevelObjective, - protos.google.monitoring.v3.IGetServiceLevelObjectiveRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetServiceLevelObjectiveRequest|undefined, + {}|undefined ]) => { this._log.info('getServiceLevelObjective response %j', response); return [response, options, rawResponse]; @@ -1042,7 +1048,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.updateServiceLevelObjective(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IServiceLevelObjective, - protos.google.monitoring.v3.IUpdateServiceLevelObjectiveRequest|undefined, {}|undefined + protos.google.monitoring.v3.IUpdateServiceLevelObjectiveRequest|undefined, + {}|undefined ]) => { this._log.info('updateServiceLevelObjective response %j', response); return [response, options, rawResponse]; @@ -1131,7 +1138,8 @@ export class ServiceMonitoringServiceClient { return this.innerApiCalls.deleteServiceLevelObjective(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.IDeleteServiceLevelObjectiveRequest|undefined, {}|undefined + protos.google.monitoring.v3.IDeleteServiceLevelObjectiveRequest|undefined, + {}|undefined ]) => { this._log.info('deleteServiceLevelObjective response %j', response); return [response, options, rawResponse]; diff --git a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline index cf466fc43..47719ebe4 100644 --- a/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline +++ b/baselines/monitoring/src/v3/uptime_check_service_client.ts.baseline @@ -495,7 +495,8 @@ export class UptimeCheckServiceClient { return this.innerApiCalls.getUptimeCheckConfig(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IUptimeCheckConfig, - protos.google.monitoring.v3.IGetUptimeCheckConfigRequest|undefined, {}|undefined + protos.google.monitoring.v3.IGetUptimeCheckConfigRequest|undefined, + {}|undefined ]) => { this._log.info('getUptimeCheckConfig response %j', response); return [response, options, rawResponse]; @@ -585,7 +586,8 @@ export class UptimeCheckServiceClient { return this.innerApiCalls.createUptimeCheckConfig(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IUptimeCheckConfig, - protos.google.monitoring.v3.ICreateUptimeCheckConfigRequest|undefined, {}|undefined + protos.google.monitoring.v3.ICreateUptimeCheckConfigRequest|undefined, + {}|undefined ]) => { this._log.info('createUptimeCheckConfig response %j', response); return [response, options, rawResponse]; @@ -690,7 +692,8 @@ export class UptimeCheckServiceClient { return this.innerApiCalls.updateUptimeCheckConfig(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.monitoring.v3.IUptimeCheckConfig, - protos.google.monitoring.v3.IUpdateUptimeCheckConfigRequest|undefined, {}|undefined + protos.google.monitoring.v3.IUpdateUptimeCheckConfigRequest|undefined, + {}|undefined ]) => { this._log.info('updateUptimeCheckConfig response %j', response); return [response, options, rawResponse]; @@ -780,7 +783,8 @@ export class UptimeCheckServiceClient { return this.innerApiCalls.deleteUptimeCheckConfig(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.monitoring.v3.IDeleteUptimeCheckConfigRequest|undefined, {}|undefined + protos.google.monitoring.v3.IDeleteUptimeCheckConfigRequest|undefined, + {}|undefined ]) => { this._log.info('deleteUptimeCheckConfig response %j', response); return [response, options, rawResponse]; diff --git a/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline b/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline index de2bd3e10..699fb4a7f 100644 --- a/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline +++ b/baselines/naming-esm/esm/src/v1beta1/naming_client.ts.baseline @@ -1318,12 +1318,12 @@ export class NamingClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('longRunning response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('longRunning request %j', request); diff --git a/baselines/naming/src/v1beta1/naming_client.ts.baseline b/baselines/naming/src/v1beta1/naming_client.ts.baseline index 8204a3104..127dc4415 100644 --- a/baselines/naming/src/v1beta1/naming_client.ts.baseline +++ b/baselines/naming/src/v1beta1/naming_client.ts.baseline @@ -434,7 +434,8 @@ export class NamingClient { return this.innerApiCalls.paginatedMethodStream(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('paginatedMethodStream response %j', response); return [response, options, rawResponse]; @@ -513,7 +514,8 @@ export class NamingClient { return this.innerApiCalls.paginatedMethodAsync(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('paginatedMethodAsync response %j', response); return [response, options, rawResponse]; @@ -592,7 +594,8 @@ export class NamingClient { return this.innerApiCalls.checkLongRunningProgress(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('checkLongRunningProgress response %j', response); return [response, options, rawResponse]; @@ -672,7 +675,8 @@ export class NamingClient { return this.innerApiCalls.initialize(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('initialize response %j', response); return [response, options, rawResponse]; @@ -751,7 +755,8 @@ export class NamingClient { return this.innerApiCalls.servicePath(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('servicePath response %j', response); return [response, options, rawResponse]; @@ -830,7 +835,8 @@ export class NamingClient { return this.innerApiCalls.apiEndpoint(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('apiEndpoint response %j', response); return [response, options, rawResponse]; @@ -909,7 +915,8 @@ export class NamingClient { return this.innerApiCalls.port(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('port response %j', response); return [response, options, rawResponse]; @@ -988,7 +995,8 @@ export class NamingClient { return this.innerApiCalls.scopes(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('scopes response %j', response); return [response, options, rawResponse]; @@ -1067,7 +1075,8 @@ export class NamingClient { return this.innerApiCalls.getProjectId(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('getProjectId response %j', response); return [response, options, rawResponse]; @@ -1147,7 +1156,8 @@ export class NamingClient { return this.innerApiCalls.getReservedWord(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.naming.v1beta1.IReservedWord, - protos.google.naming.v1beta1.IGetReservedWordRequest|undefined, {}|undefined + protos.google.naming.v1beta1.IGetReservedWordRequest|undefined, + {}|undefined ]) => { this._log.info('getReservedWord response %j', response); return [response, options, rawResponse]; @@ -1226,7 +1236,8 @@ export class NamingClient { return this.innerApiCalls.createAbcdeSomething(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.protobuf.IEmpty|undefined, {}|undefined + protos.google.protobuf.IEmpty|undefined, + {}|undefined ]) => { this._log.info('createABCDESomething response %j', response); return [response, options, rawResponse]; @@ -1297,9 +1308,9 @@ export class NamingClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize1(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('longRunning response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline index 7c38dc214..9821bebdc 100644 --- a/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis-esm/esm/src/v1beta1/cloud_redis_client.ts.baseline @@ -623,12 +623,12 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('createInstance response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('createInstance request %j', request); @@ -744,12 +744,12 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('updateInstance response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('updateInstance request %j', request); @@ -862,12 +862,12 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('importInstance response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('importInstance request %j', request); @@ -978,12 +978,12 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('exportInstance response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('exportInstance request %j', request); @@ -1091,12 +1091,12 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('failoverInstance response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('failoverInstance request %j', request); @@ -1201,12 +1201,12 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('deleteInstance response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('deleteInstance request %j', request); diff --git a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline index 13d9f5a9e..ea8ef428c 100644 --- a/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline +++ b/baselines/redis/src/v1beta1/cloud_redis_client.ts.baseline @@ -500,7 +500,8 @@ export class CloudRedisClient { return this.innerApiCalls.getInstance(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.redis.v1beta1.IInstance, - protos.google.cloud.redis.v1beta1.IGetInstanceRequest|undefined, {}|undefined + protos.google.cloud.redis.v1beta1.IGetInstanceRequest|undefined, + {}|undefined ]) => { this._log.info('getInstance response %j', response); return [response, options, rawResponse]; @@ -602,9 +603,9 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('createInstance response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. @@ -723,9 +724,9 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('updateInstance response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. @@ -841,9 +842,9 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('importInstance response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. @@ -957,9 +958,9 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('exportInstance response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. @@ -1070,9 +1071,9 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('failoverInstance response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. @@ -1180,9 +1181,9 @@ export class CloudRedisClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('deleteInstance response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/routingtest/src/v1/test_service_client.ts.baseline b/baselines/routingtest/src/v1/test_service_client.ts.baseline index ef944e96e..1fd1959bb 100644 --- a/baselines/routingtest/src/v1/test_service_client.ts.baseline +++ b/baselines/routingtest/src/v1/test_service_client.ts.baseline @@ -413,7 +413,8 @@ export class TestServiceClient { return this.innerApiCalls.fastFibonacci(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + protos.google.routingtest.v1.IFibonacciRequest|undefined, + {}|undefined ]) => { this._log.info('fastFibonacci response %j', response); return [response, options, rawResponse]; @@ -527,7 +528,8 @@ export class TestServiceClient { return this.innerApiCalls.randomFibonacci(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + protos.google.routingtest.v1.IFibonacciRequest|undefined, + {}|undefined ]) => { this._log.info('randomFibonacci response %j', response); return [response, options, rawResponse]; @@ -651,7 +653,8 @@ export class TestServiceClient { return this.innerApiCalls.slowFibonacci(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.routingtest.v1.IFibonacciRequest|undefined, {}|undefined + protos.google.routingtest.v1.IFibonacciRequest|undefined, + {}|undefined ]) => { this._log.info('slowFibonacci response %j', response); return [response, options, rawResponse]; diff --git a/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline index 4ca7fe74f..ac3b4b1e0 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -1068,12 +1068,12 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('wait response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('wait request %j', request); diff --git a/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline index 521de792a..d4ecf1b5e 100644 --- a/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase-esm/esm/src/v1beta1/messaging_client.ts.baseline @@ -1333,12 +1333,12 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('searchBlurbs response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('searchBlurbs request %j', request); diff --git a/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline index fb548b705..9961526df 100644 --- a/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-legacy-esm/esm/src/v1beta1/echo_client.ts.baseline @@ -993,12 +993,12 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('wait response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('wait request %j', request); diff --git a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline index 816e18659..cda130e58 100644 --- a/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase-legacy/src/v1beta1/echo_client.ts.baseline @@ -521,7 +521,8 @@ export class EchoClient { return this.innerApiCalls.echo(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEchoResponse, - protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEchoRequest|undefined, + {}|undefined ]) => { this._log.info('echo response %j', response); return [response, options, rawResponse]; @@ -612,7 +613,8 @@ export class EchoClient { return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, - protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, + {}|undefined ]) => { this._log.info('echoErrorDetails response %j', response); return [response, options, rawResponse]; @@ -702,7 +704,8 @@ export class EchoClient { return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IPagedExpandResponse, - protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, + {}|undefined ]) => { this._log.info('pagedExpandLegacy response %j', response); return [response, options, rawResponse]; @@ -791,7 +794,8 @@ export class EchoClient { return this.innerApiCalls.block(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlockResponse, - protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IBlockRequest|undefined, + {}|undefined ]) => { this._log.info('block response %j', response); return [response, options, rawResponse]; @@ -977,9 +981,9 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('wait response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/showcase/src/v1beta1/compliance_client.ts.baseline b/baselines/showcase/src/v1beta1/compliance_client.ts.baseline index 6ba40a9c0..233fe7937 100644 --- a/baselines/showcase/src/v1beta1/compliance_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/compliance_client.ts.baseline @@ -447,7 +447,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBody(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBody response %j', response); return [response, options, rawResponse]; @@ -544,7 +545,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBodyInfo(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBodyInfo response %j', response); return [response, options, rawResponse]; @@ -640,7 +642,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataQuery(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataQuery response %j', response); return [response, options, rawResponse]; @@ -746,7 +749,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataSimplePath(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataSimplePath response %j', response); return [response, options, rawResponse]; @@ -848,7 +852,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataPathResource(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataPathResource response %j', response); return [response, options, rawResponse]; @@ -949,7 +954,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataPathTrailingResource(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataPathTrailingResource response %j', response); return [response, options, rawResponse]; @@ -1044,7 +1050,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBodyPut(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBodyPut response %j', response); return [response, options, rawResponse]; @@ -1139,7 +1146,8 @@ export class ComplianceClient { return this.innerApiCalls.repeatDataBodyPatch(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRepeatResponse, - protos.google.showcase.v1beta1.IRepeatRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IRepeatRequest|undefined, + {}|undefined ]) => { this._log.info('repeatDataBodyPatch response %j', response); return [response, options, rawResponse]; @@ -1226,7 +1234,8 @@ export class ComplianceClient { return this.innerApiCalls.getEnum(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEnumResponse, - protos.google.showcase.v1beta1.IEnumRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEnumRequest|undefined, + {}|undefined ]) => { this._log.info('getEnum response %j', response); return [response, options, rawResponse]; @@ -1315,7 +1324,8 @@ export class ComplianceClient { return this.innerApiCalls.verifyEnum(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEnumResponse, - protos.google.showcase.v1beta1.IEnumResponse|undefined, {}|undefined + protos.google.showcase.v1beta1.IEnumResponse|undefined, + {}|undefined ]) => { this._log.info('verifyEnum response %j', response); return [response, options, rawResponse]; diff --git a/baselines/showcase/src/v1beta1/echo_client.ts.baseline b/baselines/showcase/src/v1beta1/echo_client.ts.baseline index 0c5ec8baf..7ebac54c3 100644 --- a/baselines/showcase/src/v1beta1/echo_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/echo_client.ts.baseline @@ -591,7 +591,8 @@ export class EchoClient { return this.innerApiCalls.echo(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEchoResponse, - protos.google.showcase.v1beta1.IEchoRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEchoRequest|undefined, + {}|undefined ]) => { this._log.info('echo response %j', response); return [response, options, rawResponse]; @@ -682,7 +683,8 @@ export class EchoClient { return this.innerApiCalls.echoErrorDetails(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IEchoErrorDetailsResponse, - protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IEchoErrorDetailsRequest|undefined, + {}|undefined ]) => { this._log.info('echoErrorDetails response %j', response); return [response, options, rawResponse]; @@ -772,7 +774,8 @@ export class EchoClient { return this.innerApiCalls.pagedExpandLegacy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IPagedExpandResponse, - protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IPagedExpandLegacyRequest|undefined, + {}|undefined ]) => { this._log.info('pagedExpandLegacy response %j', response); return [response, options, rawResponse]; @@ -861,7 +864,8 @@ export class EchoClient { return this.innerApiCalls.block(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlockResponse, - protos.google.showcase.v1beta1.IBlockRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IBlockRequest|undefined, + {}|undefined ]) => { this._log.info('block response %j', response); return [response, options, rawResponse]; @@ -1047,9 +1051,9 @@ export class EchoClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('wait response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/showcase/src/v1beta1/identity_client.ts.baseline b/baselines/showcase/src/v1beta1/identity_client.ts.baseline index b320a0b9a..c48ac3b41 100644 --- a/baselines/showcase/src/v1beta1/identity_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/identity_client.ts.baseline @@ -440,7 +440,8 @@ export class IdentityClient { return this.innerApiCalls.createUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IUser, - protos.google.showcase.v1beta1.ICreateUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateUserRequest|undefined, + {}|undefined ]) => { this._log.info('createUser response %j', response); return [response, options, rawResponse]; @@ -527,7 +528,8 @@ export class IdentityClient { return this.innerApiCalls.getUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IUser, - protos.google.showcase.v1beta1.IGetUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetUserRequest|undefined, + {}|undefined ]) => { this._log.info('getUser response %j', response); return [response, options, rawResponse]; @@ -617,7 +619,8 @@ export class IdentityClient { return this.innerApiCalls.updateUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IUser, - protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IUpdateUserRequest|undefined, + {}|undefined ]) => { this._log.info('updateUser response %j', response); return [response, options, rawResponse]; @@ -704,7 +707,8 @@ export class IdentityClient { return this.innerApiCalls.deleteUser(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteUserRequest|undefined, + {}|undefined ]) => { this._log.info('deleteUser response %j', response); return [response, options, rawResponse]; diff --git a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline index 42e28391e..456020ae4 100644 --- a/baselines/showcase/src/v1beta1/messaging_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/messaging_client.ts.baseline @@ -491,7 +491,8 @@ export class MessagingClient { return this.innerApiCalls.createRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRoom, - protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateRoomRequest|undefined, + {}|undefined ]) => { this._log.info('createRoom response %j', response); return [response, options, rawResponse]; @@ -578,7 +579,8 @@ export class MessagingClient { return this.innerApiCalls.getRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRoom, - protos.google.showcase.v1beta1.IGetRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetRoomRequest|undefined, + {}|undefined ]) => { this._log.info('getRoom response %j', response); return [response, options, rawResponse]; @@ -668,7 +670,8 @@ export class MessagingClient { return this.innerApiCalls.updateRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IRoom, - protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IUpdateRoomRequest|undefined, + {}|undefined ]) => { this._log.info('updateRoom response %j', response); return [response, options, rawResponse]; @@ -755,7 +758,8 @@ export class MessagingClient { return this.innerApiCalls.deleteRoom(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteRoomRequest|undefined, + {}|undefined ]) => { this._log.info('deleteRoom response %j', response); return [response, options, rawResponse]; @@ -847,7 +851,8 @@ export class MessagingClient { return this.innerApiCalls.createBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlurb, - protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('createBlurb response %j', response); return [response, options, rawResponse]; @@ -934,7 +939,8 @@ export class MessagingClient { return this.innerApiCalls.getBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlurb, - protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('getBlurb response %j', response); return [response, options, rawResponse]; @@ -1024,7 +1030,8 @@ export class MessagingClient { return this.innerApiCalls.updateBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IBlurb, - protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IUpdateBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('updateBlurb response %j', response); return [response, options, rawResponse]; @@ -1111,7 +1118,8 @@ export class MessagingClient { return this.innerApiCalls.deleteBlurb(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteBlurbRequest|undefined, + {}|undefined ]) => { this._log.info('deleteBlurb response %j', response); return [response, options, rawResponse]; @@ -1312,9 +1320,9 @@ export class MessagingClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('searchBlurbs response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline b/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline index 9f9bf111c..df9d8086a 100644 --- a/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/sequence_service_client.ts.baseline @@ -429,7 +429,8 @@ export class SequenceServiceClient { return this.innerApiCalls.createSequence(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISequence, - protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateSequenceRequest|undefined, + {}|undefined ]) => { this._log.info('createSequence response %j', response); return [response, options, rawResponse]; @@ -515,7 +516,8 @@ export class SequenceServiceClient { return this.innerApiCalls.getSequenceReport(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISequenceReport, - protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetSequenceReportRequest|undefined, + {}|undefined ]) => { this._log.info('getSequenceReport response %j', response); return [response, options, rawResponse]; @@ -601,7 +603,8 @@ export class SequenceServiceClient { return this.innerApiCalls.attemptSequence(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IAttemptSequenceRequest|undefined, + {}|undefined ]) => { this._log.info('attemptSequence response %j', response); return [response, options, rawResponse]; diff --git a/baselines/showcase/src/v1beta1/testing_client.ts.baseline b/baselines/showcase/src/v1beta1/testing_client.ts.baseline index f95ef2358..3bace1f25 100644 --- a/baselines/showcase/src/v1beta1/testing_client.ts.baseline +++ b/baselines/showcase/src/v1beta1/testing_client.ts.baseline @@ -445,7 +445,8 @@ export class TestingClient { return this.innerApiCalls.createSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISession, - protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.ICreateSessionRequest|undefined, + {}|undefined ]) => { this._log.info('createSession response %j', response); return [response, options, rawResponse]; @@ -532,7 +533,8 @@ export class TestingClient { return this.innerApiCalls.getSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.ISession, - protos.google.showcase.v1beta1.IGetSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IGetSessionRequest|undefined, + {}|undefined ]) => { this._log.info('getSession response %j', response); return [response, options, rawResponse]; @@ -619,7 +621,8 @@ export class TestingClient { return this.innerApiCalls.deleteSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteSessionRequest|undefined, + {}|undefined ]) => { this._log.info('deleteSession response %j', response); return [response, options, rawResponse]; @@ -708,7 +711,8 @@ export class TestingClient { return this.innerApiCalls.reportSession(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IReportSessionResponse, - protos.google.showcase.v1beta1.IReportSessionRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IReportSessionRequest|undefined, + {}|undefined ]) => { this._log.info('reportSession response %j', response); return [response, options, rawResponse]; @@ -800,7 +804,8 @@ export class TestingClient { return this.innerApiCalls.deleteTest(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IDeleteTestRequest|undefined, + {}|undefined ]) => { this._log.info('deleteTest response %j', response); return [response, options, rawResponse]; @@ -894,7 +899,8 @@ export class TestingClient { return this.innerApiCalls.verifyTest(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.showcase.v1beta1.IVerifyTestResponse, - protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, {}|undefined + protos.google.showcase.v1beta1.IVerifyTestRequest|undefined, + {}|undefined ]) => { this._log.info('verifyTest response %j', response); return [response, options, rawResponse]; diff --git a/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline b/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline index a89f11ae3..8f07d65f7 100644 --- a/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline +++ b/baselines/tasks/src/v2/cloud_tasks_client.ts.baseline @@ -421,7 +421,8 @@ export class CloudTasksClient { return this.innerApiCalls.getQueue(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.IQueue, - protos.google.cloud.tasks.v2.IGetQueueRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IGetQueueRequest|undefined, + {}|undefined ]) => { this._log.info('getQueue response %j', response); return [response, options, rawResponse]; @@ -528,7 +529,8 @@ export class CloudTasksClient { return this.innerApiCalls.createQueue(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.IQueue, - protos.google.cloud.tasks.v2.ICreateQueueRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.ICreateQueueRequest|undefined, + {}|undefined ]) => { this._log.info('createQueue response %j', response); return [response, options, rawResponse]; @@ -639,7 +641,8 @@ export class CloudTasksClient { return this.innerApiCalls.updateQueue(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.IQueue, - protos.google.cloud.tasks.v2.IUpdateQueueRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IUpdateQueueRequest|undefined, + {}|undefined ]) => { this._log.info('updateQueue response %j', response); return [response, options, rawResponse]; @@ -739,7 +742,8 @@ export class CloudTasksClient { return this.innerApiCalls.deleteQueue(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.tasks.v2.IDeleteQueueRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IDeleteQueueRequest|undefined, + {}|undefined ]) => { this._log.info('deleteQueue response %j', response); return [response, options, rawResponse]; @@ -832,7 +836,8 @@ export class CloudTasksClient { return this.innerApiCalls.purgeQueue(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.IQueue, - protos.google.cloud.tasks.v2.IPurgeQueueRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IPurgeQueueRequest|undefined, + {}|undefined ]) => { this._log.info('purgeQueue response %j', response); return [response, options, rawResponse]; @@ -926,7 +931,8 @@ export class CloudTasksClient { return this.innerApiCalls.pauseQueue(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.IQueue, - protos.google.cloud.tasks.v2.IPauseQueueRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IPauseQueueRequest|undefined, + {}|undefined ]) => { this._log.info('pauseQueue response %j', response); return [response, options, rawResponse]; @@ -1026,7 +1032,8 @@ export class CloudTasksClient { return this.innerApiCalls.resumeQueue(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.IQueue, - protos.google.cloud.tasks.v2.IResumeQueueRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IResumeQueueRequest|undefined, + {}|undefined ]) => { this._log.info('resumeQueue response %j', response); return [response, options, rawResponse]; @@ -1125,7 +1132,8 @@ export class CloudTasksClient { return this.innerApiCalls.getIamPolicy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.iam.v1.IPolicy, - protos.google.iam.v1.IGetIamPolicyRequest|undefined, {}|undefined + protos.google.iam.v1.IGetIamPolicyRequest|undefined, + {}|undefined ]) => { this._log.info('getIamPolicy response %j', response); return [response, options, rawResponse]; @@ -1228,7 +1236,8 @@ export class CloudTasksClient { return this.innerApiCalls.setIamPolicy(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.iam.v1.IPolicy, - protos.google.iam.v1.ISetIamPolicyRequest|undefined, {}|undefined + protos.google.iam.v1.ISetIamPolicyRequest|undefined, + {}|undefined ]) => { this._log.info('setIamPolicy response %j', response); return [response, options, rawResponse]; @@ -1327,7 +1336,8 @@ export class CloudTasksClient { return this.innerApiCalls.testIamPermissions(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.iam.v1.ITestIamPermissionsResponse, - protos.google.iam.v1.ITestIamPermissionsRequest|undefined, {}|undefined + protos.google.iam.v1.ITestIamPermissionsRequest|undefined, + {}|undefined ]) => { this._log.info('testIamPermissions response %j', response); return [response, options, rawResponse]; @@ -1428,7 +1438,8 @@ export class CloudTasksClient { return this.innerApiCalls.getTask(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.ITask, - protos.google.cloud.tasks.v2.IGetTaskRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IGetTaskRequest|undefined, + {}|undefined ]) => { this._log.info('getTask response %j', response); return [response, options, rawResponse]; @@ -1569,7 +1580,8 @@ export class CloudTasksClient { return this.innerApiCalls.createTask(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.ITask, - protos.google.cloud.tasks.v2.ICreateTaskRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.ICreateTaskRequest|undefined, + {}|undefined ]) => { this._log.info('createTask response %j', response); return [response, options, rawResponse]; @@ -1661,7 +1673,8 @@ export class CloudTasksClient { return this.innerApiCalls.deleteTask(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.protobuf.IEmpty, - protos.google.cloud.tasks.v2.IDeleteTaskRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IDeleteTaskRequest|undefined, + {}|undefined ]) => { this._log.info('deleteTask response %j', response); return [response, options, rawResponse]; @@ -1785,7 +1798,8 @@ export class CloudTasksClient { return this.innerApiCalls.runTask(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.tasks.v2.ITask, - protos.google.cloud.tasks.v2.IRunTaskRequest|undefined, {}|undefined + protos.google.cloud.tasks.v2.IRunTaskRequest|undefined, + {}|undefined ]) => { this._log.info('runTask response %j', response); return [response, options, rawResponse]; diff --git a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline index 2a257ad0b..0fe6bffe2 100644 --- a/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline +++ b/baselines/texttospeech/src/v1/text_to_speech_client.ts.baseline @@ -397,7 +397,8 @@ export class TextToSpeechClient { return this.innerApiCalls.listVoices(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.texttospeech.v1.IListVoicesResponse, - protos.google.cloud.texttospeech.v1.IListVoicesRequest|undefined, {}|undefined + protos.google.cloud.texttospeech.v1.IListVoicesRequest|undefined, + {}|undefined ]) => { this._log.info('listVoices response %j', response); return [response, options, rawResponse]; @@ -484,7 +485,8 @@ export class TextToSpeechClient { return this.innerApiCalls.synthesizeSpeech(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.texttospeech.v1.ISynthesizeSpeechResponse, - protos.google.cloud.texttospeech.v1.ISynthesizeSpeechRequest|undefined, {}|undefined + protos.google.cloud.texttospeech.v1.ISynthesizeSpeechRequest|undefined, + {}|undefined ]) => { this._log.info('synthesizeSpeech response %j', response); return [response, options, rawResponse]; diff --git a/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline index 230582ced..a7bede461 100644 --- a/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate-esm/esm/src/v3beta1/translation_service_client.ts.baseline @@ -1003,12 +1003,12 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('batchTranslateText response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('batchTranslateText request %j', request); @@ -1113,12 +1113,12 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('createGlossary response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('createGlossary request %j', request); @@ -1222,12 +1222,12 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('deleteGlossary response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('deleteGlossary request %j', request); diff --git a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline index 2414db4ff..ec2f84122 100644 --- a/baselines/translate/src/v3beta1/translation_service_client.ts.baseline +++ b/baselines/translate/src/v3beta1/translation_service_client.ts.baseline @@ -521,7 +521,8 @@ export class TranslationServiceClient { return this.innerApiCalls.translateText(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.translation.v3beta1.ITranslateTextResponse, - protos.google.cloud.translation.v3beta1.ITranslateTextRequest|undefined, {}|undefined + protos.google.cloud.translation.v3beta1.ITranslateTextRequest|undefined, + {}|undefined ]) => { this._log.info('translateText response %j', response); return [response, options, rawResponse]; @@ -642,7 +643,8 @@ export class TranslationServiceClient { return this.innerApiCalls.detectLanguage(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.translation.v3beta1.IDetectLanguageResponse, - protos.google.cloud.translation.v3beta1.IDetectLanguageRequest|undefined, {}|undefined + protos.google.cloud.translation.v3beta1.IDetectLanguageRequest|undefined, + {}|undefined ]) => { this._log.info('detectLanguage response %j', response); return [response, options, rawResponse]; @@ -760,7 +762,8 @@ export class TranslationServiceClient { return this.innerApiCalls.getSupportedLanguages(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.translation.v3beta1.ISupportedLanguages, - protos.google.cloud.translation.v3beta1.IGetSupportedLanguagesRequest|undefined, {}|undefined + protos.google.cloud.translation.v3beta1.IGetSupportedLanguagesRequest|undefined, + {}|undefined ]) => { this._log.info('getSupportedLanguages response %j', response); return [response, options, rawResponse]; @@ -848,7 +851,8 @@ export class TranslationServiceClient { return this.innerApiCalls.getGlossary(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ protos.google.cloud.translation.v3beta1.IGlossary, - protos.google.cloud.translation.v3beta1.IGetGlossaryRequest|undefined, {}|undefined + protos.google.cloud.translation.v3beta1.IGetGlossaryRequest|undefined, + {}|undefined ]) => { this._log.info('getGlossary response %j', response); return [response, options, rawResponse]; @@ -982,9 +986,9 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('batchTranslateText response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. @@ -1092,9 +1096,9 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('createGlossary response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. @@ -1201,9 +1205,9 @@ export class TranslationServiceClient { }); this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('deleteGlossary response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline b/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline index e6b3d07e9..1824b5c3d 100644 --- a/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline +++ b/baselines/videointelligence-esm/esm/src/v1/video_intelligence_service_client.ts.baseline @@ -460,12 +460,12 @@ export class VideoIntelligenceServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('annotateVideo response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('annotateVideo request %j', request); diff --git a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline index 2fc64ca27..ae35a8500 100644 --- a/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline +++ b/baselines/videointelligence/src/v1/video_intelligence_service_client.ts.baseline @@ -439,9 +439,9 @@ export class VideoIntelligenceServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; this.initialize(); const wrappedCallback: Callback< - LROperation, - protos.google.longrunning.IOperation|null|undefined, - {}|null|undefined>|undefined = callback + LROperation, + protos.google.longrunning.IOperation|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('annotateVideo response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index dd23009c5..75e1e28e2 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -662,20 +662,24 @@ export class {{ service.name }}Client { this._log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} const wrappedCallback: Callback< - LROperation<{{ util.toInterface(method.outputInterface) }}, null>, - {{ util.toInterface(method.outputInterface) }}|undefined, {}|undefined>|undefined = callback - ? (error, response, rawResponse, _) => { + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|null|undefined, + {}|null|undefined>|undefined = callback + ? (error, response, nextRequest, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, rawResponse, _]: [LROperation<{{ util.toInterface(method.outputInterface) }}, null>,{{ util.toInterface(method.outputInterface) }}|undefined,{}|undefined]) => { + ?.then(([response, nextRequest, rawResponse]: [ + LROperation<{{ util.toInterface(method.outputInterface) }}, null>, + {{ util.toInterface(method.outputInterface) }}|undefined, + {}|undefined]) => { this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); return [ response, + nextRequest, rawResponse, - _ ]; }); {%- else %} @@ -691,7 +695,8 @@ export class {{ service.name }}Client { return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) ?.then(([response, options, rawResponse]: [ {{ util.toInterface(method.outputInterface) }}, - {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined + {{ util.toInterface(method.inputInterface) }}|undefined, + {}|undefined ]) => { this._log.info('{{ method.name.toCamelCase() }} response %j', response); return [response, options, rawResponse]; @@ -857,9 +862,9 @@ export class {{ service.name }}Client { this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} const wrappedCallback: Callback< - LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType) }}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, - {{ util.toInterface(method.outputInterface) }}|null|undefined, - {}|null|undefined>|undefined = callback + LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType)}}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, + {{ util.toInterface(method.outputInterface) }}|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); callback!(error, response, rawResponse, _); // We verified callback above. diff --git a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk index 7fd20e709..f7b713968 100644 --- a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk +++ b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk @@ -673,20 +673,21 @@ export class {{ service.name }}Client { this._log.info('{{ method.name.toCamelCase() }} request %j', request); {%- if method.isDiregapicLRO %} const wrappedCallback: Callback< - LROperation<{{ util.toInterface(method.outputInterface) }}, null>, - {{ util.toInterface(method.outputInterface) }}|undefined, {}|undefined>|undefined = callback - ? (error, response, rawResponse, _) => { + {{ util.toInterface(method.outputInterface) }}, + {{ util.toInterface(method.inputInterface) }}|undefined, + {}|undefined>|undefined = callback + ? (error, response, nextRequest, rawResponse => { this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, rawResponse, _]: [LROperation<{{ util.toInterface(method.outputInterface) }}, null>,{{ util.toInterface(method.outputInterface) }}|undefined,{}|undefined]) => { + ?.then(([response, nextRequest, rawResponse]: [LROperation<{{ util.toInterface(method.outputInterface) }}, null>,{{ util.toInterface(method.outputInterface) }}|undefined,{}|undefined]) => { this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); return [ response, + nextRequest, rawResponse, - _ ]; }); {%- else %} @@ -868,12 +869,12 @@ export class {{ service.name }}Client { this.warn('DEP${{service.name}}-${{method.name}}','{{method.name}} is deprecated and may be removed in a future version.', 'DeprecationWarning'); {%- endif %} const wrappedCallback: Callback< - LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType) }}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, - {{ util.toInterface(method.outputInterface) }}|null|undefined, - {}|null|undefined>|undefined = callback + LROperation<{{ util.toInterface(method.longRunningResponseType, method.inputType) }}, {{ util.toInterface(method.longRunningMetadataType, method.inputType) }}>, + {{ util.toInterface(method.outputInterface) }}|null|undefined, + {}|null|undefined>|undefined = callback ? (error, response, rawResponse, _) => { this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); - callback!(error, response, rawResponse, _); // We verified callback above. + callback!(error, response, rawResponse, _); // We verified `callback` above. } : undefined; this._log.info('{{ method.name.toCamelCase() }} request %j', request); From 3a7d6e0bdbff612f7a4af5d8cb933dabd292519f Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Thu, 13 Feb 2025 22:37:42 +0000 Subject: [PATCH 21/24] fix: revert some incorrect callback changes for LROs --- .../esm/src/v1/addresses_client.ts.baseline | 18 +++++++------- .../src/v1/addresses_client.ts.baseline | 24 +++++++------------ .../src/$version/$service_client.ts.njk | 12 ++++------ .../esm/src/$version/$service_client.ts.njk | 9 ++++--- 4 files changed, 24 insertions(+), 39 deletions(-) diff --git a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline index 716f40427..8741bfa4d 100644 --- a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline +++ b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline @@ -449,12 +449,11 @@ export class AddressesClient { } : undefined; return this.innerApiCalls.delete(request, options, wrappedCallback) - ?.then(([response, nextRequest, rawResponse]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { - this._log.info('delete response %j', rawResponse); + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { return [ - response, - nextRequest, - rawResponse, + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; }); } @@ -553,12 +552,11 @@ export class AddressesClient { } : undefined; return this.innerApiCalls.insert(request, options, wrappedCallback) - ?.then(([response, nextRequest, rawResponse]: [LROperation,protos.google.cloud.compute.v1.IOperation|undefined,{}|undefined]) => { - this._log.info('insert response %j', rawResponse); + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { return [ - response, - nextRequest, - rawResponse, + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; }); } diff --git a/baselines/compute/src/v1/addresses_client.ts.baseline b/baselines/compute/src/v1/addresses_client.ts.baseline index 297139e18..bdead0608 100644 --- a/baselines/compute/src/v1/addresses_client.ts.baseline +++ b/baselines/compute/src/v1/addresses_client.ts.baseline @@ -428,15 +428,11 @@ export class AddressesClient { } : undefined; return this.innerApiCalls.delete(request, options, wrappedCallback) - ?.then(([response, nextRequest, rawResponse]: [ - LROperation, - protos.google.cloud.compute.v1.IOperation|undefined, - {}|undefined]) => { - this._log.info('delete response %j', rawResponse); + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { return [ - response, - nextRequest, - rawResponse, + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; }); } @@ -535,15 +531,11 @@ export class AddressesClient { } : undefined; return this.innerApiCalls.insert(request, options, wrappedCallback) - ?.then(([response, nextRequest, rawResponse]: [ - LROperation, - protos.google.cloud.compute.v1.IOperation|undefined, - {}|undefined]) => { - this._log.info('insert response %j', rawResponse); + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { return [ - response, - nextRequest, - rawResponse, + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; }); } diff --git a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk index 75e1e28e2..540bb79f2 100644 --- a/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk +++ b/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk @@ -671,15 +671,11 @@ export class {{ service.name }}Client { } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, nextRequest, rawResponse]: [ - LROperation<{{ util.toInterface(method.outputInterface) }}, null>, - {{ util.toInterface(method.outputInterface) }}|undefined, - {}|undefined]) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { return [ - response, - nextRequest, - rawResponse, + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; }); {%- else %} diff --git a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk index f7b713968..49089206d 100644 --- a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk +++ b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk @@ -682,12 +682,11 @@ export class {{ service.name }}Client { } : undefined; return this.innerApiCalls.{{ method.name.toCamelCase(true) }}(request, options, wrappedCallback) - ?.then(([response, nextRequest, rawResponse]: [LROperation<{{ util.toInterface(method.outputInterface) }}, null>,{{ util.toInterface(method.outputInterface) }}|undefined,{}|undefined]) => { - this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); + ?.then(([response, operation, rawResponse]: [protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IOperation]) => { return [ - response, - nextRequest, - rawResponse, + { latestResponse: response, done: false, name: response.id, metadata: null, result: {}}, + operation, + rawResponse ]; }); {%- else %} From a68ca9a0cfa99bfe4d41e40633404b3693f612f0 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:19:32 +0000 Subject: [PATCH 22/24] fix: missing paren --- .../typescript_gapic/esm/src/$version/$service_client.ts.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk index 49089206d..e274e5dd3 100644 --- a/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk +++ b/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk @@ -676,7 +676,7 @@ export class {{ service.name }}Client { {{ util.toInterface(method.outputInterface) }}, {{ util.toInterface(method.inputInterface) }}|undefined, {}|undefined>|undefined = callback - ? (error, response, nextRequest, rawResponse => { + ? (error, response, nextRequest, rawResponse) => { this._log.info('{{ method.name.toCamelCase() }} response %j', rawResponse); callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } From 4f9aed2c9ead6f530d4da7180c465e4ac87d0c4e Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:28:49 +0000 Subject: [PATCH 23/24] tests: update baseline for compute esm --- baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline index 8741bfa4d..05b066008 100644 --- a/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline +++ b/baselines/compute-esm/esm/src/v1/addresses_client.ts.baseline @@ -443,7 +443,7 @@ export class AddressesClient { protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IDeleteAddressRequest|undefined, {}|undefined>|undefined = callback - ? (error, response, nextRequest, rawResponse => { + ? (error, response, nextRequest, rawResponse) => { this._log.info('delete response %j', rawResponse); callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } @@ -546,7 +546,7 @@ export class AddressesClient { protos.google.cloud.compute.v1.IOperation, protos.google.cloud.compute.v1.IInsertAddressRequest|undefined, {}|undefined>|undefined = callback - ? (error, response, nextRequest, rawResponse => { + ? (error, response, nextRequest, rawResponse) => { this._log.info('insert response %j', rawResponse); callback!(error, response, nextRequest, rawResponse); // We verified `callback` above. } From b536b1c25f35fbfdae28fe685c93668ce396688d Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 18 Feb 2025 20:39:53 +0000 Subject: [PATCH 24/24] fix: update package.json for google logging utils release --- baselines/asset-esm/package.json | 3 ++- baselines/asset/package.json | 2 +- baselines/bigquery-storage-esm/package.json | 3 ++- baselines/bigquery-storage/package.json | 2 +- baselines/bigquery-v2-esm/package.json | 3 ++- baselines/bigquery-v2/package.json | 2 +- baselines/compute-esm/package.json | 3 ++- baselines/compute/package.json | 2 +- baselines/deprecatedtest-esm/package.json | 3 ++- baselines/deprecatedtest/package.json | 2 +- baselines/disable-packing-test-esm/package.json | 3 ++- baselines/disable-packing-test/package.json | 2 +- baselines/dlp-esm/package.json | 3 ++- baselines/dlp/package.json | 2 +- baselines/kms-esm/package.json | 3 ++- baselines/kms/package.json | 2 +- baselines/logging-esm/package.json | 3 ++- baselines/logging/package.json | 2 +- baselines/monitoring-esm/package.json | 3 ++- baselines/monitoring/package.json | 2 +- baselines/naming-esm/package.json | 3 ++- baselines/naming/package.json | 2 +- baselines/redis-esm/package.json | 3 ++- baselines/redis/package.json | 2 +- baselines/routingtest-esm/package.json | 3 ++- baselines/routingtest/package.json | 2 +- baselines/showcase-esm/package.json | 3 ++- baselines/showcase-legacy-esm/package.json | 3 ++- baselines/showcase-legacy/package.json | 2 +- baselines/showcase/package.json | 2 +- baselines/tasks-esm/package.json | 3 ++- baselines/tasks/package.json | 2 +- baselines/texttospeech-esm/package.json | 3 ++- baselines/texttospeech/package.json | 2 +- baselines/translate-esm/package.json | 3 ++- baselines/translate/package.json | 2 +- baselines/videointelligence-esm/package.json | 3 ++- baselines/videointelligence/package.json | 2 +- templates/cjs/typescript_gapic/package.json | 2 +- templates/esm/typescript_gapic/package.json | 3 ++- 40 files changed, 60 insertions(+), 40 deletions(-) diff --git a/baselines/asset-esm/package.json b/baselines/asset-esm/package.json index 7f9d6dfef..c76e27ed6 100644 --- a/baselines/asset-esm/package.json +++ b/baselines/asset-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/asset/package.json b/baselines/asset/package.json index 8693f3b3f..29d41073b 100644 --- a/baselines/asset/package.json +++ b/baselines/asset/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/bigquery-storage-esm/package.json b/baselines/bigquery-storage-esm/package.json index b28ad70c8..c2ff079d2 100644 --- a/baselines/bigquery-storage-esm/package.json +++ b/baselines/bigquery-storage-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/bigquery-storage/package.json b/baselines/bigquery-storage/package.json index 8d5f7ccb0..a19e37350 100644 --- a/baselines/bigquery-storage/package.json +++ b/baselines/bigquery-storage/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/bigquery-v2-esm/package.json b/baselines/bigquery-v2-esm/package.json index d7efb1646..36f134b8d 100644 --- a/baselines/bigquery-v2-esm/package.json +++ b/baselines/bigquery-v2-esm/package.json @@ -79,7 +79,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/bigquery-v2/package.json b/baselines/bigquery-v2/package.json index 62143f9a5..b6511d16c 100644 --- a/baselines/bigquery-v2/package.json +++ b/baselines/bigquery-v2/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/compute-esm/package.json b/baselines/compute-esm/package.json index c256fefd0..285f742ec 100644 --- a/baselines/compute-esm/package.json +++ b/baselines/compute-esm/package.json @@ -74,7 +74,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/compute/package.json b/baselines/compute/package.json index f6f5e5ca6..28a708db3 100644 --- a/baselines/compute/package.json +++ b/baselines/compute/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/deprecatedtest-esm/package.json b/baselines/deprecatedtest-esm/package.json index 55418da17..633b7c250 100644 --- a/baselines/deprecatedtest-esm/package.json +++ b/baselines/deprecatedtest-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/deprecatedtest/package.json b/baselines/deprecatedtest/package.json index 7f122f640..10c74e3dc 100644 --- a/baselines/deprecatedtest/package.json +++ b/baselines/deprecatedtest/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/disable-packing-test-esm/package.json b/baselines/disable-packing-test-esm/package.json index 6f9d1b1e7..006f85a89 100644 --- a/baselines/disable-packing-test-esm/package.json +++ b/baselines/disable-packing-test-esm/package.json @@ -78,7 +78,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/disable-packing-test/package.json b/baselines/disable-packing-test/package.json index 56ed5fae5..408e4d810 100644 --- a/baselines/disable-packing-test/package.json +++ b/baselines/disable-packing-test/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/dlp-esm/package.json b/baselines/dlp-esm/package.json index 0269aee23..5571e6f97 100644 --- a/baselines/dlp-esm/package.json +++ b/baselines/dlp-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/dlp/package.json b/baselines/dlp/package.json index 11054747d..866e5426c 100644 --- a/baselines/dlp/package.json +++ b/baselines/dlp/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/kms-esm/package.json b/baselines/kms-esm/package.json index afe5a68b1..4bafe5d83 100644 --- a/baselines/kms-esm/package.json +++ b/baselines/kms-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/kms/package.json b/baselines/kms/package.json index 3b643389b..50c348cf8 100644 --- a/baselines/kms/package.json +++ b/baselines/kms/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/logging-esm/package.json b/baselines/logging-esm/package.json index af98dffe6..de980bbd6 100644 --- a/baselines/logging-esm/package.json +++ b/baselines/logging-esm/package.json @@ -75,7 +75,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/logging/package.json b/baselines/logging/package.json index 7a3d55aba..50d13ab30 100644 --- a/baselines/logging/package.json +++ b/baselines/logging/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/monitoring-esm/package.json b/baselines/monitoring-esm/package.json index bc6c02840..5a7a2e8d7 100644 --- a/baselines/monitoring-esm/package.json +++ b/baselines/monitoring-esm/package.json @@ -78,7 +78,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/monitoring/package.json b/baselines/monitoring/package.json index 7f701fe8c..eafc507a8 100644 --- a/baselines/monitoring/package.json +++ b/baselines/monitoring/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/naming-esm/package.json b/baselines/naming-esm/package.json index d78c68cf5..12f35b1cf 100644 --- a/baselines/naming-esm/package.json +++ b/baselines/naming-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/naming/package.json b/baselines/naming/package.json index 4efbb64b8..d13705bbb 100644 --- a/baselines/naming/package.json +++ b/baselines/naming/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/redis-esm/package.json b/baselines/redis-esm/package.json index 2c2acc16c..82c2947d1 100644 --- a/baselines/redis-esm/package.json +++ b/baselines/redis-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/redis/package.json b/baselines/redis/package.json index 4f3369fc0..5cb7c0250 100644 --- a/baselines/redis/package.json +++ b/baselines/redis/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/routingtest-esm/package.json b/baselines/routingtest-esm/package.json index 378af0240..19a140e7f 100644 --- a/baselines/routingtest-esm/package.json +++ b/baselines/routingtest-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/routingtest/package.json b/baselines/routingtest/package.json index 143c2a104..f91f7ddef 100644 --- a/baselines/routingtest/package.json +++ b/baselines/routingtest/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/showcase-esm/package.json b/baselines/showcase-esm/package.json index 6f9d1b1e7..006f85a89 100644 --- a/baselines/showcase-esm/package.json +++ b/baselines/showcase-esm/package.json @@ -78,7 +78,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/showcase-legacy-esm/package.json b/baselines/showcase-legacy-esm/package.json index ad0e44666..ddb9645e4 100644 --- a/baselines/showcase-legacy-esm/package.json +++ b/baselines/showcase-legacy-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/showcase-legacy/package.json b/baselines/showcase-legacy/package.json index 48f131f74..1787aea90 100644 --- a/baselines/showcase-legacy/package.json +++ b/baselines/showcase-legacy/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/showcase/package.json b/baselines/showcase/package.json index 56ed5fae5..408e4d810 100644 --- a/baselines/showcase/package.json +++ b/baselines/showcase/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/tasks-esm/package.json b/baselines/tasks-esm/package.json index 67d595c87..7a113bd82 100644 --- a/baselines/tasks-esm/package.json +++ b/baselines/tasks-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/tasks/package.json b/baselines/tasks/package.json index 728517b2b..183a0a70a 100644 --- a/baselines/tasks/package.json +++ b/baselines/tasks/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/texttospeech-esm/package.json b/baselines/texttospeech-esm/package.json index fef7b7d8e..ab404aa18 100644 --- a/baselines/texttospeech-esm/package.json +++ b/baselines/texttospeech-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/texttospeech/package.json b/baselines/texttospeech/package.json index b4b715035..cda4b1457 100644 --- a/baselines/texttospeech/package.json +++ b/baselines/texttospeech/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/translate-esm/package.json b/baselines/translate-esm/package.json index 546b07b30..e0e450b99 100644 --- a/baselines/translate-esm/package.json +++ b/baselines/translate-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/translate/package.json b/baselines/translate/package.json index 84753257e..0eafadf74 100644 --- a/baselines/translate/package.json +++ b/baselines/translate/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/baselines/videointelligence-esm/package.json b/baselines/videointelligence-esm/package.json index bb98b4e16..43b87fd90 100644 --- a/baselines/videointelligence-esm/package.json +++ b/baselines/videointelligence-esm/package.json @@ -73,7 +73,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6", diff --git a/baselines/videointelligence/package.json b/baselines/videointelligence/package.json index 34b148ff2..2c9587340 100644 --- a/baselines/videointelligence/package.json +++ b/baselines/videointelligence/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/templates/cjs/typescript_gapic/package.json b/templates/cjs/typescript_gapic/package.json index fb6093afd..fa38a089e 100644 --- a/templates/cjs/typescript_gapic/package.json +++ b/templates/cjs/typescript_gapic/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "google-gax": "^4.4.0", - "google-logging-utils": "next" + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@types/mocha": "^10.0.7", diff --git a/templates/esm/typescript_gapic/package.json b/templates/esm/typescript_gapic/package.json index d54d9ce86..a490fbd53 100644 --- a/templates/esm/typescript_gapic/package.json +++ b/templates/esm/typescript_gapic/package.json @@ -74,7 +74,8 @@ "samples-test": "cd samples/ && npm link ../ && npm i && npm test" }, "dependencies": { - "google-gax": "^4.4.0" + "google-gax": "^4.4.0", + "google-logging-utils": "^1.0.1" }, "devDependencies": { "@babel/cli": "^7.25.6",