fix: fixes for dynamic routing and streaming descriptors (#591)

- [ ] Regenerate this pull request now. Use gapic-generator-typescript v2.14.5. PiperOrigin-RevId: 450616838 Source-Link: googleapis/googleapis@7a47b72 Source-Link: googleapis/googleapis-gen@42cc633 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDJjYzYzMzFiYWUwYjk5ZjYxYjhlMDFhZTE1YjA1MjExNzE2YzRmOSJ9
googleapis · May 31, 2022 · 205df22 · 205df22
1 parent 33014b2
commit 205df22
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 60 deletions.
diff --git a/packages/google-cloud-dataproc/src/v1/cluster_controller_client.ts b/packages/google-cloud-dataproc/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/packages/google-cloud-dataproc/src/v1/job_controller_client.ts b/packages/google-cloud-dataproc/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);