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

package/src/v1/client.ts

@@ -1,13 +1,12 @@
 // Code generated from API definition by Databricks SDK Generator. DO NOT EDIT.
 
 import {VERSION as AUTH_VERSION} from '@databricks/sdk-auth';
-import type {Call} from '@databricks/sdk-core/api';
-import {retryOn} from '@databricks/sdk-core/api';
 import {createDefault} from '@databricks/sdk-core/clientinfo';
 import type {Logger} from '@databricks/sdk-core/logger';
 import {NoOpLogger} from '@databricks/sdk-core/logger';
 import type {CallOptions} from '@databricks/sdk-options/call';
 import type {ClientOptions} from '@databricks/sdk-options/client';
+import type {LroOptions} from '@databricks/sdk-options/lro';
 import type {HttpClient} from '@databricks/sdk-core/http';
 import {newHttpClient} from './transport';
 import {
@@ -16,34 +15,36 @@ import {
   executeHttpCall,
   marshalRequest,
   parseResponse,
+  executeWait,
+  StillRunningError,
 } from './utils';
 import pkgJson from '../../package.json' with {type: 'json'};
 import type {
   CreateDefaultWarehouseOverrideRequest,
   CreateWarehouseRequest,
-  CreateWarehouseRequest_Response,
+  CreateWarehouseResponse,
   DefaultWarehouseOverride,
   DeleteDefaultWarehouseOverrideRequest,
   DeleteWarehouseRequest,
-  DeleteWarehouseRequest_Response,
+  DeleteWarehouseResponse,
   EditWarehouseRequest,
-  EditWarehouseRequest_Response,
+  EditWarehouseResponse,
   EndpointInfo,
   GetDefaultWarehouseOverrideRequest,
   GetWarehouseRequest,
-  GetWarehouseRequest_Response,
+  GetWarehouseResponse,
   GetWorkspaceWarehouseConfigRequest,
-  GetWorkspaceWarehouseConfigRequest_Response,
+  GetWorkspaceWarehouseConfigResponse,
   ListDefaultWarehouseOverridesRequest,
   ListDefaultWarehouseOverridesResponse,
   ListWarehousesRequest,
-  ListWarehousesRequest_Response,
+  ListWarehousesResponse,
   SetWorkspaceWarehouseConfigRequest,
-  SetWorkspaceWarehouseConfigRequest_Response,
+  SetWorkspaceWarehouseConfigResponse,
   StartRequest,
-  StartRequest_Response,
+  StartResponse,
   StopRequest,
-  StopRequest_Response,
+  StopResponse,
   UpdateDefaultWarehouseOverrideRequest,
 } from './model';
 import {
@@ -54,17 +55,17 @@ import {
   marshalSetWorkspaceWarehouseConfigRequestSchema,
   marshalStartRequestSchema,
   marshalStopRequestSchema,
-  unmarshalCreateWarehouseRequest_ResponseSchema,
+  unmarshalCreateWarehouseResponseSchema,
   unmarshalDefaultWarehouseOverrideSchema,
-  unmarshalDeleteWarehouseRequest_ResponseSchema,
-  unmarshalEditWarehouseRequest_ResponseSchema,
-  unmarshalGetWarehouseRequest_ResponseSchema,
-  unmarshalGetWorkspaceWarehouseConfigRequest_ResponseSchema,
+  unmarshalDeleteWarehouseResponseSchema,
+  unmarshalEditWarehouseResponseSchema,
+  unmarshalGetWarehouseResponseSchema,
+  unmarshalGetWorkspaceWarehouseConfigResponseSchema,
   unmarshalListDefaultWarehouseOverridesResponseSchema,
-  unmarshalListWarehousesRequest_ResponseSchema,
-  unmarshalSetWorkspaceWarehouseConfigRequest_ResponseSchema,
-  unmarshalStartRequest_ResponseSchema,
-  unmarshalStopRequest_ResponseSchema,
+  unmarshalListWarehousesResponseSchema,
+  unmarshalSetWorkspaceWarehouseConfigResponseSchema,
+  unmarshalStartResponseSchema,
+  unmarshalStopResponseSchema,
 } from './model';
 
 // Package identity segment for this client to be used in the User-Agent header.
@@ -73,8 +74,6 @@ const PACKAGE_SEGMENT = {
   value: pkgJson.version,
 };
 
-class StillRunningError extends Error {}
-
 export class WarehousesClient {
   private readonly host: string;
   // Workspace ID used to route workspace-level calls on unified hosts (SPOG).
@@ -126,7 +125,7 @@ export class WarehousesClient {
       marshalDefaultWarehouseOverrideSchema
     );
     let resp: DefaultWarehouseOverride | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -148,20 +147,20 @@ export class WarehousesClient {
     };
     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;
   }
 
   /** Creates a new SQL warehouse. */
-  async createWarehouse(
+  private async createWarehouse(
     req: CreateWarehouseRequest,
     options?: CallOptions
-  ): Promise<CreateWarehouseRequest_Response> {
+  ): Promise<CreateWarehouseResponse> {
     const url = `${this.host}/api/2.0/sql/warehouses`;
     const body = marshalRequest(req, marshalCreateWarehouseRequestSchema);
-    let resp: CreateWarehouseRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: CreateWarehouseResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -173,14 +172,11 @@ export class WarehousesClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalCreateWarehouseRequest_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalCreateWarehouseResponseSchema);
     };
     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;
   }
@@ -206,7 +202,7 @@ export class WarehousesClient {
     options?: CallOptions
   ): Promise<void> {
     const url = `${this.host}/api/warehouses/v1/${req.name ?? ''}`;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -226,10 +222,10 @@ export class WarehousesClient {
   async deleteWarehouse(
     req: DeleteWarehouseRequest,
     options?: CallOptions
-  ): Promise<DeleteWarehouseRequest_Response> {
+  ): Promise<DeleteWarehouseResponse> {
     const url = `${this.host}/api/2.0/sql/warehouses/${req.id ?? ''}`;
-    let resp: DeleteWarehouseRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: DeleteWarehouseResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -241,27 +237,24 @@ export class WarehousesClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalDeleteWarehouseRequest_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalDeleteWarehouseResponseSchema);
     };
     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;
   }
 
   /** Updates the configuration for a SQL warehouse. */
-  async editWarehouse(
+  private async editWarehouse(
     req: EditWarehouseRequest,
     options?: CallOptions
-  ): Promise<EditWarehouseRequest_Response> {
+  ): Promise<EditWarehouseResponse> {
     const url = `${this.host}/api/2.0/sql/warehouses/${req.id ?? ''}/edit`;
     const body = marshalRequest(req, marshalEditWarehouseRequestSchema);
-    let resp: EditWarehouseRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: EditWarehouseResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -273,14 +266,11 @@ export class WarehousesClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalEditWarehouseRequest_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalEditWarehouseResponseSchema);
     };
     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;
   }
@@ -307,7 +297,7 @@ export class WarehousesClient {
   ): Promise<DefaultWarehouseOverride> {
     const url = `${this.host}/api/warehouses/v1/${req.name ?? ''}`;
     let resp: DefaultWarehouseOverride | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -323,7 +313,7 @@ export class WarehousesClient {
     };
     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;
   }
@@ -332,10 +322,10 @@ export class WarehousesClient {
   async getWarehouse(
     req: GetWarehouseRequest,
     options?: CallOptions
-  ): Promise<GetWarehouseRequest_Response> {
+  ): Promise<GetWarehouseResponse> {
     const url = `${this.host}/api/2.0/sql/warehouses/${req.id ?? ''}`;
-    let resp: GetWarehouseRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: GetWarehouseResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -347,14 +337,11 @@ export class WarehousesClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalGetWarehouseRequest_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalGetWarehouseResponseSchema);
     };
     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;
   }
@@ -363,10 +350,10 @@ export class WarehousesClient {
   async getWorkspaceWarehouseConfig(
     _req: GetWorkspaceWarehouseConfigRequest,
     options?: CallOptions
-  ): Promise<GetWorkspaceWarehouseConfigRequest_Response> {
+  ): Promise<GetWorkspaceWarehouseConfigResponse> {
     const url = `${this.host}/api/2.0/sql/config/warehouses`;
-    let resp: GetWorkspaceWarehouseConfigRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: GetWorkspaceWarehouseConfigResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -380,12 +367,12 @@ export class WarehousesClient {
       });
       resp = parseResponse(
         respBody,
-        unmarshalGetWorkspaceWarehouseConfigRequest_ResponseSchema
+        unmarshalGetWorkspaceWarehouseConfigResponseSchema
       );
     };
     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;
   }
@@ -409,7 +396,7 @@ export class WarehousesClient {
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
     let resp: ListDefaultWarehouseOverridesResponse | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -428,7 +415,7 @@ export class WarehousesClient {
     };
     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;
   }
@@ -454,7 +441,7 @@ export class WarehousesClient {
   async listWarehouses(
     req: ListWarehousesRequest,
     options?: CallOptions
-  ): Promise<ListWarehousesRequest_Response> {
+  ): Promise<ListWarehousesResponse> {
     const url = `${this.host}/api/2.0/sql/warehouses`;
     const params = new URLSearchParams();
     if (req.runAsUserId !== undefined) {
@@ -468,8 +455,8 @@ export class WarehousesClient {
     }
     const query = params.toString();
     const fullUrl = query !== '' ? `${url}?${query}` : url;
-    let resp: ListWarehousesRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: ListWarehousesResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers();
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -481,14 +468,11 @@ export class WarehousesClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(
-        respBody,
-        unmarshalListWarehousesRequest_ResponseSchema
-      );
+      resp = parseResponse(respBody, unmarshalListWarehousesResponseSchema);
     };
     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;
   }
@@ -514,14 +498,14 @@ export class WarehousesClient {
   async setWorkspaceWarehouseConfig(
     req: SetWorkspaceWarehouseConfigRequest,
     options?: CallOptions
-  ): Promise<SetWorkspaceWarehouseConfigRequest_Response> {
+  ): Promise<SetWorkspaceWarehouseConfigResponse> {
     const url = `${this.host}/api/2.0/sql/config/warehouses`;
     const body = marshalRequest(
       req,
       marshalSetWorkspaceWarehouseConfigRequestSchema
     );
-    let resp: SetWorkspaceWarehouseConfigRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: SetWorkspaceWarehouseConfigResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -535,25 +519,25 @@ export class WarehousesClient {
       });
       resp = parseResponse(
         respBody,
-        unmarshalSetWorkspaceWarehouseConfigRequest_ResponseSchema
+        unmarshalSetWorkspaceWarehouseConfigResponseSchema
       );
     };
     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;
   }
 
   /** Starts a SQL warehouse. */
-  async startWarehouse(
+  private async startWarehouse(
     req: StartRequest,
     options?: CallOptions
-  ): Promise<StartRequest_Response> {
+  ): Promise<StartResponse> {
     const url = `${this.host}/api/2.0/sql/warehouses/${req.id ?? ''}/start`;
     const body = marshalRequest(req, marshalStartRequestSchema);
-    let resp: StartRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: StartResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -565,11 +549,11 @@ export class WarehousesClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalStartRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalStartResponseSchema);
     };
     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;
   }
@@ -586,14 +570,14 @@ export class WarehousesClient {
   }
 
   /** Stops a SQL warehouse. */
-  async stopWarehouse(
+  private async stopWarehouse(
     req: StopRequest,
     options?: CallOptions
-  ): Promise<StopRequest_Response> {
+  ): Promise<StopResponse> {
     const url = `${this.host}/api/2.0/sql/warehouses/${req.id ?? ''}/stop`;
     const body = marshalRequest(req, marshalStopRequestSchema);
-    let resp: StopRequest_Response | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    let resp: StopResponse | undefined;
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -605,11 +589,11 @@ export class WarehousesClient {
         httpClient: this.httpClient,
         logger: this.logger,
       });
-      resp = parseResponse(respBody, unmarshalStopRequest_ResponseSchema);
+      resp = parseResponse(respBody, unmarshalStopResponseSchema);
     };
     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;
   }
@@ -648,7 +632,7 @@ export class WarehousesClient {
       marshalDefaultWarehouseOverrideSchema
     );
     let resp: DefaultWarehouseOverride | undefined;
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const headers = new Headers({'Content-Type': 'application/json'});
       if (this.workspaceId !== undefined) {
         headers.set('X-Databricks-Org-Id', this.workspaceId);
@@ -670,7 +654,7 @@ export class WarehousesClient {
     };
     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;
   }
@@ -687,15 +671,15 @@ export class CreateWarehouseWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetWarehouseRequest_Response> {
-    let result: GetWarehouseRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetWarehouseResponse> {
+    let result: GetWarehouseResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getWarehouse(
         {
           id: this.id,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state;
@@ -717,16 +701,9 @@ export class CreateWarehouseWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }
@@ -767,15 +744,15 @@ export class EditWarehouseWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetWarehouseRequest_Response> {
-    let result: GetWarehouseRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetWarehouseResponse> {
+    let result: GetWarehouseResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getWarehouse(
         {
           id: this.id,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state;
@@ -797,16 +774,9 @@ export class EditWarehouseWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }
@@ -847,15 +817,15 @@ export class StartWarehouseWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetWarehouseRequest_Response> {
-    let result: GetWarehouseRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetWarehouseResponse> {
+    let result: GetWarehouseResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getWarehouse(
         {
           id: this.id,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state;
@@ -877,16 +847,9 @@ export class StartWarehouseWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }
@@ -927,15 +890,15 @@ export class StopWarehouseWaiter {
    *
    * Throws if a failure state is reached.
    */
-  async wait(options?: CallOptions): Promise<GetWarehouseRequest_Response> {
-    let result: GetWarehouseRequest_Response | undefined;
+  async wait(options?: LroOptions): Promise<GetWarehouseResponse> {
+    let result: GetWarehouseResponse | undefined;
 
-    const call: Call = async (callSignal?: AbortSignal): Promise<void> => {
+    const call = async (callSignal?: AbortSignal): Promise<void> => {
       const pollResp = await this.client.getWarehouse(
         {
           id: this.id,
         },
-        {...options, ...(callSignal !== undefined && {signal: callSignal})}
+        callSignal !== undefined ? {signal: callSignal} : undefined
       );
 
       const status = pollResp.state;
@@ -952,16 +915,9 @@ export class StopWarehouseWaiter {
       }
     };
 
-    const retryOptions: CallOptions = {
-      ...(options?.signal !== undefined && {signal: options.signal}),
-      retrier: () =>
-        retryOn({}, (err: Error) => {
-          return err instanceof StillRunningError;
-        }),
-    };
-    await executeCall(call, retryOptions);
+    await executeWait(call, options);
     if (result === undefined) {
-      throw new Error('API call completed without a result.');
+      throw new Error('operation completed without a result.');
     }
     return result;
   }

package/src/v1/index.ts

@@ -24,11 +24,12 @@ export type {
   Channel,
   CreateDefaultWarehouseOverrideRequest,
   CreateWarehouseRequest,
-  CreateWarehouseRequest_Response,
+  CreateWarehouseResponse,
   DefaultWarehouseOverride,
   DeleteDefaultWarehouseOverrideRequest,
+  DeleteWarehouseResponse,
   EditWarehouseRequest,
-  EditWarehouseRequest_Response,
+  EditWarehouseResponse,
   EndpointConfPair,
   EndpointHealth,
   EndpointInfo,
@@ -36,27 +37,26 @@ export type {
   EndpointTags,
   GetDefaultWarehouseOverrideRequest,
   GetWarehouseRequest,
-  GetWarehouseRequest_Response,
+  GetWarehouseResponse,
   GetWorkspaceWarehouseConfigRequest,
-  GetWorkspaceWarehouseConfigRequest_Response,
+  GetWorkspaceWarehouseConfigResponse,
   ListDefaultWarehouseOverridesRequest,
   ListDefaultWarehouseOverridesResponse,
+  ListWarehousesResponse,
   OdbcParams,
   RepeatedEndpointConfPairs,
   SetWorkspaceWarehouseConfigRequest,
-  SetWorkspaceWarehouseConfigRequest_Response,
+  SetWorkspaceWarehouseConfigResponse,
+  StartResponse,
+  StopResponse,
   TerminationReason,
   TerminationReason_ParametersEntry,
   UpdateDefaultWarehouseOverrideRequest,
   WarehouseTypePair,
   DeleteWarehouseRequest,
-  DeleteWarehouseRequest_Response,
   ListWarehousesRequest,
-  ListWarehousesRequest_Response,
   StartRequest,
-  StartRequest_Response,
   StopRequest,
-  StopRequest_Response,
 } from './model';
 
 export {defaultWarehouseOverrideFieldMask} from './model';