Skip to content

Commit cd3ae5c

Browse files
feat: update retry and timeout logic for generated async/stream (#883)
PiperOrigin-RevId: 402634944 Source-Link: googleapis/googleapis@29de512 Source-Link: googleapis/googleapis-gen@2a306fa Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmEzMDZmYTljZDc3MzU3MDQyMzU3MTNjY2ExY2Y5MjY0MTk4NDdkNiJ9
1 parent 5cfca3a commit cd3ae5c

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

owlbot.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import logging
1919
from pathlib import Path
2020
from synthtool import _tracked_paths
21+
from synthtool import shell
2122
import shutil
2223

2324
logging.basicConfig(level=logging.DEBUG)
@@ -57,3 +58,6 @@
5758
s.copy(templates)
5859

5960
node.postprocess_gapic_library_hermetic()
61+
62+
# Remove generated samples from veneer library:
63+
shell.run(('rm', '-rf', 'samples/generated'), hide_output = False)

src/v1/datastore_admin_client.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,8 @@ export class DatastoreAdminClient {
13011301
gax.routingHeader.fromParams({
13021302
project_id: request.projectId || '',
13031303
});
1304-
const callSettings = new gax.CallSettings(options);
1304+
const defaultCallSettings = this._defaults['listIndexes'];
1305+
const callSettings = defaultCallSettings.merge(options);
13051306
this.initialize();
13061307
return this.descriptors.page.listIndexes.createStream(
13071308
this.innerApiCalls.listIndexes as gax.GaxCall,
@@ -1353,7 +1354,8 @@ export class DatastoreAdminClient {
13531354
project_id: request.projectId || '',
13541355
});
13551356
options = options || {};
1356-
const callSettings = new gax.CallSettings(options);
1357+
const defaultCallSettings = this._defaults['listIndexes'];
1358+
const callSettings = defaultCallSettings.merge(options);
13571359
this.initialize();
13581360
return this.descriptors.page.listIndexes.asyncIterate(
13591361
this.innerApiCalls['listIndexes'] as GaxCall,

0 commit comments

Comments
 (0)