Skip to content
This repository was archived by the owner on Mar 4, 2026. It is now read-only.

Commit a029a6e

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: better support for fallback mode (#1756)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 468790263 Source-Link: googleapis/googleapis@873ab45 Source-Link: googleapis/googleapis-gen@cb6f37a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2I2ZjM3YWVmZjJhMzQ3MmU0MGE3YmJhY2U4YzY3ZDc1ZTI0YmVlNSJ9
1 parent fd7002d commit a029a6e

6 files changed

Lines changed: 264 additions & 258 deletions

File tree

‎dev/src/v1/firestore_admin_client.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
} from 'google-gax';
3333

3434
import {Transform} from 'stream';
35-
import {RequestType} from 'google-gax/build/src/apitypes';
3635
import * as protos from '../../protos/firestore_admin_v1_proto_api';
3736
import jsonProtos = require('../../protos/admin_v1.json');
3837
/**
@@ -407,7 +406,8 @@ export class FirestoreAdminClient {
407406
const apiCall = this._gaxModule.createApiCall(
408407
callPromise,
409408
this._defaults[methodName],
410-
descriptor
409+
descriptor,
410+
this._opts.fallback
411411
);
412412

413413
this.innerApiCalls[methodName] = apiCall;
@@ -1034,7 +1034,7 @@ export class FirestoreAdminClient {
10341034
const decodeOperation = new gax.Operation(
10351035
operation,
10361036
this.descriptors.longrunning.createIndex,
1037-
gax.createDefaultBackoffSettings()
1037+
this._gaxModule.createDefaultBackoffSettings()
10381038
);
10391039
return decodeOperation as LROperation<
10401040
protos.google.firestore.admin.v1.Index,
@@ -1186,7 +1186,7 @@ export class FirestoreAdminClient {
11861186
const decodeOperation = new gax.Operation(
11871187
operation,
11881188
this.descriptors.longrunning.updateField,
1189-
gax.createDefaultBackoffSettings()
1189+
this._gaxModule.createDefaultBackoffSettings()
11901190
);
11911191
return decodeOperation as LROperation<
11921192
protos.google.firestore.admin.v1.Field,
@@ -1345,7 +1345,7 @@ export class FirestoreAdminClient {
13451345
const decodeOperation = new gax.Operation(
13461346
operation,
13471347
this.descriptors.longrunning.exportDocuments,
1348-
gax.createDefaultBackoffSettings()
1348+
this._gaxModule.createDefaultBackoffSettings()
13491349
);
13501350
return decodeOperation as LROperation<
13511351
protos.google.firestore.admin.v1.ExportDocumentsResponse,
@@ -1496,7 +1496,7 @@ export class FirestoreAdminClient {
14961496
const decodeOperation = new gax.Operation(
14971497
operation,
14981498
this.descriptors.longrunning.importDocuments,
1499-
gax.createDefaultBackoffSettings()
1499+
this._gaxModule.createDefaultBackoffSettings()
15001500
);
15011501
return decodeOperation as LROperation<
15021502
protos.google.protobuf.Empty,
@@ -1635,7 +1635,7 @@ export class FirestoreAdminClient {
16351635
const decodeOperation = new gax.Operation(
16361636
operation,
16371637
this.descriptors.longrunning.updateDatabase,
1638-
gax.createDefaultBackoffSettings()
1638+
this._gaxModule.createDefaultBackoffSettings()
16391639
);
16401640
return decodeOperation as LROperation<
16411641
protos.google.firestore.admin.v1.Database,
@@ -1783,7 +1783,7 @@ export class FirestoreAdminClient {
17831783
const callSettings = defaultCallSettings.merge(options);
17841784
this.initialize();
17851785
return this.descriptors.page.listIndexes.createStream(
1786-
this.innerApiCalls.listIndexes as gax.GaxCall,
1786+
this.innerApiCalls.listIndexes as GaxCall,
17871787
request,
17881788
callSettings
17891789
);
@@ -1836,7 +1836,7 @@ export class FirestoreAdminClient {
18361836
this.initialize();
18371837
return this.descriptors.page.listIndexes.asyncIterate(
18381838
this.innerApiCalls['listIndexes'] as GaxCall,
1839-
request as unknown as RequestType,
1839+
request as {},
18401840
callSettings
18411841
) as AsyncIterable<protos.google.firestore.admin.v1.IIndex>;
18421842
}
@@ -1994,7 +1994,7 @@ export class FirestoreAdminClient {
19941994
const callSettings = defaultCallSettings.merge(options);
19951995
this.initialize();
19961996
return this.descriptors.page.listFields.createStream(
1997-
this.innerApiCalls.listFields as gax.GaxCall,
1997+
this.innerApiCalls.listFields as GaxCall,
19981998
request,
19991999
callSettings
20002000
);
@@ -2051,7 +2051,7 @@ export class FirestoreAdminClient {
20512051
this.initialize();
20522052
return this.descriptors.page.listFields.asyncIterate(
20532053
this.innerApiCalls['listFields'] as GaxCall,
2054-
request as unknown as RequestType,
2054+
request as {},
20552055
callSettings
20562056
) as AsyncIterable<protos.google.firestore.admin.v1.IField>;
20572057
}

‎dev/src/v1/firestore_client.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import {
2929
} from 'google-gax';
3030

3131
import {Transform} from 'stream';
32-
import {RequestType} from 'google-gax/build/src/apitypes';
3332
import {PassThrough} from 'stream';
3433
import * as protos from '../../protos/firestore_v1_proto_api';
3534
import jsonProtos = require('../../protos/v1.json');
@@ -307,7 +306,8 @@ export class FirestoreClient {
307306
const apiCall = this._gaxModule.createApiCall(
308307
callPromise,
309308
this._defaults[methodName],
310-
descriptor
309+
descriptor,
310+
this._opts.fallback
311311
);
312312

313313
this.innerApiCalls[methodName] = apiCall;
@@ -1454,7 +1454,7 @@ export class FirestoreClient {
14541454
const callSettings = defaultCallSettings.merge(options);
14551455
this.initialize();
14561456
return this.descriptors.page.listDocuments.createStream(
1457-
this.innerApiCalls.listDocuments as gax.GaxCall,
1457+
this.innerApiCalls.listDocuments as GaxCall,
14581458
request,
14591459
callSettings
14601460
);
@@ -1531,7 +1531,7 @@ export class FirestoreClient {
15311531
this.initialize();
15321532
return this.descriptors.page.listDocuments.asyncIterate(
15331533
this.innerApiCalls['listDocuments'] as GaxCall,
1534-
request as unknown as RequestType,
1534+
request as {},
15351535
callSettings
15361536
) as AsyncIterable<protos.google.firestore.v1.IDocument>;
15371537
}
@@ -1742,7 +1742,7 @@ export class FirestoreClient {
17421742
const callSettings = defaultCallSettings.merge(options);
17431743
this.initialize();
17441744
return this.descriptors.page.partitionQuery.createStream(
1745-
this.innerApiCalls.partitionQuery as gax.GaxCall,
1745+
this.innerApiCalls.partitionQuery as GaxCall,
17461746
request,
17471747
callSettings
17481748
);
@@ -1828,7 +1828,7 @@ export class FirestoreClient {
18281828
this.initialize();
18291829
return this.descriptors.page.partitionQuery.asyncIterate(
18301830
this.innerApiCalls['partitionQuery'] as GaxCall,
1831-
request as unknown as RequestType,
1831+
request as {},
18321832
callSettings
18331833
) as AsyncIterable<protos.google.firestore.v1.ICursor>;
18341834
}
@@ -1977,7 +1977,7 @@ export class FirestoreClient {
19771977
const callSettings = defaultCallSettings.merge(options);
19781978
this.initialize();
19791979
return this.descriptors.page.listCollectionIds.createStream(
1980-
this.innerApiCalls.listCollectionIds as gax.GaxCall,
1980+
this.innerApiCalls.listCollectionIds as GaxCall,
19811981
request,
19821982
callSettings
19831983
);
@@ -2032,7 +2032,7 @@ export class FirestoreClient {
20322032
this.initialize();
20332033
return this.descriptors.page.listCollectionIds.asyncIterate(
20342034
this.innerApiCalls['listCollectionIds'] as GaxCall,
2035-
request as unknown as RequestType,
2035+
request as {},
20362036
callSettings
20372037
) as AsyncIterable<string>;
20382038
}

‎dev/src/v1beta1/firestore_client.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import {
2929
} from 'google-gax';
3030

3131
import {Transform} from 'stream';
32-
import {RequestType} from 'google-gax/build/src/apitypes';
3332
import {PassThrough} from 'stream';
3433
import * as protos from '../../protos/firestore_v1beta1_proto_api';
3534
import jsonProtos = require('../../protos/v1beta1.json');
@@ -310,7 +309,8 @@ export class FirestoreClient {
310309
const apiCall = this._gaxModule.createApiCall(
311310
callPromise,
312311
this._defaults[methodName],
313-
descriptor
312+
descriptor,
313+
this._opts.fallback
314314
);
315315

316316
this.innerApiCalls[methodName] = apiCall;
@@ -1471,7 +1471,7 @@ export class FirestoreClient {
14711471
const callSettings = defaultCallSettings.merge(options);
14721472
this.initialize();
14731473
return this.descriptors.page.listDocuments.createStream(
1474-
this.innerApiCalls.listDocuments as gax.GaxCall,
1474+
this.innerApiCalls.listDocuments as GaxCall,
14751475
request,
14761476
callSettings
14771477
);
@@ -1548,7 +1548,7 @@ export class FirestoreClient {
15481548
this.initialize();
15491549
return this.descriptors.page.listDocuments.asyncIterate(
15501550
this.innerApiCalls['listDocuments'] as GaxCall,
1551-
request as unknown as RequestType,
1551+
request as {},
15521552
callSettings
15531553
) as AsyncIterable<protos.google.firestore.v1beta1.IDocument>;
15541554
}
@@ -1761,7 +1761,7 @@ export class FirestoreClient {
17611761
const callSettings = defaultCallSettings.merge(options);
17621762
this.initialize();
17631763
return this.descriptors.page.partitionQuery.createStream(
1764-
this.innerApiCalls.partitionQuery as gax.GaxCall,
1764+
this.innerApiCalls.partitionQuery as GaxCall,
17651765
request,
17661766
callSettings
17671767
);
@@ -1844,7 +1844,7 @@ export class FirestoreClient {
18441844
this.initialize();
18451845
return this.descriptors.page.partitionQuery.asyncIterate(
18461846
this.innerApiCalls['partitionQuery'] as GaxCall,
1847-
request as unknown as RequestType,
1847+
request as {},
18481848
callSettings
18491849
) as AsyncIterable<protos.google.firestore.v1beta1.ICursor>;
18501850
}
@@ -1993,7 +1993,7 @@ export class FirestoreClient {
19931993
const callSettings = defaultCallSettings.merge(options);
19941994
this.initialize();
19951995
return this.descriptors.page.listCollectionIds.createStream(
1996-
this.innerApiCalls.listCollectionIds as gax.GaxCall,
1996+
this.innerApiCalls.listCollectionIds as GaxCall,
19971997
request,
19981998
callSettings
19991999
);
@@ -2045,7 +2045,7 @@ export class FirestoreClient {
20452045
this.initialize();
20462046
return this.descriptors.page.listCollectionIds.asyncIterate(
20472047
this.innerApiCalls['listCollectionIds'] as GaxCall,
2048-
request as unknown as RequestType,
2048+
request as {},
20492049
callSettings
20502050
) as AsyncIterable<string>;
20512051
}

0 commit comments

Comments
 (0)