@aws-sdk/client-athena 3.1136.0 → 3.1138.0

package/dist-types/ts3.4/Athena.d.ts

@@ -1,5 +1,6 @@
 import {
   HttpHandlerOptions as __HttpHandlerOptions,
+  MetricsRecorder as __MetricsRecorder,
   PaginationConfiguration,
   Paginator,
 } from "@smithy/types";
@@ -275,10 +276,13 @@ import {
   UpdateWorkGroupCommandInput,
   UpdateWorkGroupCommandOutput,
 } from "./commands/UpdateWorkGroupCommand";
+export interface AthenaRequestOptions extends __HttpHandlerOptions {
+  metricsRecorder?: __MetricsRecorder<unknown>;
+}
 export interface Athena {
   batchGetNamedQuery(
     args: BatchGetNamedQueryCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<BatchGetNamedQueryCommandOutput>;
   batchGetNamedQuery(
     args: BatchGetNamedQueryCommandInput,
@@ -286,12 +290,12 @@ export interface Athena {
   ): void;
   batchGetNamedQuery(
     args: BatchGetNamedQueryCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: BatchGetNamedQueryCommandOutput) => void,
   ): void;
   batchGetPreparedStatement(
     args: BatchGetPreparedStatementCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<BatchGetPreparedStatementCommandOutput>;
   batchGetPreparedStatement(
     args: BatchGetPreparedStatementCommandInput,
@@ -299,12 +303,12 @@ export interface Athena {
   ): void;
   batchGetPreparedStatement(
     args: BatchGetPreparedStatementCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: BatchGetPreparedStatementCommandOutput) => void,
   ): void;
   batchGetQueryExecution(
     args: BatchGetQueryExecutionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<BatchGetQueryExecutionCommandOutput>;
   batchGetQueryExecution(
     args: BatchGetQueryExecutionCommandInput,
@@ -312,12 +316,12 @@ export interface Athena {
   ): void;
   batchGetQueryExecution(
     args: BatchGetQueryExecutionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: BatchGetQueryExecutionCommandOutput) => void,
   ): void;
   cancelCapacityReservation(
     args: CancelCapacityReservationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CancelCapacityReservationCommandOutput>;
   cancelCapacityReservation(
     args: CancelCapacityReservationCommandInput,
@@ -325,12 +329,12 @@ export interface Athena {
   ): void;
   cancelCapacityReservation(
     args: CancelCapacityReservationCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CancelCapacityReservationCommandOutput) => void,
   ): void;
   createCapacityReservation(
     args: CreateCapacityReservationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CreateCapacityReservationCommandOutput>;
   createCapacityReservation(
     args: CreateCapacityReservationCommandInput,
@@ -338,12 +342,12 @@ export interface Athena {
   ): void;
   createCapacityReservation(
     args: CreateCapacityReservationCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CreateCapacityReservationCommandOutput) => void,
   ): void;
   createDataCatalog(
     args: CreateDataCatalogCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CreateDataCatalogCommandOutput>;
   createDataCatalog(
     args: CreateDataCatalogCommandInput,
@@ -351,12 +355,12 @@ export interface Athena {
   ): void;
   createDataCatalog(
     args: CreateDataCatalogCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CreateDataCatalogCommandOutput) => void,
   ): void;
   createNamedQuery(
     args: CreateNamedQueryCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CreateNamedQueryCommandOutput>;
   createNamedQuery(
     args: CreateNamedQueryCommandInput,
@@ -364,12 +368,12 @@ export interface Athena {
   ): void;
   createNamedQuery(
     args: CreateNamedQueryCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CreateNamedQueryCommandOutput) => void,
   ): void;
   createNotebook(
     args: CreateNotebookCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CreateNotebookCommandOutput>;
   createNotebook(
     args: CreateNotebookCommandInput,
@@ -377,12 +381,12 @@ export interface Athena {
   ): void;
   createNotebook(
     args: CreateNotebookCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CreateNotebookCommandOutput) => void,
   ): void;
   createPreparedStatement(
     args: CreatePreparedStatementCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CreatePreparedStatementCommandOutput>;
   createPreparedStatement(
     args: CreatePreparedStatementCommandInput,
@@ -390,12 +394,12 @@ export interface Athena {
   ): void;
   createPreparedStatement(
     args: CreatePreparedStatementCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CreatePreparedStatementCommandOutput) => void,
   ): void;
   createPresignedNotebookUrl(
     args: CreatePresignedNotebookUrlCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CreatePresignedNotebookUrlCommandOutput>;
   createPresignedNotebookUrl(
     args: CreatePresignedNotebookUrlCommandInput,
@@ -403,12 +407,12 @@ export interface Athena {
   ): void;
   createPresignedNotebookUrl(
     args: CreatePresignedNotebookUrlCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CreatePresignedNotebookUrlCommandOutput) => void,
   ): void;
   createWorkGroup(
     args: CreateWorkGroupCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<CreateWorkGroupCommandOutput>;
   createWorkGroup(
     args: CreateWorkGroupCommandInput,
@@ -416,12 +420,12 @@ export interface Athena {
   ): void;
   createWorkGroup(
     args: CreateWorkGroupCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: CreateWorkGroupCommandOutput) => void,
   ): void;
   deleteCapacityReservation(
     args: DeleteCapacityReservationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<DeleteCapacityReservationCommandOutput>;
   deleteCapacityReservation(
     args: DeleteCapacityReservationCommandInput,
@@ -429,12 +433,12 @@ export interface Athena {
   ): void;
   deleteCapacityReservation(
     args: DeleteCapacityReservationCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: DeleteCapacityReservationCommandOutput) => void,
   ): void;
   deleteDataCatalog(
     args: DeleteDataCatalogCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<DeleteDataCatalogCommandOutput>;
   deleteDataCatalog(
     args: DeleteDataCatalogCommandInput,
@@ -442,12 +446,12 @@ export interface Athena {
   ): void;
   deleteDataCatalog(
     args: DeleteDataCatalogCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: DeleteDataCatalogCommandOutput) => void,
   ): void;
   deleteNamedQuery(
     args: DeleteNamedQueryCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<DeleteNamedQueryCommandOutput>;
   deleteNamedQuery(
     args: DeleteNamedQueryCommandInput,
@@ -455,12 +459,12 @@ export interface Athena {
   ): void;
   deleteNamedQuery(
     args: DeleteNamedQueryCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: DeleteNamedQueryCommandOutput) => void,
   ): void;
   deleteNotebook(
     args: DeleteNotebookCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<DeleteNotebookCommandOutput>;
   deleteNotebook(
     args: DeleteNotebookCommandInput,
@@ -468,12 +472,12 @@ export interface Athena {
   ): void;
   deleteNotebook(
     args: DeleteNotebookCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: DeleteNotebookCommandOutput) => void,
   ): void;
   deletePreparedStatement(
     args: DeletePreparedStatementCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<DeletePreparedStatementCommandOutput>;
   deletePreparedStatement(
     args: DeletePreparedStatementCommandInput,
@@ -481,12 +485,12 @@ export interface Athena {
   ): void;
   deletePreparedStatement(
     args: DeletePreparedStatementCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: DeletePreparedStatementCommandOutput) => void,
   ): void;
   deleteWorkGroup(
     args: DeleteWorkGroupCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<DeleteWorkGroupCommandOutput>;
   deleteWorkGroup(
     args: DeleteWorkGroupCommandInput,
@@ -494,12 +498,12 @@ export interface Athena {
   ): void;
   deleteWorkGroup(
     args: DeleteWorkGroupCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: DeleteWorkGroupCommandOutput) => void,
   ): void;
   exportNotebook(
     args: ExportNotebookCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ExportNotebookCommandOutput>;
   exportNotebook(
     args: ExportNotebookCommandInput,
@@ -507,12 +511,12 @@ export interface Athena {
   ): void;
   exportNotebook(
     args: ExportNotebookCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ExportNotebookCommandOutput) => void,
   ): void;
   getCalculationExecution(
     args: GetCalculationExecutionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetCalculationExecutionCommandOutput>;
   getCalculationExecution(
     args: GetCalculationExecutionCommandInput,
@@ -520,12 +524,12 @@ export interface Athena {
   ): void;
   getCalculationExecution(
     args: GetCalculationExecutionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetCalculationExecutionCommandOutput) => void,
   ): void;
   getCalculationExecutionCode(
     args: GetCalculationExecutionCodeCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetCalculationExecutionCodeCommandOutput>;
   getCalculationExecutionCode(
     args: GetCalculationExecutionCodeCommandInput,
@@ -533,12 +537,12 @@ export interface Athena {
   ): void;
   getCalculationExecutionCode(
     args: GetCalculationExecutionCodeCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetCalculationExecutionCodeCommandOutput) => void,
   ): void;
   getCalculationExecutionStatus(
     args: GetCalculationExecutionStatusCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetCalculationExecutionStatusCommandOutput>;
   getCalculationExecutionStatus(
     args: GetCalculationExecutionStatusCommandInput,
@@ -546,12 +550,12 @@ export interface Athena {
   ): void;
   getCalculationExecutionStatus(
     args: GetCalculationExecutionStatusCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetCalculationExecutionStatusCommandOutput) => void,
   ): void;
   getCapacityAssignmentConfiguration(
     args: GetCapacityAssignmentConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetCapacityAssignmentConfigurationCommandOutput>;
   getCapacityAssignmentConfiguration(
     args: GetCapacityAssignmentConfigurationCommandInput,
@@ -559,12 +563,12 @@ export interface Athena {
   ): void;
   getCapacityAssignmentConfiguration(
     args: GetCapacityAssignmentConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetCapacityAssignmentConfigurationCommandOutput) => void,
   ): void;
   getCapacityReservation(
     args: GetCapacityReservationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetCapacityReservationCommandOutput>;
   getCapacityReservation(
     args: GetCapacityReservationCommandInput,
@@ -572,12 +576,12 @@ export interface Athena {
   ): void;
   getCapacityReservation(
     args: GetCapacityReservationCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetCapacityReservationCommandOutput) => void,
   ): void;
   getDatabase(
     args: GetDatabaseCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetDatabaseCommandOutput>;
   getDatabase(
     args: GetDatabaseCommandInput,
@@ -585,12 +589,12 @@ export interface Athena {
   ): void;
   getDatabase(
     args: GetDatabaseCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetDatabaseCommandOutput) => void,
   ): void;
   getDataCatalog(
     args: GetDataCatalogCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetDataCatalogCommandOutput>;
   getDataCatalog(
     args: GetDataCatalogCommandInput,
@@ -598,12 +602,12 @@ export interface Athena {
   ): void;
   getDataCatalog(
     args: GetDataCatalogCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetDataCatalogCommandOutput) => void,
   ): void;
   getNamedQuery(
     args: GetNamedQueryCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetNamedQueryCommandOutput>;
   getNamedQuery(
     args: GetNamedQueryCommandInput,
@@ -611,12 +615,12 @@ export interface Athena {
   ): void;
   getNamedQuery(
     args: GetNamedQueryCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetNamedQueryCommandOutput) => void,
   ): void;
   getNotebookMetadata(
     args: GetNotebookMetadataCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetNotebookMetadataCommandOutput>;
   getNotebookMetadata(
     args: GetNotebookMetadataCommandInput,
@@ -624,12 +628,12 @@ export interface Athena {
   ): void;
   getNotebookMetadata(
     args: GetNotebookMetadataCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetNotebookMetadataCommandOutput) => void,
   ): void;
   getPreparedStatement(
     args: GetPreparedStatementCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetPreparedStatementCommandOutput>;
   getPreparedStatement(
     args: GetPreparedStatementCommandInput,
@@ -637,12 +641,12 @@ export interface Athena {
   ): void;
   getPreparedStatement(
     args: GetPreparedStatementCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetPreparedStatementCommandOutput) => void,
   ): void;
   getQueryExecution(
     args: GetQueryExecutionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetQueryExecutionCommandOutput>;
   getQueryExecution(
     args: GetQueryExecutionCommandInput,
@@ -650,12 +654,12 @@ export interface Athena {
   ): void;
   getQueryExecution(
     args: GetQueryExecutionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetQueryExecutionCommandOutput) => void,
   ): void;
   getQueryResults(
     args: GetQueryResultsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetQueryResultsCommandOutput>;
   getQueryResults(
     args: GetQueryResultsCommandInput,
@@ -663,12 +667,12 @@ export interface Athena {
   ): void;
   getQueryResults(
     args: GetQueryResultsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetQueryResultsCommandOutput) => void,
   ): void;
   getQueryRuntimeStatistics(
     args: GetQueryRuntimeStatisticsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetQueryRuntimeStatisticsCommandOutput>;
   getQueryRuntimeStatistics(
     args: GetQueryRuntimeStatisticsCommandInput,
@@ -676,12 +680,12 @@ export interface Athena {
   ): void;
   getQueryRuntimeStatistics(
     args: GetQueryRuntimeStatisticsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetQueryRuntimeStatisticsCommandOutput) => void,
   ): void;
   getResourceDashboard(
     args: GetResourceDashboardCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetResourceDashboardCommandOutput>;
   getResourceDashboard(
     args: GetResourceDashboardCommandInput,
@@ -689,12 +693,12 @@ export interface Athena {
   ): void;
   getResourceDashboard(
     args: GetResourceDashboardCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetResourceDashboardCommandOutput) => void,
   ): void;
   getSession(
     args: GetSessionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetSessionCommandOutput>;
   getSession(
     args: GetSessionCommandInput,
@@ -702,12 +706,12 @@ export interface Athena {
   ): void;
   getSession(
     args: GetSessionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetSessionCommandOutput) => void,
   ): void;
   getSessionEndpoint(
     args: GetSessionEndpointCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetSessionEndpointCommandOutput>;
   getSessionEndpoint(
     args: GetSessionEndpointCommandInput,
@@ -715,12 +719,12 @@ export interface Athena {
   ): void;
   getSessionEndpoint(
     args: GetSessionEndpointCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetSessionEndpointCommandOutput) => void,
   ): void;
   getSessionStatus(
     args: GetSessionStatusCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetSessionStatusCommandOutput>;
   getSessionStatus(
     args: GetSessionStatusCommandInput,
@@ -728,12 +732,12 @@ export interface Athena {
   ): void;
   getSessionStatus(
     args: GetSessionStatusCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetSessionStatusCommandOutput) => void,
   ): void;
   getTableMetadata(
     args: GetTableMetadataCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetTableMetadataCommandOutput>;
   getTableMetadata(
     args: GetTableMetadataCommandInput,
@@ -741,12 +745,12 @@ export interface Athena {
   ): void;
   getTableMetadata(
     args: GetTableMetadataCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetTableMetadataCommandOutput) => void,
   ): void;
   getWorkGroup(
     args: GetWorkGroupCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<GetWorkGroupCommandOutput>;
   getWorkGroup(
     args: GetWorkGroupCommandInput,
@@ -754,12 +758,12 @@ export interface Athena {
   ): void;
   getWorkGroup(
     args: GetWorkGroupCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: GetWorkGroupCommandOutput) => void,
   ): void;
   importNotebook(
     args: ImportNotebookCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ImportNotebookCommandOutput>;
   importNotebook(
     args: ImportNotebookCommandInput,
@@ -767,13 +771,13 @@ export interface Athena {
   ): void;
   importNotebook(
     args: ImportNotebookCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ImportNotebookCommandOutput) => void,
   ): void;
   listApplicationDPUSizes(): Promise<ListApplicationDPUSizesCommandOutput>;
   listApplicationDPUSizes(
     args: ListApplicationDPUSizesCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListApplicationDPUSizesCommandOutput>;
   listApplicationDPUSizes(
     args: ListApplicationDPUSizesCommandInput,
@@ -781,12 +785,12 @@ export interface Athena {
   ): void;
   listApplicationDPUSizes(
     args: ListApplicationDPUSizesCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListApplicationDPUSizesCommandOutput) => void,
   ): void;
   listCalculationExecutions(
     args: ListCalculationExecutionsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListCalculationExecutionsCommandOutput>;
   listCalculationExecutions(
     args: ListCalculationExecutionsCommandInput,
@@ -794,13 +798,13 @@ export interface Athena {
   ): void;
   listCalculationExecutions(
     args: ListCalculationExecutionsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListCalculationExecutionsCommandOutput) => void,
   ): void;
   listCapacityReservations(): Promise<ListCapacityReservationsCommandOutput>;
   listCapacityReservations(
     args: ListCapacityReservationsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListCapacityReservationsCommandOutput>;
   listCapacityReservations(
     args: ListCapacityReservationsCommandInput,
@@ -808,12 +812,12 @@ export interface Athena {
   ): void;
   listCapacityReservations(
     args: ListCapacityReservationsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListCapacityReservationsCommandOutput) => void,
   ): void;
   listDatabases(
     args: ListDatabasesCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListDatabasesCommandOutput>;
   listDatabases(
     args: ListDatabasesCommandInput,
@@ -821,13 +825,13 @@ export interface Athena {
   ): void;
   listDatabases(
     args: ListDatabasesCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListDatabasesCommandOutput) => void,
   ): void;
   listDataCatalogs(): Promise<ListDataCatalogsCommandOutput>;
   listDataCatalogs(
     args: ListDataCatalogsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListDataCatalogsCommandOutput>;
   listDataCatalogs(
     args: ListDataCatalogsCommandInput,
@@ -835,13 +839,13 @@ export interface Athena {
   ): void;
   listDataCatalogs(
     args: ListDataCatalogsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListDataCatalogsCommandOutput) => void,
   ): void;
   listEngineVersions(): Promise<ListEngineVersionsCommandOutput>;
   listEngineVersions(
     args: ListEngineVersionsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListEngineVersionsCommandOutput>;
   listEngineVersions(
     args: ListEngineVersionsCommandInput,
@@ -849,12 +853,12 @@ export interface Athena {
   ): void;
   listEngineVersions(
     args: ListEngineVersionsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListEngineVersionsCommandOutput) => void,
   ): void;
   listExecutors(
     args: ListExecutorsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListExecutorsCommandOutput>;
   listExecutors(
     args: ListExecutorsCommandInput,
@@ -862,13 +866,13 @@ export interface Athena {
   ): void;
   listExecutors(
     args: ListExecutorsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListExecutorsCommandOutput) => void,
   ): void;
   listNamedQueries(): Promise<ListNamedQueriesCommandOutput>;
   listNamedQueries(
     args: ListNamedQueriesCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListNamedQueriesCommandOutput>;
   listNamedQueries(
     args: ListNamedQueriesCommandInput,
@@ -876,12 +880,12 @@ export interface Athena {
   ): void;
   listNamedQueries(
     args: ListNamedQueriesCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListNamedQueriesCommandOutput) => void,
   ): void;
   listNotebookMetadata(
     args: ListNotebookMetadataCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListNotebookMetadataCommandOutput>;
   listNotebookMetadata(
     args: ListNotebookMetadataCommandInput,
@@ -889,12 +893,12 @@ export interface Athena {
   ): void;
   listNotebookMetadata(
     args: ListNotebookMetadataCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListNotebookMetadataCommandOutput) => void,
   ): void;
   listNotebookSessions(
     args: ListNotebookSessionsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListNotebookSessionsCommandOutput>;
   listNotebookSessions(
     args: ListNotebookSessionsCommandInput,
@@ -902,12 +906,12 @@ export interface Athena {
   ): void;
   listNotebookSessions(
     args: ListNotebookSessionsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListNotebookSessionsCommandOutput) => void,
   ): void;
   listPreparedStatements(
     args: ListPreparedStatementsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListPreparedStatementsCommandOutput>;
   listPreparedStatements(
     args: ListPreparedStatementsCommandInput,
@@ -915,13 +919,13 @@ export interface Athena {
   ): void;
   listPreparedStatements(
     args: ListPreparedStatementsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListPreparedStatementsCommandOutput) => void,
   ): void;
   listQueryExecutions(): Promise<ListQueryExecutionsCommandOutput>;
   listQueryExecutions(
     args: ListQueryExecutionsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListQueryExecutionsCommandOutput>;
   listQueryExecutions(
     args: ListQueryExecutionsCommandInput,
@@ -929,12 +933,12 @@ export interface Athena {
   ): void;
   listQueryExecutions(
     args: ListQueryExecutionsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListQueryExecutionsCommandOutput) => void,
   ): void;
   listSessions(
     args: ListSessionsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListSessionsCommandOutput>;
   listSessions(
     args: ListSessionsCommandInput,
@@ -942,12 +946,12 @@ export interface Athena {
   ): void;
   listSessions(
     args: ListSessionsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListSessionsCommandOutput) => void,
   ): void;
   listTableMetadata(
     args: ListTableMetadataCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListTableMetadataCommandOutput>;
   listTableMetadata(
     args: ListTableMetadataCommandInput,
@@ -955,12 +959,12 @@ export interface Athena {
   ): void;
   listTableMetadata(
     args: ListTableMetadataCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListTableMetadataCommandOutput) => void,
   ): void;
   listTagsForResource(
     args: ListTagsForResourceCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListTagsForResourceCommandOutput>;
   listTagsForResource(
     args: ListTagsForResourceCommandInput,
@@ -968,13 +972,13 @@ export interface Athena {
   ): void;
   listTagsForResource(
     args: ListTagsForResourceCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListTagsForResourceCommandOutput) => void,
   ): void;
   listWorkGroups(): Promise<ListWorkGroupsCommandOutput>;
   listWorkGroups(
     args: ListWorkGroupsCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<ListWorkGroupsCommandOutput>;
   listWorkGroups(
     args: ListWorkGroupsCommandInput,
@@ -982,12 +986,12 @@ export interface Athena {
   ): void;
   listWorkGroups(
     args: ListWorkGroupsCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: ListWorkGroupsCommandOutput) => void,
   ): void;
   putCapacityAssignmentConfiguration(
     args: PutCapacityAssignmentConfigurationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<PutCapacityAssignmentConfigurationCommandOutput>;
   putCapacityAssignmentConfiguration(
     args: PutCapacityAssignmentConfigurationCommandInput,
@@ -995,12 +999,12 @@ export interface Athena {
   ): void;
   putCapacityAssignmentConfiguration(
     args: PutCapacityAssignmentConfigurationCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: PutCapacityAssignmentConfigurationCommandOutput) => void,
   ): void;
   startCalculationExecution(
     args: StartCalculationExecutionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<StartCalculationExecutionCommandOutput>;
   startCalculationExecution(
     args: StartCalculationExecutionCommandInput,
@@ -1008,12 +1012,12 @@ export interface Athena {
   ): void;
   startCalculationExecution(
     args: StartCalculationExecutionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: StartCalculationExecutionCommandOutput) => void,
   ): void;
   startQueryExecution(
     args: StartQueryExecutionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<StartQueryExecutionCommandOutput>;
   startQueryExecution(
     args: StartQueryExecutionCommandInput,
@@ -1021,12 +1025,12 @@ export interface Athena {
   ): void;
   startQueryExecution(
     args: StartQueryExecutionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: StartQueryExecutionCommandOutput) => void,
   ): void;
   startSession(
     args: StartSessionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<StartSessionCommandOutput>;
   startSession(
     args: StartSessionCommandInput,
@@ -1034,12 +1038,12 @@ export interface Athena {
   ): void;
   startSession(
     args: StartSessionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: StartSessionCommandOutput) => void,
   ): void;
   stopCalculationExecution(
     args: StopCalculationExecutionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<StopCalculationExecutionCommandOutput>;
   stopCalculationExecution(
     args: StopCalculationExecutionCommandInput,
@@ -1047,12 +1051,12 @@ export interface Athena {
   ): void;
   stopCalculationExecution(
     args: StopCalculationExecutionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: StopCalculationExecutionCommandOutput) => void,
   ): void;
   stopQueryExecution(
     args: StopQueryExecutionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<StopQueryExecutionCommandOutput>;
   stopQueryExecution(
     args: StopQueryExecutionCommandInput,
@@ -1060,12 +1064,12 @@ export interface Athena {
   ): void;
   stopQueryExecution(
     args: StopQueryExecutionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: StopQueryExecutionCommandOutput) => void,
   ): void;
   tagResource(
     args: TagResourceCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<TagResourceCommandOutput>;
   tagResource(
     args: TagResourceCommandInput,
@@ -1073,12 +1077,12 @@ export interface Athena {
   ): void;
   tagResource(
     args: TagResourceCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: TagResourceCommandOutput) => void,
   ): void;
   terminateSession(
     args: TerminateSessionCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<TerminateSessionCommandOutput>;
   terminateSession(
     args: TerminateSessionCommandInput,
@@ -1086,12 +1090,12 @@ export interface Athena {
   ): void;
   terminateSession(
     args: TerminateSessionCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: TerminateSessionCommandOutput) => void,
   ): void;
   untagResource(
     args: UntagResourceCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UntagResourceCommandOutput>;
   untagResource(
     args: UntagResourceCommandInput,
@@ -1099,12 +1103,12 @@ export interface Athena {
   ): void;
   untagResource(
     args: UntagResourceCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UntagResourceCommandOutput) => void,
   ): void;
   updateCapacityReservation(
     args: UpdateCapacityReservationCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UpdateCapacityReservationCommandOutput>;
   updateCapacityReservation(
     args: UpdateCapacityReservationCommandInput,
@@ -1112,12 +1116,12 @@ export interface Athena {
   ): void;
   updateCapacityReservation(
     args: UpdateCapacityReservationCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UpdateCapacityReservationCommandOutput) => void,
   ): void;
   updateDataCatalog(
     args: UpdateDataCatalogCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UpdateDataCatalogCommandOutput>;
   updateDataCatalog(
     args: UpdateDataCatalogCommandInput,
@@ -1125,12 +1129,12 @@ export interface Athena {
   ): void;
   updateDataCatalog(
     args: UpdateDataCatalogCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UpdateDataCatalogCommandOutput) => void,
   ): void;
   updateNamedQuery(
     args: UpdateNamedQueryCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UpdateNamedQueryCommandOutput>;
   updateNamedQuery(
     args: UpdateNamedQueryCommandInput,
@@ -1138,12 +1142,12 @@ export interface Athena {
   ): void;
   updateNamedQuery(
     args: UpdateNamedQueryCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UpdateNamedQueryCommandOutput) => void,
   ): void;
   updateNotebook(
     args: UpdateNotebookCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UpdateNotebookCommandOutput>;
   updateNotebook(
     args: UpdateNotebookCommandInput,
@@ -1151,12 +1155,12 @@ export interface Athena {
   ): void;
   updateNotebook(
     args: UpdateNotebookCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UpdateNotebookCommandOutput) => void,
   ): void;
   updateNotebookMetadata(
     args: UpdateNotebookMetadataCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UpdateNotebookMetadataCommandOutput>;
   updateNotebookMetadata(
     args: UpdateNotebookMetadataCommandInput,
@@ -1164,12 +1168,12 @@ export interface Athena {
   ): void;
   updateNotebookMetadata(
     args: UpdateNotebookMetadataCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UpdateNotebookMetadataCommandOutput) => void,
   ): void;
   updatePreparedStatement(
     args: UpdatePreparedStatementCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UpdatePreparedStatementCommandOutput>;
   updatePreparedStatement(
     args: UpdatePreparedStatementCommandInput,
@@ -1177,12 +1181,12 @@ export interface Athena {
   ): void;
   updatePreparedStatement(
     args: UpdatePreparedStatementCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UpdatePreparedStatementCommandOutput) => void,
   ): void;
   updateWorkGroup(
     args: UpdateWorkGroupCommandInput,
-    options?: __HttpHandlerOptions,
+    options?: AthenaRequestOptions,
   ): Promise<UpdateWorkGroupCommandOutput>;
   updateWorkGroup(
     args: UpdateWorkGroupCommandInput,
@@ -1190,7 +1194,7 @@ export interface Athena {
   ): void;
   updateWorkGroup(
     args: UpdateWorkGroupCommandInput,
-    options: __HttpHandlerOptions,
+    options: AthenaRequestOptions,
     cb: (err: any, data?: UpdateWorkGroupCommandOutput) => void,
   ): void;
   paginateGetQueryResults(