npm - @databricks/sdk-postgres - Versions diffs - 0.1.0-dev.2 → 0.1.0-dev.4 - Mend

@databricks/sdk-postgres 0.1.0-dev.2 → 0.1.0-dev.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/dist/v1/client.js CHANGED Viewed

@@ -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';
@@ -69,7 +68,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -104,7 +103,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -143,7 +142,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -181,7 +180,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -216,7 +215,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -251,7 +250,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -286,7 +285,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -320,7 +319,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -348,7 +347,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -376,7 +375,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -404,7 +403,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -438,7 +437,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -472,7 +471,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -500,7 +499,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -529,7 +528,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -553,7 +552,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -577,7 +576,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -601,7 +600,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -625,7 +624,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -649,7 +648,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -673,7 +672,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -697,7 +696,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -721,7 +720,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -757,7 +756,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -803,7 +802,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -849,7 +848,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -898,7 +897,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -944,7 +943,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -982,7 +981,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -1011,7 +1010,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -1046,7 +1045,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -1081,7 +1080,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -1116,7 +1115,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -1151,7 +1150,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -1186,7 +1185,7 @@ export class PostgresClient {
         };
         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;
     }
@@ -1221,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;
@@ -1249,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;
     }
@@ -1294,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;
@@ -1322,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;
     }
@@ -1367,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;
@@ -1395,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;
     }
@@ -1440,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;
@@ -1468,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;
     }
@@ -1513,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;
@@ -1541,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;
     }
@@ -1586,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;
@@ -1614,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;
     }
@@ -1659,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;
@@ -1689,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;
     }
@@ -1734,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;
@@ -1757,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) {
@@ -1798,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;
@@ -1821,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) {
@@ -1862,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;
@@ -1885,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) {
@@ -1926,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;
@@ -1949,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) {
@@ -1990,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;
@@ -2013,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) {
@@ -2054,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;
@@ -2077,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) {
@@ -2118,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;
@@ -2141,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) {
@@ -2182,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;
@@ -2205,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) {
@@ -2246,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;
@@ -2269,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) {
@@ -2310,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;
@@ -2338,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;
     }
@@ -2383,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;
@@ -2411,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;
     }
@@ -2456,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;
@@ -2484,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;
     }
@@ -2529,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;
@@ -2557,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;
     }
@@ -2602,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;
@@ -2630,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;
     }