@databricks/sdk-jobs 0.1.0-dev.1 → 0.1.0-dev.3

package/src/v2/client.ts

@@ -1,13 +1,12 @@
 // Code generated from API definition by Databricks SDK Generator. DO NOT EDIT.
 
 import {VERSION as AUTH_VERSION} from '@databricks/sdk-auth';
-import type {Call} from '@databricks/sdk-core/api';
-import {retryOn} from '@databricks/sdk-core/api';
 import {createDefault} from '@databricks/sdk-core/clientinfo';
 import type {Logger} from '@databricks/sdk-core/logger';
 import {NoOpLogger} from '@databricks/sdk-core/logger';
 import type {CallOptions} from '@databricks/sdk-options/call';
 import type {ClientOptions} from '@databricks/sdk-options/client';
+import type {LroOptions} from '@databricks/sdk-options/lro';
 import type {HttpClient} from '@databricks/sdk-core/http';
 import {newHttpClient} from './transport';
 import {
@@ -16,50 +15,52 @@ import {
   executeHttpCall,
   marshalRequest,
   parseResponse,
+  executeWait,
+  StillRunningError,
 } from './utils';
 import pkgJson from '../../package.json' with {type: 'json'};
 import type {
   BaseJob,
   BaseRun,
   CancelAllRunsRequest,
-  CancelAllRunsRequest_Response,
+  CancelAllRunsResponse,
   CancelRunRequest,
-  CancelRunRequest_Response,
+  CancelRunResponse,
   CreateJobRequest,
-  CreateJobRequest_Response,
+  CreateJobResponse,
   DeleteJobRequest,
-  DeleteJobRequest_Response,
+  DeleteJobResponse,
   DeleteRunRequest,
-  DeleteRunRequest_Response,
+  DeleteRunResponse,
   EnforcePolicyComplianceForJob,
-  EnforcePolicyComplianceForJob_Response,
+  EnforcePolicyComplianceResponse,
   ExportRunRequest,
-  ExportRunRequest_Response,
+  ExportRunResponse,
   GetJobRequest,
-  GetJobRequest_Response,
+  GetJobResponse,
   GetPolicyComplianceForJob,
-  GetPolicyComplianceForJob_Response,
+  GetPolicyComplianceForJobResponse,
   GetRunOutputRequest,
-  GetRunOutputRequest_Response,
+  GetRunOutputResponse,
   GetRunRequest,
-  GetRunRequest_Response,
+  GetRunResponse,
   ListJobComplianceForPolicy,
   ListJobComplianceForPolicy_JobCompliance,
-  ListJobComplianceForPolicy_Response,
+  ListJobComplianceResponse,
   ListJobsRequest,
-  ListJobsRequest_Response,
+  ListJobsResponse,
   ListRunsRequest,
-  ListRunsRequest_Response,
+  ListRunsResponse,
   RepairRunRequest,
-  RepairRunRequest_Response,
+  RepairRunResponse,
   ResetJobRequest,
-  ResetJobRequest_Response,
+  ResetJobResponse,
   RunNowRequest,
-  RunNowRequest_Response,
+  RunNowResponse,
   SubmitRunRequest,
-  SubmitRunRequest_Response,
+  SubmitRunResponse,
   UpdateJobRequest,
-  UpdateJobRequest_Response,
+  UpdateJobResponse,
 } from './model';
 import {
   RunLifeCycleState_RunLifeCycleState,
@@ -74,25 +75,25 @@ import {
   marshalRunNowRequestSchema,
   marshalSubmitRunRequestSchema,
   marshalUpdateJobRequestSchema,
-  unmarshalCancelAllRunsRequest_ResponseSchema,
-  unmarshalCancelRunRequest_ResponseSchema,
-  unmarshalCreateJobRequest_ResponseSchema,
-  unmarshalDeleteJobRequest_ResponseSchema,
-  unmarshalDeleteRunRequest_ResponseSchema,
-  unmarshalEnforcePolicyComplianceForJob_ResponseSchema,
-  unmarshalExportRunRequest_ResponseSchema,
-  unmarshalGetJobRequest_ResponseSchema,
-  unmarshalGetPolicyComplianceForJob_ResponseSchema,
-  unmarshalGetRunOutputRequest_ResponseSchema,
-  unmarshalGetRunRequest_ResponseSchema,
-  unmarshalListJobComplianceForPolicy_ResponseSchema,
-  unmarshalListJobsRequest_ResponseSchema,
-  unmarshalListRunsRequest_ResponseSchema,
-  unmarshalRepairRunRequest_ResponseSchema,
-  unmarshalResetJobRequest_ResponseSchema,
-  unmarshalRunNowRequest_ResponseSchema,
-  unmarshalSubmitRunRequest_ResponseSchema,
-  unmarshalUpdateJobRequest_ResponseSchema,
+  unmarshalCancelAllRunsResponseSchema,
+  unmarshalCancelRunResponseSchema,
+  unmarshalCreateJobResponseSchema,
+  unmarshalDeleteJobResponseSchema,
+  unmarshalDeleteRunResponseSchema,
+  unmarshalEnforcePolicyComplianceResponseSchema,
+  unmarshalExportRunResponseSchema,
+  unmarshalGetJobResponseSchema,
+  unmarshalGetPolicyComplianceForJobResponseSchema,
+  unmarshalGetRunOutputResponseSchema,
+  unmarshalGetRunResponseSchema,
+  unmarshalListJobComplianceResponseSchema,
+  unmarshalListJobsResponseSchema,
+  unmarshalListRunsResponseSchema,
+  unmarshalRepairRunResponseSchema,
+  unmarshalResetJobResponseSchema,
+  unmarshalRunNowResponseSchema,
+  unmarshalSubmitRunResponseSchema,
+  unmarshalUpdateJobResponseSchema,
 } from './model';
 
 // Package identity segment for this client to be used in the User-Agent header.
@@ -101,8 +102,6 @@ const PACKAGE_SEGMENT = {
   value: pkgJson.version,
 };
 
-class StillRunningError extends Error {}
-
 export class JobsClient {
   private readonly host: string;
   // Workspace ID used to route workspace-level calls on unified hosts (SPOG).
@@ -140,14 +139,14 @@ export class JobsClient {
   async enforcePolicyComplianceForJob(
     req: EnforcePolicyComplianceForJob,
     options?: CallOptions
-  ): Promise<EnforcePolicyComplianceForJob_Response> {
+  ): Promise<EnforcePolicyComplianceResponse> {
     const url = `${this.host}/api/2.0/policies/jobs/enforce-compliance`;
     const body = marshalRequest(
       req,
       marshalEnforcePolicyComplianceForJobSchema
     );
-    let resp: EnforcePolicyComplianceForJob_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: EnforcePolicyComplianceResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -161,12 +160,12 @@ export class JobsClient {
       });
       resp = parseResponse(
         respBody,
-        unmarshalEnforcePolicyComplianceForJob_ResponseSchema
+        unmarshalEnforcePolicyComplianceResponseSchema
       );
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -180,7 +179,7 @@ export class JobsClient {
   async getPolicyComplianceForJob(
     req: GetPolicyComplianceForJob,
     options?: CallOptions
-  ): Promise<GetPolicyComplianceForJob_Response> {
+  ): Promise<GetPolicyComplianceForJobResponse> {
     const url = `${this.host}/api/2.0/policies/jobs/get-compliance`;
     const params = new URLSearchParams();
     if (req.jobId !== undefined) {
@@ -188,8 +187,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: GetPolicyComplianceForJob_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: GetPolicyComplianceForJobResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -203,12 +202,12 @@ export class JobsClient {
       });
       resp = parseResponse(
         respBody,
-        unmarshalGetPolicyComplianceForJob_ResponseSchema
+        unmarshalGetPolicyComplianceForJobResponseSchema
       );
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -222,7 +221,7 @@ export class JobsClient {
   async listJobComplianceForPolicy(
     req: ListJobComplianceForPolicy,
     options?: CallOptions
-  ): Promise<ListJobComplianceForPolicy_Response> {
+  ): Promise<ListJobComplianceResponse> {
     const url = `${this.host}/api/2.0/policies/jobs/list-compliance`;
     const params = new URLSearchParams();
     if (req.policyId !== undefined) {
@@ -236,8 +235,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: ListJobComplianceForPolicy_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: ListJobComplianceResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -249,14 +248,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalListJobComplianceForPolicy_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalListJobComplianceResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -285,11 +281,11 @@ export class JobsClient {
   async cancelAllRuns(
     req: CancelAllRunsRequest,
     options?: CallOptions
-  ): Promise<CancelAllRunsRequest_Response> {
+  ): Promise<CancelAllRunsResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/cancel-all`;
     const body = marshalRequest(req, marshalCancelAllRunsRequestSchema);
-    let resp: CancelAllRunsRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: CancelAllRunsResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -301,14 +297,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalCancelAllRunsRequest_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalCancelAllRunsResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -317,14 +310,14 @@ export class JobsClient {
    * Cancels a job run or a task run. The run is canceled asynchronously, so it may still be running when
    * this request completes.
    */
-  async cancelRun(
+  private async cancelRun(
     req: CancelRunRequest,
     options?: CallOptions
-  ): Promise<CancelRunRequest_Response> {
+  ): Promise<CancelRunResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/cancel`;
     const body = marshalRequest(req, marshalCancelRunRequestSchema);
-    let resp: CancelRunRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: CancelRunResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -336,11 +329,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalCancelRunRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalCancelRunResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -360,11 +353,11 @@ export class JobsClient {
   async createJob(
     req: CreateJobRequest,
     options?: CallOptions
-  ): Promise<CreateJobRequest_Response> {
+  ): Promise<CreateJobResponse> {
     const url = `${this.host}/api/2.2/jobs/create`;
     const body = marshalRequest(req, marshalCreateJobRequestSchema);
-    let resp: CreateJobRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: CreateJobResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -376,11 +369,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalCreateJobRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalCreateJobResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -389,11 +382,11 @@ export class JobsClient {
   async deleteJob(
     req: DeleteJobRequest,
     options?: CallOptions
-  ): Promise<DeleteJobRequest_Response> {
+  ): Promise<DeleteJobResponse> {
     const url = `${this.host}/api/2.2/jobs/delete`;
     const body = marshalRequest(req, marshalDeleteJobRequestSchema);
-    let resp: DeleteJobRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: DeleteJobResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -405,11 +398,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalDeleteJobRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalDeleteJobResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -418,11 +411,11 @@ export class JobsClient {
   async deleteRun(
     req: DeleteRunRequest,
     options?: CallOptions
-  ): Promise<DeleteRunRequest_Response> {
+  ): Promise<DeleteRunResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/delete`;
     const body = marshalRequest(req, marshalDeleteRunRequestSchema);
-    let resp: DeleteRunRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: DeleteRunResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -434,11 +427,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalDeleteRunRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalDeleteRunResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -447,7 +440,7 @@ export class JobsClient {
   async exportRun(
     req: ExportRunRequest,
     options?: CallOptions
-  ): Promise<ExportRunRequest_Response> {
+  ): Promise<ExportRunResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/export`;
     const params = new URLSearchParams();
     if (req.runId !== undefined) {
@@ -458,8 +451,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: ExportRunRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: ExportRunResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -471,11 +464,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalExportRunRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalExportRunResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -491,7 +484,7 @@ export class JobsClient {
   async getJob(
     req: GetJobRequest,
     options?: CallOptions
-  ): Promise<GetJobRequest_Response> {
+  ): Promise<GetJobResponse> {
     const url = `${this.host}/api/2.2/jobs/get`;
     const params = new URLSearchParams();
     if (req.jobId !== undefined) {
@@ -505,8 +498,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: GetJobRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: GetJobResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -518,11 +511,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalGetJobRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalGetJobResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -538,7 +531,7 @@ export class JobsClient {
   async getRun(
     req: GetRunRequest,
     options?: CallOptions
-  ): Promise<GetRunRequest_Response> {
+  ): Promise<GetRunResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/get`;
     const params = new URLSearchParams();
     if (req.runId !== undefined) {
@@ -558,8 +551,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: GetRunRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: GetRunResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -571,11 +564,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalGetRunRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalGetRunResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -594,7 +587,7 @@ export class JobsClient {
   async getRunOutput(
     req: GetRunOutputRequest,
     options?: CallOptions
-  ): Promise<GetRunOutputRequest_Response> {
+  ): Promise<GetRunOutputResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/get-output`;
     const params = new URLSearchParams();
     if (req.runId !== undefined) {
@@ -602,8 +595,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: GetRunOutputRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: GetRunOutputResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -615,14 +608,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalGetRunOutputRequest_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalGetRunOutputResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -631,7 +621,7 @@ export class JobsClient {
   async listJobs(
     req: ListJobsRequest,
     options?: CallOptions
-  ): Promise<ListJobsRequest_Response> {
+  ): Promise<ListJobsResponse> {
     const url = `${this.host}/api/2.2/jobs/list`;
     const params = new URLSearchParams();
     if (req.offset !== undefined) {
@@ -651,8 +641,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: ListJobsRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: ListJobsResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -664,11 +654,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalListJobsRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalListJobsResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -694,7 +684,7 @@ export class JobsClient {
   async listRuns(
     req: ListRunsRequest,
     options?: CallOptions
-  ): Promise<ListRunsRequest_Response> {
+  ): Promise<ListRunsResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/list`;
     const params = new URLSearchParams();
     if (req.jobId !== undefined) {
@@ -732,8 +722,8 @@ export class JobsClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: ListRunsRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: ListRunsResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -745,11 +735,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalListRunsRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalListRunsResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -776,14 +766,14 @@ export class JobsClient {
    * They use the current job and task settings, and can be viewed in the history for the
    * original job run.
    */
-  async repair(
+  private async repair(
     req: RepairRunRequest,
     options?: CallOptions
-  ): Promise<RepairRunRequest_Response> {
+  ): Promise<RepairRunResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/repair`;
     const body = marshalRequest(req, marshalRepairRunRequestSchema);
-    let resp: RepairRunRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: RepairRunResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -795,11 +785,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalRepairRunRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalRepairRunResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -819,11 +809,11 @@ export class JobsClient {
   async resetJob(
     req: ResetJobRequest,
     options?: CallOptions
-  ): Promise<ResetJobRequest_Response> {
+  ): Promise<ResetJobResponse> {
     const url = `${this.host}/api/2.2/jobs/reset`;
     const body = marshalRequest(req, marshalResetJobRequestSchema);
-    let resp: ResetJobRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: ResetJobResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -835,24 +825,24 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalResetJobRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalResetJobResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
 
   /** Run a job and return the `run_id` of the triggered run. */
-  async runNow(
+  private async runNow(
     req: RunNowRequest,
     options?: CallOptions
-  ): Promise<RunNowRequest_Response> {
+  ): Promise<RunNowResponse> {
     const url = `${this.host}/api/2.2/jobs/run-now`;
     const body = marshalRequest(req, marshalRunNowRequestSchema);
-    let resp: RunNowRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: RunNowResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -864,11 +854,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalRunNowRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalRunNowResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -897,14 +887,14 @@ export class JobsClient {
    * the compute needs for the job. Alternatively, use the `POST /jobs/create` and
    * `POST /jobs/run-now` endpoints to create and run a saved job.
    */
-  async submitRun(
+  private async submitRun(
     req: SubmitRunRequest,
     options?: CallOptions
-  ): Promise<SubmitRunRequest_Response> {
+  ): Promise<SubmitRunResponse> {
     const url = `${this.host}/api/2.2/jobs/runs/submit`;
     const body = marshalRequest(req, marshalSubmitRunRequestSchema);
-    let resp: SubmitRunRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: SubmitRunResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -916,11 +906,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalSubmitRunRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalSubmitRunResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -940,11 +930,11 @@ export class JobsClient {
   async updateJob(
     req: UpdateJobRequest,
     options?: CallOptions
-  ): Promise<UpdateJobRequest_Response> {
+  ): Promise<UpdateJobResponse> {
     const url = `${this.host}/api/2.2/jobs/update`;
     const body = marshalRequest(req, marshalUpdateJobRequestSchema);
-    let resp: UpdateJobRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: UpdateJobResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -956,11 +946,11 @@ export class JobsClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalUpdateJobRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalUpdateJobResponseSchema);
     };
     await executeCall(call, options);
     if (resp === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return resp;
   }
@@ -977,15 +967,15 @@ export class CancelRunWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetRunRequest_Response> {
-    let result: GetRunRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetRunResponse> {
+    let result: GetRunResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getRun(
         {
           runId: this.runId,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state?.lifeCycleState;
@@ -1007,16 +997,9 @@ export class CancelRunWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }
@@ -1057,15 +1040,15 @@ export class RepairWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetRunRequest_Response> {
-    let result: GetRunRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetRunResponse> {
+    let result: GetRunResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getRun(
         {
           runId: this.runId,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state?.lifeCycleState;
@@ -1087,16 +1070,9 @@ export class RepairWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }
@@ -1137,15 +1113,15 @@ export class RunNowWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetRunRequest_Response> {
-    let result: GetRunRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetRunResponse> {
+    let result: GetRunResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getRun(
         {
           runId: this.runId,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state?.lifeCycleState;
@@ -1167,16 +1143,9 @@ export class RunNowWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }
@@ -1217,15 +1186,15 @@ export class SubmitRunWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetRunRequest_Response> {
-    let result: GetRunRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetRunResponse> {
+    let result: GetRunResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getRun(
         {
           runId: this.runId,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state?.lifeCycleState;
@@ -1247,16 +1216,9 @@ export class SubmitRunWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }