Skip to content

Commit

Permalink
feat: update retry and timeout logic for generated async/stream metho…
Browse files Browse the repository at this point in the history 
…ds (#973)
  • Loading branch information
@alicejli
alicejli committed Sep 15, 2021
1 parent 56daf31 commit 5f61bd1
Show file tree
Hide file tree
Showing 26 changed files with 194 additions and 97 deletions.
9 changes: 6 additions & 3 deletions baselines/compute/src/v1/addresses_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,8 @@ export class AddressesClient {
'project': request.project || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['aggregatedList'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.aggregatedList.asyncIterate(
this.innerApiCalls['aggregatedList'] as GaxCall,
Expand Down Expand Up @@ -695,7 +696,8 @@ export class AddressesClient {
] = gax.routingHeader.fromParams({
'project': request.project || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['list'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.list.createStream(
this.innerApiCalls.list as gax.GaxCall,
Expand Down Expand Up @@ -762,7 +764,8 @@ export class AddressesClient {
'project': request.project || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['list'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.list.asyncIterate(
this.innerApiCalls['list'] as GaxCall,
Expand Down
6 changes: 4 additions & 2 deletions baselines/disable-packing-test/src/v1beta1/echo_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,8 @@ export class EchoClient {
Transform{
request = request || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['pagedExpand'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.pagedExpand.createStream(
this.innerApiCalls.pagedExpand as gax.GaxCall,
Expand Down Expand Up @@ -841,7 +842,8 @@ export class EchoClient {
request = request || {};
options = options || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['pagedExpand'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.pagedExpand.asyncIterate(
this.innerApiCalls['pagedExpand'] as GaxCall,
Expand Down
6 changes: 4 additions & 2 deletions baselines/disable-packing-test/src/v1beta1/identity_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,8 @@ export class IdentityClient {
Transform{
request = request || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listUsers'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listUsers.createStream(
this.innerApiCalls.listUsers as gax.GaxCall,
Expand Down Expand Up @@ -746,7 +747,8 @@ export class IdentityClient {
request = request || {};
options = options || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listUsers'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listUsers.asyncIterate(
this.innerApiCalls['listUsers'] as GaxCall,
Expand Down
12 changes: 8 additions & 4 deletions baselines/disable-packing-test/src/v1beta1/messaging_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,8 @@ export class MessagingClient {
Transform{
request = request || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listRooms'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listRooms.createStream(
this.innerApiCalls.listRooms as gax.GaxCall,
Expand Down Expand Up @@ -1302,7 +1303,8 @@ export class MessagingClient {
request = request || {};
options = options || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listRooms'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listRooms.asyncIterate(
this.innerApiCalls['listRooms'] as GaxCall,
Expand Down Expand Up @@ -1435,7 +1437,8 @@ export class MessagingClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listBlurbs'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listBlurbs.createStream(
this.innerApiCalls.listBlurbs as gax.GaxCall,
Expand Down Expand Up @@ -1490,7 +1493,8 @@ export class MessagingClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listBlurbs'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listBlurbs.asyncIterate(
this.innerApiCalls['listBlurbs'] as GaxCall,
Expand Down
12 changes: 8 additions & 4 deletions baselines/disable-packing-test/src/v1beta1/testing_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,8 @@ export class TestingClient {
Transform{
request = request || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listSessions'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listSessions.createStream(
this.innerApiCalls.listSessions as gax.GaxCall,
Expand Down Expand Up @@ -895,7 +896,8 @@ export class TestingClient {
request = request || {};
options = options || {};
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listSessions'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listSessions.asyncIterate(
this.innerApiCalls['listSessions'] as GaxCall,
Expand Down Expand Up @@ -1019,7 +1021,8 @@ export class TestingClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listTests'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listTests.createStream(
this.innerApiCalls.listTests as gax.GaxCall,
Expand Down Expand Up @@ -1070,7 +1073,8 @@ export class TestingClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listTests'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listTests.asyncIterate(
this.innerApiCalls['listTests'] as GaxCall,
Expand Down
30 changes: 20 additions & 10 deletions baselines/dlp/src/v2/dlp_service_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2598,7 +2598,8 @@ export class DlpServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listInspectTemplates'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listInspectTemplates.createStream(
this.innerApiCalls.listInspectTemplates as gax.GaxCall,
Expand Down Expand Up @@ -2669,7 +2670,8 @@ export class DlpServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listInspectTemplates'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listInspectTemplates.asyncIterate(
this.innerApiCalls['listInspectTemplates'] as GaxCall,
Expand Down Expand Up @@ -2835,7 +2837,8 @@ export class DlpServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listDeidentifyTemplates'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listDeidentifyTemplates.createStream(
this.innerApiCalls.listDeidentifyTemplates as gax.GaxCall,
Expand Down Expand Up @@ -2906,7 +2909,8 @@ export class DlpServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listDeidentifyTemplates'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listDeidentifyTemplates.asyncIterate(
this.innerApiCalls['listDeidentifyTemplates'] as GaxCall,
Expand Down Expand Up @@ -3123,7 +3127,8 @@ export class DlpServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listJobTriggers'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listJobTriggers.createStream(
this.innerApiCalls.listJobTriggers as gax.GaxCall,
Expand Down Expand Up @@ -3220,7 +3225,8 @@ export class DlpServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listJobTriggers'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listJobTriggers.asyncIterate(
this.innerApiCalls['listJobTriggers'] as GaxCall,
Expand Down Expand Up @@ -3442,7 +3448,8 @@ export class DlpServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listDlpJobs'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listDlpJobs.createStream(
this.innerApiCalls.listDlpJobs as gax.GaxCall,
Expand Down Expand Up @@ -3541,7 +3548,8 @@ export class DlpServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listDlpJobs'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listDlpJobs.asyncIterate(
this.innerApiCalls['listDlpJobs'] as GaxCall,
Expand Down Expand Up @@ -3709,7 +3717,8 @@ export class DlpServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listStoredInfoTypes'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listStoredInfoTypes.createStream(
this.innerApiCalls.listStoredInfoTypes as gax.GaxCall,
Expand Down Expand Up @@ -3781,7 +3790,8 @@ export class DlpServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listStoredInfoTypes'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listStoredInfoTypes.asyncIterate(
this.innerApiCalls['listStoredInfoTypes'] as GaxCall,
Expand Down
24 changes: 16 additions & 8 deletions baselines/kms/src/v1/key_management_service_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1940,7 +1940,8 @@ export class KeyManagementServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listKeyRings'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listKeyRings.createStream(
this.innerApiCalls.listKeyRings as gax.GaxCall,
Expand Down Expand Up @@ -2001,7 +2002,8 @@ export class KeyManagementServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listKeyRings'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listKeyRings.asyncIterate(
this.innerApiCalls['listKeyRings'] as GaxCall,
Expand Down Expand Up @@ -2149,7 +2151,8 @@ export class KeyManagementServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listCryptoKeys'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listCryptoKeys.createStream(
this.innerApiCalls.listCryptoKeys as gax.GaxCall,
Expand Down Expand Up @@ -2212,7 +2215,8 @@ export class KeyManagementServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listCryptoKeys'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listCryptoKeys.asyncIterate(
this.innerApiCalls['listCryptoKeys'] as GaxCall,
Expand Down Expand Up @@ -2362,7 +2366,8 @@ export class KeyManagementServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listCryptoKeyVersions'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listCryptoKeyVersions.createStream(
this.innerApiCalls.listCryptoKeyVersions as gax.GaxCall,
Expand Down Expand Up @@ -2426,7 +2431,8 @@ export class KeyManagementServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listCryptoKeyVersions'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listCryptoKeyVersions.asyncIterate(
this.innerApiCalls['listCryptoKeyVersions'] as GaxCall,
Expand Down Expand Up @@ -2570,7 +2576,8 @@ export class KeyManagementServiceClient {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listImportJobs'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listImportJobs.createStream(
this.innerApiCalls.listImportJobs as gax.GaxCall,
Expand Down Expand Up @@ -2631,7 +2638,8 @@ export class KeyManagementServiceClient {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listImportJobs'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listImportJobs.asyncIterate(
this.innerApiCalls['listImportJobs'] as GaxCall,
Expand Down
18 changes: 12 additions & 6 deletions baselines/logging/src/v2/config_service_v2_client.ts.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1585,7 +1585,8 @@ export class ConfigServiceV2Client {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listBuckets'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listBuckets.createStream(
this.innerApiCalls.listBuckets as gax.GaxCall,
Expand Down Expand Up @@ -1650,7 +1651,8 @@ export class ConfigServiceV2Client {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listBuckets'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listBuckets.asyncIterate(
this.innerApiCalls['listBuckets'] as GaxCall,
Expand Down Expand Up @@ -1794,7 +1796,8 @@ export class ConfigServiceV2Client {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listSinks'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listSinks.createStream(
this.innerApiCalls.listSinks as gax.GaxCall,
Expand Down Expand Up @@ -1855,7 +1858,8 @@ export class ConfigServiceV2Client {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listSinks'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listSinks.asyncIterate(
this.innerApiCalls['listSinks'] as GaxCall,
Expand Down Expand Up @@ -1999,7 +2003,8 @@ export class ConfigServiceV2Client {
] = gax.routingHeader.fromParams({
'parent': request.parent || '',
});
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listExclusions'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listExclusions.createStream(
this.innerApiCalls.listExclusions as gax.GaxCall,
Expand Down Expand Up @@ -2060,7 +2065,8 @@ export class ConfigServiceV2Client {
'parent': request.parent || '',
});
options = options || {};
const callSettings = new gax.CallSettings(options);
const defaultCallSettings = this._defaults['listExclusions'];
const callSettings = defaultCallSettings.merge(options);
this.initialize();
return this.descriptors.page.listExclusions.asyncIterate(
this.innerApiCalls['listExclusions'] as GaxCall,
Expand Down
Loading

0 comments on commit 5f61bd1

Please sign in to comment.