From 4cf9b6342121cdff09767321ab3a24d56f7f13d9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 11:39:41 -0700 Subject: [PATCH] fix: fixes for dynamic routing and streaming descriptors (#327) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: fixes for dynamic routing and streaming descriptors Use gapic-generator-typescript v2.14.5. PiperOrigin-RevId: 450616838 Source-Link: https://github.com/googleapis/googleapis/commit/7a47b72791e0b84d78beca4c2b26bec42ce31572 Source-Link: https://github.com/googleapis/googleapis-gen/commit/42cc6331bae0b99f61b8e01ae15b05211716c4f9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDJjYzYzMzFiYWUwYjk5ZjYxYjhlMDFhZTE1YjA1MjExNzE2YzRmOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- src/v1/cloud_build_client.ts | 8 ++++ test/gapic_cloud_build_v1.ts | 87 +++++++++++++++++++++++++----------- 2 files changed, 69 insertions(+), 26 deletions(-) diff --git a/src/v1/cloud_build_client.ts b/src/v1/cloud_build_client.ts index ca99524..192d02a 100644 --- a/src/v1/cloud_build_client.ts +++ b/src/v1/cloud_build_client.ts @@ -567,6 +567,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + id: request.id || '', name: request.name || '', }); this.initialize(); @@ -664,6 +665,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + id: request.id || '', name: request.name || '', }); this.initialize(); @@ -868,6 +870,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + trigger_id: request.triggerId || '', name: request.name || '', }); this.initialize(); @@ -973,6 +976,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + trigger_id: request.triggerId || '', name: request.name || '', }); this.initialize(); @@ -1077,6 +1081,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + trigger_id: request.triggerId || '', 'trigger.resource_name': request.trigger!.resourceName || '', }); this.initialize(); @@ -1185,6 +1190,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + trigger: request.trigger || '', name: request.name || '', }); this.initialize(); @@ -1560,6 +1566,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + id: request.id || '', name: request.name || '', }); this.initialize(); @@ -1850,6 +1857,7 @@ export class CloudBuildClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + trigger_id: request.triggerId || '', name: request.name || '', }); this.initialize(); diff --git a/test/gapic_cloud_build_v1.ts b/test/gapic_cloud_build_v1.ts index 31f0cb5..33a131a 100644 --- a/test/gapic_cloud_build_v1.ts +++ b/test/gapic_cloud_build_v1.ts @@ -251,8 +251,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -283,8 +284,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -331,8 +333,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -360,6 +363,7 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -378,8 +382,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.CancelBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -410,8 +415,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.CancelBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -458,8 +464,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.CancelBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -490,6 +497,7 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.CancelBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -639,8 +647,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -671,8 +680,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -719,8 +729,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -751,6 +762,7 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.GetBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -769,8 +781,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.DeleteBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -802,8 +815,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.DeleteBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -850,8 +864,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.DeleteBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -882,6 +897,7 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.DeleteBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -900,9 +916,11 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.UpdateBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.trigger = {}; request.trigger.resourceName = ''; - const expectedHeaderRequestParams = 'project_id=&trigger.resource_name='; + const expectedHeaderRequestParams = + 'project_id=&trigger_id=&trigger.resource_name='; const expectedOptions = { otherArgs: { headers: { @@ -934,9 +952,11 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.UpdateBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.trigger = {}; request.trigger.resourceName = ''; - const expectedHeaderRequestParams = 'project_id=&trigger.resource_name='; + const expectedHeaderRequestParams = + 'project_id=&trigger_id=&trigger.resource_name='; const expectedOptions = { otherArgs: { headers: { @@ -983,9 +1003,11 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.UpdateBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.trigger = {}; request.trigger.resourceName = ''; - const expectedHeaderRequestParams = 'project_id=&trigger.resource_name='; + const expectedHeaderRequestParams = + 'project_id=&trigger_id=&trigger.resource_name='; const expectedOptions = { otherArgs: { headers: { @@ -1016,6 +1038,7 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.UpdateBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.trigger = {}; request.trigger.resourceName = ''; const expectedError = new Error('The client has already been closed.'); @@ -1035,8 +1058,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.ReceiveTriggerWebhookRequest() ); request.projectId = ''; + request.trigger = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1068,8 +1092,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.ReceiveTriggerWebhookRequest() ); request.projectId = ''; + request.trigger = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1116,8 +1141,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.ReceiveTriggerWebhookRequest() ); request.projectId = ''; + request.trigger = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1151,6 +1177,7 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.ReceiveTriggerWebhookRequest() ); request.projectId = ''; + request.trigger = ''; request.name = ''; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1492,8 +1519,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RetryBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1525,8 +1553,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RetryBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1580,8 +1609,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RetryBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1612,8 +1642,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RetryBuildRequest() ); request.projectId = ''; + request.id = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1876,8 +1907,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RunBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1910,8 +1942,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RunBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1965,8 +1998,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RunBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: { @@ -1997,8 +2031,9 @@ describe('v1.CloudBuildClient', () => { new protos.google.devtools.cloudbuild.v1.RunBuildTriggerRequest() ); request.projectId = ''; + request.triggerId = ''; request.name = ''; - const expectedHeaderRequestParams = 'project_id=&name='; + const expectedHeaderRequestParams = 'project_id=&trigger_id=&name='; const expectedOptions = { otherArgs: { headers: {