diff --git a/src/v1/cluster_controller_client.ts b/src/v1/cluster_controller_client.ts index d403133a..55978ccb 100644 --- a/src/v1/cluster_controller_client.ts +++ b/src/v1/cluster_controller_client.ts @@ -511,6 +511,8 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + cluster_name: request.clusterName || '', }); this.initialize(); return this.innerApiCalls.getCluster(request, options, callback); @@ -636,6 +638,7 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); this.initialize(); return this.innerApiCalls.createCluster(request, options, callback); @@ -859,6 +862,8 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + cluster_name: request.clusterName || '', }); this.initialize(); return this.innerApiCalls.updateCluster(request, options, callback); @@ -1017,6 +1022,8 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + cluster_name: request.clusterName || '', }); this.initialize(); return this.innerApiCalls.stopCluster(request, options, callback); @@ -1175,6 +1182,8 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + cluster_name: request.clusterName || '', }); this.initialize(); return this.innerApiCalls.startCluster(request, options, callback); @@ -1335,6 +1344,8 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + cluster_name: request.clusterName || '', }); this.initialize(); return this.innerApiCalls.deleteCluster(request, options, callback); @@ -1483,6 +1494,8 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + cluster_name: request.clusterName || '', }); this.initialize(); return this.innerApiCalls.diagnoseCluster(request, options, callback); @@ -1632,6 +1645,7 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); this.initialize(); return this.innerApiCalls.listClusters(request, options, callback); @@ -1693,6 +1707,7 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); const defaultCallSettings = this._defaults['listClusters']; const callSettings = defaultCallSettings.merge(options); @@ -1763,6 +1778,7 @@ export class ClusterControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); const defaultCallSettings = this._defaults['listClusters']; const callSettings = defaultCallSettings.merge(options); diff --git a/src/v1/job_controller_client.ts b/src/v1/job_controller_client.ts index 291fbd17..6dcbf9f9 100644 --- a/src/v1/job_controller_client.ts +++ b/src/v1/job_controller_client.ts @@ -464,6 +464,7 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); this.initialize(); return this.innerApiCalls.submitJob(request, options, callback); @@ -552,6 +553,8 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + job_id: request.jobId || '', }); this.initialize(); return this.innerApiCalls.getJob(request, options, callback); @@ -649,6 +652,8 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + job_id: request.jobId || '', }); this.initialize(); return this.innerApiCalls.updateJob(request, options, callback); @@ -741,6 +746,8 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + job_id: request.jobId || '', }); this.initialize(); return this.innerApiCalls.cancelJob(request, options, callback); @@ -830,6 +837,8 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', + job_id: request.jobId || '', }); this.initialize(); return this.innerApiCalls.deleteJob(request, options, callback); @@ -952,6 +961,7 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); this.initialize(); return this.innerApiCalls.submitJobAsOperation(request, options, callback); @@ -1103,6 +1113,7 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); this.initialize(); return this.innerApiCalls.listJobs(request, options, callback); @@ -1168,6 +1179,7 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); const defaultCallSettings = this._defaults['listJobs']; const callSettings = defaultCallSettings.merge(options); @@ -1242,6 +1254,7 @@ export class JobControllerClient { options.otherArgs.headers['x-goog-request-params'] = gax.routingHeader.fromParams({ project_id: request.projectId || '', + region: request.region || '', }); const defaultCallSettings = this._defaults['listJobs']; const callSettings = defaultCallSettings.merge(options); diff --git a/test/gapic_cluster_controller_v1.ts b/test/gapic_cluster_controller_v1.ts index 5e578696..8950e4b1 100644 --- a/test/gapic_cluster_controller_v1.ts +++ b/test/gapic_cluster_controller_v1.ts @@ -253,7 +253,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.GetClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -284,7 +286,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.GetClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -331,7 +335,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.GetClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -362,6 +368,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.GetClusterRequest() ); request.projectId = ''; + request.region = ''; + request.clusterName = ''; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getCluster(request), expectedError); @@ -379,7 +387,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.CreateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -412,7 +421,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.CreateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -466,7 +476,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.CreateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -497,7 +508,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.CreateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -573,7 +585,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -606,7 +620,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -660,7 +676,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -691,7 +709,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -767,7 +787,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StopClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -799,7 +821,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StopClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -853,7 +877,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StopClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -884,7 +910,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StopClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -957,7 +985,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StartClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -989,7 +1019,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StartClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1043,7 +1075,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StartClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1074,7 +1108,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.StartClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1147,7 +1183,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1180,7 +1218,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1234,7 +1274,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1265,7 +1307,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1341,7 +1385,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DiagnoseClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1374,7 +1420,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DiagnoseClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1428,7 +1476,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DiagnoseClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1459,7 +1509,9 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.DiagnoseClusterRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.clusterName = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&cluster_name='; const expectedOptions = { otherArgs: { headers: { @@ -1535,7 +1587,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.ListClustersRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -1568,7 +1621,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.ListClustersRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -1617,7 +1671,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.ListClustersRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -1648,7 +1703,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.ListClustersRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedResponse = [ generateSampleMessage(new protos.google.cloud.dataproc.v1.Cluster()), generateSampleMessage(new protos.google.cloud.dataproc.v1.Cluster()), @@ -1697,7 +1753,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.ListClustersRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedError = new Error('expected'); client.descriptors.page.listClusters.createStream = stubPageStreamingCall( undefined, @@ -1743,7 +1800,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.ListClustersRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedResponse = [ generateSampleMessage(new protos.google.cloud.dataproc.v1.Cluster()), generateSampleMessage(new protos.google.cloud.dataproc.v1.Cluster()), @@ -1781,7 +1839,8 @@ describe('v1.ClusterControllerClient', () => { new protos.google.cloud.dataproc.v1.ListClustersRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedError = new Error('expected'); client.descriptors.page.listClusters.asyncIterate = stubAsyncIterationCall(undefined, expectedError); diff --git a/test/gapic_job_controller_v1.ts b/test/gapic_job_controller_v1.ts index 35009677..1ea33e2a 100644 --- a/test/gapic_job_controller_v1.ts +++ b/test/gapic_job_controller_v1.ts @@ -251,7 +251,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -282,7 +283,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -329,7 +331,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -357,6 +360,7 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; + request.region = ''; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.submitJob(request), expectedError); @@ -374,7 +378,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.GetJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -405,7 +411,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.GetJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -452,7 +460,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.GetJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -480,6 +490,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.GetJobRequest() ); request.projectId = ''; + request.region = ''; + request.jobId = ''; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getJob(request), expectedError); @@ -497,7 +509,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -528,7 +542,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -575,7 +591,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -603,6 +621,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.UpdateJobRequest() ); request.projectId = ''; + request.region = ''; + request.jobId = ''; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.updateJob(request), expectedError); @@ -620,7 +640,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.CancelJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -651,7 +673,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.CancelJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -698,7 +722,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.CancelJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -726,6 +752,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.CancelJobRequest() ); request.projectId = ''; + request.region = ''; + request.jobId = ''; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.cancelJob(request), expectedError); @@ -743,7 +771,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -774,7 +804,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -821,7 +853,9 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + request.jobId = ''; + const expectedHeaderRequestParams = 'project_id=®ion=&job_id='; const expectedOptions = { otherArgs: { headers: { @@ -849,6 +883,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.DeleteJobRequest() ); request.projectId = ''; + request.region = ''; + request.jobId = ''; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteJob(request), expectedError); @@ -866,7 +902,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -899,7 +936,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -953,7 +991,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -984,7 +1023,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.SubmitJobRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -1060,7 +1100,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.ListJobsRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -1093,7 +1134,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.ListJobsRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -1142,7 +1184,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.ListJobsRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedOptions = { otherArgs: { headers: { @@ -1170,7 +1213,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.ListJobsRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedResponse = [ generateSampleMessage(new protos.google.cloud.dataproc.v1.Job()), generateSampleMessage(new protos.google.cloud.dataproc.v1.Job()), @@ -1215,7 +1259,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.ListJobsRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedError = new Error('expected'); client.descriptors.page.listJobs.createStream = stubPageStreamingCall( undefined, @@ -1257,7 +1302,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.ListJobsRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedResponse = [ generateSampleMessage(new protos.google.cloud.dataproc.v1.Job()), generateSampleMessage(new protos.google.cloud.dataproc.v1.Job()), @@ -1293,7 +1339,8 @@ describe('v1.JobControllerClient', () => { new protos.google.cloud.dataproc.v1.ListJobsRequest() ); request.projectId = ''; - const expectedHeaderRequestParams = 'project_id='; + request.region = ''; + const expectedHeaderRequestParams = 'project_id=®ion='; const expectedError = new Error('expected'); client.descriptors.page.listJobs.asyncIterate = stubAsyncIterationCall( undefined,