Merge branch 'main' into gax4upgrade-2

googleapis · Aug 22, 2023 · 783e736 · 783e736
2 parents ecfb2f7 + b322f78
commit 783e736
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/src/apitypes.ts b/src/apitypes.ts
@@ -48,7 +48,7 @@ export type RawResponseType = Operation | {} | null;
 export type ResultTuple = [
   ResponseType | [ResponseType],
   NextPageRequestType | undefined,
-  RawResponseType | undefined
+  RawResponseType | undefined,
 ];
 
 export interface SimpleCallbackFunction {

diff --git a/src/clientInterface.ts b/src/clientInterface.ts
@@ -50,7 +50,7 @@ export interface Descriptors {
 export interface Callback<
   ResponseObject,
   NextRequestObject,
-  RawResponseObject
+  RawResponseObject,
 > {
   (
     err: Error | null | undefined,
@@ -70,7 +70,7 @@ export interface LROperation<ResultType, MetadataType>
 export interface PaginationCallback<
   RequestObject,
   ResponseObject,
-  ResponseType
+  ResponseType,
 > {
   (
     err: Error | null,
@@ -83,7 +83,7 @@ export interface PaginationCallback<
 export interface PaginationResponse<
   RequestObject,
   ResponseObject,
-  ResponseType
+  ResponseType,
 > {
   values?: ResponseType[];
   nextPageRequest?: RequestObject;

diff --git a/src/locationService.ts b/src/locationService.ts
@@ -372,7 +372,7 @@ export class LocationsClient {
     [
       protos.google.cloud.location.ILocation[],
       protos.google.cloud.location.IListLocationsRequest | null,
-      protos.google.cloud.location.IListLocationsResponse
+      protos.google.cloud.location.IListLocationsResponse,
     ]
   >;
   listLocations(
@@ -438,7 +438,7 @@ export class LocationsClient {
     [
       protos.google.cloud.location.ILocation[],
       protos.google.cloud.location.IListLocationsRequest | null,
-      protos.google.cloud.location.IListLocationsResponse
+      protos.google.cloud.location.IListLocationsResponse,
     ]
   > | void {
     request = request || {};

diff --git a/test/showcase-echo-client/src/v1beta1/echo_client.ts b/test/showcase-echo-client/src/v1beta1/echo_client.ts
@@ -520,7 +520,7 @@ export class EchoClient {
     [
       protos.google.showcase.v1beta1.IEchoResponse,
       protos.google.showcase.v1beta1.IEchoRequest | undefined,
-      {} | undefined
+      {} | undefined,
     ]
   >;
   echo(
@@ -558,7 +558,7 @@ export class EchoClient {
     [
       protos.google.showcase.v1beta1.IEchoResponse,
       protos.google.showcase.v1beta1.IEchoRequest | undefined,
-      {} | undefined
+      {} | undefined,
     ]
   > | void {
     request = request || {};
@@ -798,7 +798,7 @@ export class EchoClient {
     [
       protos.google.showcase.v1beta1.IBlockResponse,
       protos.google.showcase.v1beta1.IBlockRequest | undefined,
-      {} | undefined
+      {} | undefined,
     ]
   >;
   block(
@@ -836,7 +836,7 @@ export class EchoClient {
     [
       protos.google.showcase.v1beta1.IBlockResponse,
       protos.google.showcase.v1beta1.IBlockRequest | undefined,
-      {} | undefined
+      {} | undefined,
     ]
   > | void {
     request = request || {};
@@ -996,7 +996,7 @@ export class EchoClient {
         protos.google.showcase.v1beta1.IWaitMetadata
       >,
       protos.google.longrunning.IOperation | undefined,
-      {} | undefined
+      {} | undefined,
     ]
   >;
   wait(
@@ -1049,7 +1049,7 @@ export class EchoClient {
         protos.google.showcase.v1beta1.IWaitMetadata
       >,
       protos.google.longrunning.IOperation | undefined,
-      {} | undefined
+      {} | undefined,
     ]
   > | void {
     request = request || {};
@@ -1131,7 +1131,7 @@ export class EchoClient {
     [
       protos.google.showcase.v1beta1.IEchoResponse[],
       protos.google.showcase.v1beta1.IPagedExpandRequest | null,
-      protos.google.showcase.v1beta1.IPagedExpandResponse
+      protos.google.showcase.v1beta1.IPagedExpandResponse,
     ]
   >;
   pagedExpand(
@@ -1171,7 +1171,7 @@ export class EchoClient {
     [
       protos.google.showcase.v1beta1.IEchoResponse[],
       protos.google.showcase.v1beta1.IPagedExpandRequest | null,
-      protos.google.showcase.v1beta1.IPagedExpandResponse
+      protos.google.showcase.v1beta1.IPagedExpandResponse,
     ]
   > | void {
     request = request || {};

diff --git a/test/test-application/src/index.ts b/test/test-application/src/index.ts
@@ -70,7 +70,6 @@ async function testShowcase() {
   };
 
   const grpcClient = new EchoClient(grpcClientOpts);
-
   const grpcClientWithNewRetry = new EchoClient(grpcClientOptsWithNewRetry);
   const grpcSequenceClientWithNewRetry = new SequenceServiceClient(
     grpcClientOptsWithNewRetry

diff --git a/test/unit/longrunning.ts b/test/unit/longrunning.ts
@@ -435,11 +435,11 @@ describe('longrunning', () => {
         const client = mockOperationsClient({expectedCalls: 0});
         const apiCall = createApiCall(func, client);
         const [operation] = (await apiCall({})) as unknown as [
-          longrunning.Operation
+          longrunning.Operation,
         ];
         assert.notStrictEqual(operation, null);
         const [finalResult] = (await operation!.promise()) as unknown as [
-          string
+          string,
         ];
         assert.strictEqual(finalResult, RESPONSE_VAL);
       });