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

package/dist/v1/client.js

@@ -1,10 +1,9 @@
 // Code generated from API definition by Databricks SDK Generator. DO NOT EDIT.
 import { VERSION as AUTH_VERSION } from '@databricks/sdk-auth';
-import { retryOn } from '@databricks/sdk-core/api';
 import { createDefault } from '@databricks/sdk-core/clientinfo';
 import { NoOpLogger } from '@databricks/sdk-core/logger';
 import { newHttpClient } from './transport';
-import { buildHttpRequest, executeCall, executeHttpCall, marshalRequest, parseResponse, } from './utils';
+import { buildHttpRequest, executeCall, executeHttpCall, marshalRequest, parseResponse, executeWait, StillRunningError, } from './utils';
 import pkgJson from '../../package.json' with { type: 'json' };
 import { z } from 'zod';
 import { marshalBranchSchema, marshalCatalogSchema, marshalDatabaseSchema, marshalEndpointSchema, marshalGenerateDatabaseCredentialRequestSchema, marshalProjectSchema, marshalRoleSchema, marshalSyncedTableSchema, marshalUndeleteBranchRequestSchema, marshalUndeleteProjectRequestSchema, unmarshalBranchOperationMetadataSchema, unmarshalBranchSchema, unmarshalCatalogOperationMetadataSchema, unmarshalCatalogSchema, unmarshalDatabaseCredentialSchema, unmarshalDatabaseOperationMetadataSchema, unmarshalDatabaseSchema, unmarshalEndpointOperationMetadataSchema, unmarshalEndpointSchema, unmarshalListBranchesResponseSchema, unmarshalListDatabasesResponseSchema, unmarshalListEndpointsResponseSchema, unmarshalListProjectsResponseSchema, unmarshalListRolesResponseSchema, unmarshalOperationSchema, unmarshalProjectOperationMetadataSchema, unmarshalProjectSchema, unmarshalRoleOperationMetadataSchema, unmarshalRoleSchema, unmarshalSyncedTableOperationMetadataSchema, unmarshalSyncedTableSchema, } from './model';
@@ -13,7 +12,7 @@ const PACKAGE_SEGMENT = {
     key: 'sdk-js-' + pkgJson.name.replace(/^@[^/]+\/sdk-/, ''),
     value: pkgJson.version,
 };
-export class Client {
+export class PostgresClient {
     host;
     // Workspace ID used to route workspace-level calls on unified hosts (SPOG).
     // When set, workspace-level methods send X-Databricks-Org-Id on every
@@ -32,12 +31,10 @@ 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);
     }
@@ -71,7 +68,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;
     }
@@ -106,7 +103,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;
     }
@@ -145,7 +142,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;
     }
@@ -183,7 +180,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;
     }
@@ -218,7 +215,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 +250,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;
     }
@@ -288,7 +285,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;
     }
@@ -322,7 +319,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;
     }
@@ -350,7 +347,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;
     }
@@ -378,7 +375,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;
     }
@@ -406,7 +403,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;
     }
@@ -440,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;
     }
@@ -474,7 +471,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;
     }
@@ -502,7 +499,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;
     }
@@ -531,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;
     }
@@ -555,7 +552,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,7 +576,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;
     }
@@ -603,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;
     }
@@ -627,7 +624,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 +648,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;
     }
@@ -675,7 +672,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;
     }
@@ -699,7 +696,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;
     }
@@ -723,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;
     }
@@ -759,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;
     }
@@ -805,7 +802,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;
     }
@@ -851,7 +848,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;
     }
@@ -900,7 +897,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;
     }
@@ -946,7 +943,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;
     }
@@ -984,7 +981,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;
     }
@@ -1013,7 +1010,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;
     }
@@ -1048,7 +1045,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;
     }
@@ -1083,7 +1080,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;
     }
@@ -1118,7 +1115,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;
     }
@@ -1153,7 +1150,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;
     }
@@ -1188,7 +1185,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;
     }
@@ -1223,18 +1220,17 @@ export class CreateBranchOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1251,15 +1247,9 @@ export class CreateBranchOperation {
             }
             result = z.lazy(() => unmarshalBranchSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -1296,18 +1286,17 @@ export class CreateCatalogOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1324,15 +1313,9 @@ export class CreateCatalogOperation {
             }
             result = z.lazy(() => unmarshalCatalogSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -1369,18 +1352,17 @@ export class CreateDatabaseOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1397,15 +1379,9 @@ export class CreateDatabaseOperation {
             }
             result = z.lazy(() => unmarshalDatabaseSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -1442,18 +1418,17 @@ export class CreateEndpointOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1470,15 +1445,9 @@ export class CreateEndpointOperation {
             }
             result = z.lazy(() => unmarshalEndpointSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -1515,18 +1484,17 @@ export class CreateProjectOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1543,15 +1511,9 @@ export class CreateProjectOperation {
             }
             result = z.lazy(() => unmarshalProjectSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -1588,18 +1550,17 @@ export class CreateRoleOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1616,15 +1577,9 @@ export class CreateRoleOperation {
             }
             result = z.lazy(() => unmarshalRoleSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -1661,18 +1616,17 @@ export class CreateSyncedTableOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1691,15 +1645,9 @@ export class CreateSyncedTableOperation {
                 .lazy(() => unmarshalSyncedTableSchema)
                 .parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -1736,17 +1684,16 @@ export class DeleteBranchOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1759,13 +1706,7 @@ export class DeleteBranchOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -1800,17 +1741,16 @@ export class DeleteCatalogOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1823,13 +1763,7 @@ export class DeleteCatalogOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -1864,17 +1798,16 @@ export class DeleteDatabaseOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1887,13 +1820,7 @@ export class DeleteDatabaseOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -1928,17 +1855,16 @@ export class DeleteEndpointOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -1951,13 +1877,7 @@ export class DeleteEndpointOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -1992,17 +1912,16 @@ export class DeleteProjectOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2015,13 +1934,7 @@ export class DeleteProjectOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -2056,17 +1969,16 @@ export class DeleteRoleOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2079,13 +1991,7 @@ export class DeleteRoleOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -2120,17 +2026,16 @@ export class DeleteSyncedTableOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2143,13 +2048,7 @@ export class DeleteSyncedTableOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -2184,17 +2083,16 @@ export class UndeleteBranchOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2207,13 +2105,7 @@ export class UndeleteBranchOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -2248,17 +2140,16 @@ export class UndeleteProjectOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2271,13 +2162,7 @@ export class UndeleteProjectOperation {
                 });
             }
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                return err.message.includes('operation still in progress');
-            }),
-        };
-        await executeCall(call, retryOptions);
+        await executeWait(call, options);
     }
     /** Checks whether the operation has completed */
     async done(options) {
@@ -2312,18 +2197,17 @@ export class UpdateBranchOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2340,15 +2224,9 @@ export class UpdateBranchOperation {
             }
             result = z.lazy(() => unmarshalBranchSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -2385,18 +2263,17 @@ export class UpdateDatabaseOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2413,15 +2290,9 @@ export class UpdateDatabaseOperation {
             }
             result = z.lazy(() => unmarshalDatabaseSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -2458,18 +2329,17 @@ export class UpdateEndpointOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2486,15 +2356,9 @@ export class UpdateEndpointOperation {
             }
             result = z.lazy(() => unmarshalEndpointSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -2531,18 +2395,17 @@ export class UpdateProjectOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2559,15 +2422,9 @@ export class UpdateProjectOperation {
             }
             result = z.lazy(() => unmarshalProjectSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }
@@ -2604,18 +2461,17 @@ export class UpdateRoleOperation {
      * Throws if the operation failed.
      */
     async wait(options) {
-        const errStillRunning = new Error('operation still in progress');
         let result;
         const call = async (callSignal) => {
             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') {
                 const err = op.result.error;
@@ -2632,15 +2488,9 @@ export class UpdateRoleOperation {
             }
             result = z.lazy(() => unmarshalRoleSchema).parse(op.result.response);
         };
-        const retryOptions = {
-            ...(options?.signal !== undefined && { signal: options.signal }),
-            retrier: () => retryOn({}, (err) => {
-                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;
     }