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

package/src/v1/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,6 +15,8 @@ import {
   executeHttpCall,
   marshalRequest,
   parseResponse,
+  executeWait,
+  StillRunningError,
 } from './utils';
 import pkgJson from '../../package.json' with {type: 'json'};
 import {z} from 'zod';
@@ -117,7 +118,7 @@ const PACKAGE_SEGMENT = {
   value: pkgJson.version,
 };
 
-export class Client {
+export class PostgresClient {
   private readonly host: string;
   // Workspace ID used to route workspace-level calls on unified hosts (SPOG).
   // When set, workspace-level methods send X-Databricks-Org-Id on every
@@ -137,18 +138,16 @@ export class Client {
     this.host = options.host.replace(/\/$/, '');
     this.workspaceId = options.workspaceId;
     this.logger = options.logger ?? new NoOpLogger();
-    let info = createDefault().with(PACKAGE_SEGMENT);
-    if (options.credentials !== undefined) {
-      info = info
-        .with({key: 'sdk-js-auth', value: AUTH_VERSION})
-        .with({key: 'auth', value: options.credentials.name()});
-    }
+    const info = createDefault()
+      .with(PACKAGE_SEGMENT)
+      .with({key: 'sdk-js-auth', value: AUTH_VERSION})
+      .with({key: 'auth', value: options.credentials?.name() ?? 'default'});
     this.userAgent = info.toString();
     this.httpClient = newHttpClient(options);
   }
 
   /** Creates a new database branch in the project. */
-  async createBranch(
+  private async createBranch(
     req: CreateBranchRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -164,7 +163,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.branch, marshalBranchSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -186,7 +185,7 @@ export class Client {
     };
     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;
   }
@@ -200,7 +199,7 @@ export class Client {
   }
 
   /** Register a Postgres database in the Unity Catalog. */
-  async createCatalog(
+  private async createCatalog(
     req: CreateCatalogRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -213,7 +212,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.catalog, marshalCatalogSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -235,7 +234,7 @@ export class Client {
     };
     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;
   }
@@ -253,7 +252,7 @@ export class Client {
    *
    * Creates a database in the specified branch. A branch can have multiple databases.
    */
-  async createDatabase(
+  private async createDatabase(
     req: CreateDatabaseRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -266,7 +265,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.database, marshalDatabaseSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -288,7 +287,7 @@ export class Client {
     };
     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;
   }
@@ -302,7 +301,7 @@ export class Client {
   }
 
   /** Creates a new compute endpoint in the branch. */
-  async createEndpoint(
+  private async createEndpoint(
     req: CreateEndpointRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -318,7 +317,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.endpoint, marshalEndpointSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -340,7 +339,7 @@ export class Client {
     };
     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;
   }
@@ -354,7 +353,7 @@ export class Client {
   }
 
   /** Creates a new Lakebase Autoscaling Postgres database project, which contains branches and compute endpoints. */
-  async createProject(
+  private async createProject(
     req: CreateProjectRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -367,7 +366,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.project, marshalProjectSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -389,7 +388,7 @@ export class Client {
     };
     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;
   }
@@ -403,7 +402,7 @@ export class Client {
   }
 
   /** Creates a new Postgres role in the branch. */
-  async createRole(
+  private async createRole(
     req: CreateRoleRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -416,7 +415,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.role, marshalRoleSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -438,7 +437,7 @@ export class Client {
     };
     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;
   }
@@ -452,7 +451,7 @@ export class Client {
   }
 
   /** Create a Synced Table. */
-  async createSyncedTable(
+  private async createSyncedTable(
     req: CreateSyncedTableRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -465,7 +464,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.syncedTable, marshalSyncedTableSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -487,7 +486,7 @@ export class Client {
     };
     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;
   }
@@ -501,7 +500,7 @@ export class Client {
   }
 
   /** Deletes the specified database branch. */
-  async deleteBranch(
+  private async deleteBranch(
     req: DeleteBranchRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -513,7 +512,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -529,7 +528,7 @@ export class Client {
     };
     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;
   }
@@ -543,13 +542,13 @@ export class Client {
   }
 
   /** Delete a Database Catalog. */
-  async deleteCatalog(
+  private async deleteCatalog(
     req: DeleteCatalogRequest,
     options?: CallOptions
   ): Promise<Operation> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -565,7 +564,7 @@ export class Client {
     };
     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;
   }
@@ -579,13 +578,13 @@ export class Client {
   }
 
   /** Delete a Database. */
-  async deleteDatabase(
+  private async deleteDatabase(
     req: DeleteDatabaseRequest,
     options?: CallOptions
   ): Promise<Operation> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -601,7 +600,7 @@ export class Client {
     };
     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;
   }
@@ -615,13 +614,13 @@ export class Client {
   }
 
   /** Deletes the specified compute endpoint. */
-  async deleteEndpoint(
+  private async deleteEndpoint(
     req: DeleteEndpointRequest,
     options?: CallOptions
   ): Promise<Operation> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -637,7 +636,7 @@ export class Client {
     };
     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;
   }
@@ -651,7 +650,7 @@ export class Client {
   }
 
   /** Deletes the specified database project. */
-  async deleteProject(
+  private async deleteProject(
     req: DeleteProjectRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -663,7 +662,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -679,7 +678,7 @@ export class Client {
     };
     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;
   }
@@ -693,7 +692,7 @@ export class Client {
   }
 
   /** Deletes the specified Postgres role. */
-  async deleteRole(
+  private async deleteRole(
     req: DeleteRoleRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -705,7 +704,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -721,7 +720,7 @@ export class Client {
     };
     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;
   }
@@ -735,13 +734,13 @@ export class Client {
   }
 
   /** Delete a Synced Table. */
-  async deleteSyncedTable(
+  private async deleteSyncedTable(
     req: DeleteSyncedTableRequest,
     options?: CallOptions
   ): Promise<Operation> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -757,7 +756,7 @@ export class Client {
     };
     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;
   }
@@ -781,7 +780,7 @@ export class Client {
       marshalGenerateDatabaseCredentialRequestSchema
     );
     let resp: DatabaseCredential | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -797,7 +796,7 @@ export class Client {
     };
     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;
   }
@@ -809,7 +808,7 @@ export class Client {
   ): Promise<Branch> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Branch | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -825,7 +824,7 @@ export class Client {
     };
     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;
   }
@@ -837,7 +836,7 @@ export class Client {
   ): Promise<Catalog> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Catalog | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -853,7 +852,7 @@ export class Client {
     };
     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;
   }
@@ -865,7 +864,7 @@ export class Client {
   ): Promise<Database> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Database | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -881,7 +880,7 @@ export class Client {
     };
     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;
   }
@@ -893,7 +892,7 @@ export class Client {
   ): Promise<Endpoint> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Endpoint | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -909,7 +908,7 @@ export class Client {
     };
     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;
   }
@@ -921,7 +920,7 @@ export class Client {
   ): Promise<Operation> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -937,7 +936,7 @@ export class Client {
     };
     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;
   }
@@ -949,7 +948,7 @@ export class Client {
   ): Promise<Project> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Project | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -965,7 +964,7 @@ export class Client {
     };
     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;
   }
@@ -974,7 +973,7 @@ export class Client {
   async getRole(req: GetRoleRequest, options?: CallOptions): Promise<Role> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: Role | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -990,7 +989,7 @@ export class Client {
     };
     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;
   }
@@ -1002,7 +1001,7 @@ export class Client {
   ): Promise<SyncedTable> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}`;
     let resp: SyncedTable | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -1018,7 +1017,7 @@ export class Client {
     };
     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;
   }
@@ -1042,7 +1041,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: ListBranchesResponse | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -1058,7 +1057,7 @@ export class Client {
     };
     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;
   }
@@ -1096,7 +1095,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: ListDatabasesResponse | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -1112,7 +1111,7 @@ export class Client {
     };
     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;
   }
@@ -1150,7 +1149,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: ListEndpointsResponse | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -1166,7 +1165,7 @@ export class Client {
     };
     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;
   }
@@ -1207,7 +1206,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: ListProjectsResponse | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -1223,7 +1222,7 @@ export class Client {
     };
     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;
   }
@@ -1261,7 +1260,7 @@ export class Client {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: ListRolesResponse | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -1277,7 +1276,7 @@ export class Client {
     };
     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;
   }
@@ -1300,14 +1299,14 @@ export class Client {
   }
 
   /** Undeletes the specified database branch. */
-  async undeleteBranch(
+  private async undeleteBranch(
     req: UndeleteBranchRequest,
     options?: CallOptions
   ): Promise<Operation> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}/undelete`;
     const body = marshalRequest(req, marshalUndeleteBranchRequestSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -1323,7 +1322,7 @@ export class Client {
     };
     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;
   }
@@ -1337,14 +1336,14 @@ export class Client {
   }
 
   /** Undeletes a soft-deleted project. */
-  async undeleteProject(
+  private async undeleteProject(
     req: UndeleteProjectRequest,
     options?: CallOptions
   ): Promise<Operation> {
     const url = `${this.host}/api/2.0/postgres/${req.name ?? ''}/undelete`;
     const body = marshalRequest(req, marshalUndeleteProjectRequestSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -1360,7 +1359,7 @@ export class Client {
     };
     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;
   }
@@ -1374,7 +1373,7 @@ export class Client {
   }
 
   /** Updates the specified database branch. You can set this branch as the project's default branch, or protect/unprotect it. */
-  async updateBranch(
+  private async updateBranch(
     req: UpdateBranchRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -1387,7 +1386,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.branch, marshalBranchSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -1409,7 +1408,7 @@ export class Client {
     };
     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;
   }
@@ -1423,7 +1422,7 @@ export class Client {
   }
 
   /** Update a Database. */
-  async updateDatabase(
+  private async updateDatabase(
     req: UpdateDatabaseRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -1436,7 +1435,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.database, marshalDatabaseSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -1458,7 +1457,7 @@ export class Client {
     };
     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;
   }
@@ -1472,7 +1471,7 @@ export class Client {
   }
 
   /** Updates the specified compute endpoint. You can update autoscaling limits, suspend timeout, or enable/disable the compute endpoint. */
-  async updateEndpoint(
+  private async updateEndpoint(
     req: UpdateEndpointRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -1485,7 +1484,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.endpoint, marshalEndpointSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -1507,7 +1506,7 @@ export class Client {
     };
     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;
   }
@@ -1521,7 +1520,7 @@ export class Client {
   }
 
   /** Updates the specified database project. */
-  async updateProject(
+  private async updateProject(
     req: UpdateProjectRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -1534,7 +1533,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.project, marshalProjectSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -1556,7 +1555,7 @@ export class Client {
     };
     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;
   }
@@ -1570,7 +1569,7 @@ export class Client {
   }
 
   /** Update a role for a branch. */
-  async updateRole(
+  private async updateRole(
     req: UpdateRoleRequest,
     options?: CallOptions
   ): Promise<Operation> {
@@ -1583,7 +1582,7 @@ export class Client {
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     const body = marshalRequest(req.role, marshalRoleSchema);
     let resp: Operation | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    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);
@@ -1605,7 +1604,7 @@ export class Client {
     };
     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;
   }
@@ -1621,7 +1620,7 @@ export class Client {
 
 export class CreateBranchOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -1647,23 +1646,22 @@ export class CreateBranchOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Branch> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Branch> {
     let result: Branch | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -1686,16 +1684,9 @@ export class CreateBranchOperation {
       result = z.lazy(() => unmarshalBranchSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -1713,7 +1704,7 @@ export class CreateBranchOperation {
 
 export class CreateCatalogOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -1739,23 +1730,22 @@ export class CreateCatalogOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Catalog> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Catalog> {
     let result: Catalog | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -1778,16 +1768,9 @@ export class CreateCatalogOperation {
       result = z.lazy(() => unmarshalCatalogSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -1805,7 +1788,7 @@ export class CreateCatalogOperation {
 
 export class CreateDatabaseOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -1831,23 +1814,22 @@ export class CreateDatabaseOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Database> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Database> {
     let result: Database | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -1870,16 +1852,9 @@ export class CreateDatabaseOperation {
       result = z.lazy(() => unmarshalDatabaseSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -1897,7 +1872,7 @@ export class CreateDatabaseOperation {
 
 export class CreateEndpointOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -1923,23 +1898,22 @@ export class CreateEndpointOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Endpoint> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Endpoint> {
     let result: Endpoint | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -1962,16 +1936,9 @@ export class CreateEndpointOperation {
       result = z.lazy(() => unmarshalEndpointSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -1989,7 +1956,7 @@ export class CreateEndpointOperation {
 
 export class CreateProjectOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2015,23 +1982,22 @@ export class CreateProjectOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Project> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Project> {
     let result: Project | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2054,16 +2020,9 @@ export class CreateProjectOperation {
       result = z.lazy(() => unmarshalProjectSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -2081,7 +2040,7 @@ export class CreateProjectOperation {
 
 export class CreateRoleOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2107,23 +2066,22 @@ export class CreateRoleOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Role> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Role> {
     let result: Role | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2146,16 +2104,9 @@ export class CreateRoleOperation {
       result = z.lazy(() => unmarshalRoleSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -2173,7 +2124,7 @@ export class CreateRoleOperation {
 
 export class CreateSyncedTableOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2199,23 +2150,22 @@ export class CreateSyncedTableOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<SyncedTable> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<SyncedTable> {
     let result: SyncedTable | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2240,16 +2190,9 @@ export class CreateSyncedTableOperation {
         .parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -2267,7 +2210,7 @@ export class CreateSyncedTableOperation {
 
 export class DeleteBranchOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2293,22 +2236,20 @@ export class DeleteBranchOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2325,14 +2266,7 @@ export class DeleteBranchOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2348,7 +2282,7 @@ export class DeleteBranchOperation {
 
 export class DeleteCatalogOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2374,22 +2308,20 @@ export class DeleteCatalogOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2406,14 +2338,7 @@ export class DeleteCatalogOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2429,7 +2354,7 @@ export class DeleteCatalogOperation {
 
 export class DeleteDatabaseOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2455,22 +2380,20 @@ export class DeleteDatabaseOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2487,14 +2410,7 @@ export class DeleteDatabaseOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2510,7 +2426,7 @@ export class DeleteDatabaseOperation {
 
 export class DeleteEndpointOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2536,22 +2452,20 @@ export class DeleteEndpointOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2568,14 +2482,7 @@ export class DeleteEndpointOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2591,7 +2498,7 @@ export class DeleteEndpointOperation {
 
 export class DeleteProjectOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2617,22 +2524,20 @@ export class DeleteProjectOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2649,14 +2554,7 @@ export class DeleteProjectOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2672,7 +2570,7 @@ export class DeleteProjectOperation {
 
 export class DeleteRoleOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2698,22 +2596,20 @@ export class DeleteRoleOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2730,14 +2626,7 @@ export class DeleteRoleOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2753,7 +2642,7 @@ export class DeleteRoleOperation {
 
 export class DeleteSyncedTableOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2779,22 +2668,20 @@ export class DeleteSyncedTableOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2811,14 +2698,7 @@ export class DeleteSyncedTableOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2834,7 +2714,7 @@ export class DeleteSyncedTableOperation {
 
 export class UndeleteBranchOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2860,22 +2740,20 @@ export class UndeleteBranchOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2892,14 +2770,7 @@ export class UndeleteBranchOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2915,7 +2786,7 @@ export class UndeleteBranchOperation {
 
 export class UndeleteProjectOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -2941,22 +2812,20 @@ export class UndeleteProjectOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<void> {
-    const errStillRunning = new Error('operation still in progress');
-
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+  async wait(options?: LroOptions): Promise<void> {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -2973,14 +2842,7 @@ export class UndeleteProjectOperation {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
   }
 
   /** Checks whether the operation has completed */
@@ -2996,7 +2858,7 @@ export class UndeleteProjectOperation {
 
 export class UpdateBranchOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -3022,23 +2884,22 @@ export class UpdateBranchOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Branch> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Branch> {
     let result: Branch | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -3061,16 +2922,9 @@ export class UpdateBranchOperation {
       result = z.lazy(() => unmarshalBranchSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -3088,7 +2942,7 @@ export class UpdateBranchOperation {
 
 export class UpdateDatabaseOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -3114,23 +2968,22 @@ export class UpdateDatabaseOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Database> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Database> {
     let result: Database | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -3153,16 +3006,9 @@ export class UpdateDatabaseOperation {
       result = z.lazy(() => unmarshalDatabaseSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -3180,7 +3026,7 @@ export class UpdateDatabaseOperation {
 
 export class UpdateEndpointOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -3206,23 +3052,22 @@ export class UpdateEndpointOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Endpoint> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Endpoint> {
     let result: Endpoint | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -3245,16 +3090,9 @@ export class UpdateEndpointOperation {
       result = z.lazy(() => unmarshalEndpointSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -3272,7 +3110,7 @@ export class UpdateEndpointOperation {
 
 export class UpdateProjectOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -3298,23 +3136,22 @@ export class UpdateProjectOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Project> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Project> {
     let result: Project | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -3337,16 +3174,9 @@ export class UpdateProjectOperation {
       result = z.lazy(() => unmarshalProjectSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }
@@ -3364,7 +3194,7 @@ export class UpdateProjectOperation {
 
 export class UpdateRoleOperation {
   constructor(
-    private readonly client: Client,
+    private readonly client: PostgresClient,
     private operation: Operation
   ) {}
 
@@ -3390,23 +3220,22 @@ export class UpdateRoleOperation {
    *
    * Throws if the operation failed.
    */
-  async wait(options?: CallOptions): Promise<Role> {
-    const errStillRunning = new Error('operation still in progress');
+  async wait(options?: LroOptions): Promise<Role> {
     let result: Role | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const op = await this.client.getOperation(
         {
           name: this.operation.name,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
       this.operation = op;
       if (op.done === undefined) {
         throw new Error('operation is missing the done field');
       }
       if (!op.done) {
-        throw errStillRunning;
+        throw new StillRunningError();
       }
 
       if (op.result?.$case === 'error') {
@@ -3429,16 +3258,9 @@ export class UpdateRoleOperation {
       result = z.lazy(() => unmarshalRoleSchema).parse(op.result.response);
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err.message.includes('operation still in progress');
-        }),
-    };
-    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;
   }